diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index 83430766..9cd2c523 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -32,10 +32,10 @@ jobs:
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream-archive"
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index 3c5caad7..abeee0b2 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -42,10 +42,10 @@ jobs:
           cd $GITHUB_WORKSPACE/dokka/
           rm -rf "./-cloudstream"
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 4ce7dba1..856d267c 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -24,10 +24,10 @@ jobs:
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 36199cd6..b6177710 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5421743a..b589d56e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 10c26704..a8a2961a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 94dd7c83..6fd4ae21 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("kotlin-kapt")
-    id("kotlin-android-extensions")
     id("org.jetbrains.dokka")
 }
 
@@ -28,6 +27,11 @@ android {
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
+
+    viewBinding {
+        enable = true
+    }
+
     signingConfigs {
         create("prerelease") {
             if (prereleaseStoreFile != null) {
@@ -48,7 +52,7 @@ android {
         targetSdk = 33
 
         versionCode = 59
-        versionName = "4.0.1"
+        versionName = "4.1.1"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
@@ -143,6 +147,7 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation("androidx.test:core")
 
     //implementation("io.karn:khttp-android:0.1.2") //okhttp instead
 //    implementation("org.jsoup:jsoup:1.13.1")
@@ -215,7 +220,7 @@ dependencies {
 
     implementation("com.github.discord:OverlappingPanels:0.1.3")
     // debugImplementation because LeakCanary should only run in debug builds.
-    // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+    //debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
 
     // for shimmer when loading
     implementation("com.facebook.shimmer:shimmer:0.5.0")
@@ -229,13 +234,13 @@ dependencies {
     //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")
 
     // newpipe yt taken from https://github.com/TeamNewPipe/NewPipe/blob/dev/app/build.gradle#L204
-    implementation("com.github.TeamNewPipe:NewPipeExtractor:master-SNAPSHOT")
+    implementation("com.github.TeamNewPipe:NewPipeExtractor:8495ad619e")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")
 
     // Library/extensions searching with Levenshtein distance
     implementation("me.xdrop:fuzzywuzzy:1.4.0")
 
-    // color pallette for images -> colors
+    // color palette for images -> colors
     implementation("androidx.palette:palette-ktx:1.0.0")
 }
 
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 92042d60..df41ef91 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -1,6 +1,30 @@
 package com.lagradost.cloudstream3
 
+import android.app.Activity
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.view.LayoutInflater
+import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
+import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
+import com.lagradost.cloudstream3.databinding.FragmentPlayerTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentResultBinding
+import com.lagradost.cloudstream3.databinding.FragmentResultTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
+import com.lagradost.cloudstream3.databinding.FragmentSearchTvBinding
+import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
+import com.lagradost.cloudstream3.databinding.HomepageParentBinding
+import com.lagradost.cloudstream3.databinding.HomepageParentTvBinding
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutTvBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
+import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
+import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
+import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.runBlocking
@@ -8,16 +32,23 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 
+
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
+class TestApplication : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+    }
+}
+
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    private fun getAllProviders(): List<MainAPI> {
+    private fun getAllProviders(): Array<MainAPI> {
         println("Providers: ${APIHolder.allProviders.size}")
-        return APIHolder.allProviders //.filter { !it.usesWebView }
+        return APIHolder.allProviders.toTypedArray() //.filter { !it.usesWebView }
     }
 
     @Test
@@ -26,6 +57,73 @@ class ExampleInstrumentedTest {
         println("Done providersExist")
     }
 
+    @Throws
+    private inline fun <reified T : ViewBinding> testAllLayouts(
+        activity: Activity,
+       vararg layouts: Int
+    ) {
+
+        val bind = T::class.java.methods.first { it.name == "bind" }
+        val inflater = LayoutInflater.from(activity)
+        for (layout in layouts) {
+            val root = inflater.inflate(layout, null, false)
+            bind.invoke(null, root)
+        }
+    }
+
+    @Test
+    @Throws
+    fun layoutTest() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            scenario.onActivity { activity: MainActivity ->
+                // FragmentHomeHeadBinding and FragmentHomeHeadTvBinding CANT be the same
+                //testAllLayouts<FragmentHomeHeadBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
+                //testAllLayouts<FragmentHomeHeadTvBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
+
+                // main cant be tested
+               // testAllLayouts<ActivityMainTvBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
+               // testAllLayouts<ActivityMainBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
+                //testAllLayouts<ActivityMainBinding>(activity, R.layout.activity_main_tv)
+
+                testAllLayouts<FragmentPlayerBinding>(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
+                testAllLayouts<FragmentPlayerTvBinding>(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
+
+               // testAllLayouts<FragmentResultBinding>(activity, R.layout.fragment_result,R.layout.fragment_result_tv)
+               // testAllLayouts<FragmentResultTvBinding>(activity, R.layout.fragment_result,R.layout.fragment_result_tv)
+
+                testAllLayouts<PlayerCustomLayoutBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
+                testAllLayouts<PlayerCustomLayoutTvBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
+                testAllLayouts<TrailerCustomLayoutBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
+
+                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+
+                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+
+                testAllLayouts<FragmentHomeBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
+                testAllLayouts<FragmentHomeTvBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
+
+                testAllLayouts<FragmentSearchBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
+                testAllLayouts<FragmentSearchTvBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
+
+                testAllLayouts<HomeResultGridBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid)
+                //testAllLayouts<HomeResultGridExpandedBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid) ??? fails ???
+
+                testAllLayouts<SearchResultGridExpandedBinding>(activity, R.layout.search_result_grid, R.layout.search_result_grid_expanded)
+                testAllLayouts<SearchResultGridBinding>(activity, R.layout.search_result_grid, R.layout.search_result_grid_expanded)
+
+
+               // testAllLayouts<HomeScrollViewBinding>(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv)
+               // testAllLayouts<HomeScrollViewTvBinding>(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv)
+
+                testAllLayouts<HomepageParentTvBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
+                testAllLayouts<HomepageParentBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
+
+            }
+        }
+    }
+
     @Test
     @Throws(AssertionError::class)
     fun providerCorrectData() {
@@ -49,7 +147,7 @@ class ExampleInstrumentedTest {
     @Test
     fun providerCorrectHomepage() {
         runBlocking {
-            getAllProviders().amap { api ->
+            getAllProviders().toList().amap { api ->
                 TestingUtils.testHomepage(api, ::println)
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 0351b1ff..76b2321f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -51,8 +51,8 @@ class CustomReportSender : ReportSender {
         thread { // to not run it on main thread
             runBlocking {
                 suspendSafeApiCall {
-                    val post = app.post(url, data = data)
-                    println("Report response: $post")
+                    app.post(url, data = data)
+                    //println("Report response: $post")
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 0a42da72..9c7c319e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -9,6 +9,7 @@ import android.content.res.Resources
 import android.os.Build
 import android.util.Log
 import android.view.*
+import android.view.View.NO_ID
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -27,6 +28,7 @@ import com.lagradost.cloudstream3.ui.player.PlayerEventType
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.UiText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.UIHelper
@@ -34,9 +36,18 @@ import com.lagradost.cloudstream3.utils.UIHelper.hasPIPPermission
 import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import org.schabi.newpipe.extractor.NewPipe
+import java.lang.ref.WeakReference
 import java.util.*
 
 object CommonActivity {
+
+    private var _activity: WeakReference<Activity>? = null
+    var activity
+        get() = _activity?.get()
+        private set(value) {
+            _activity = WeakReference(value)
+        }
+
     @MainThread
     fun Activity?.getCastSession(): CastSession? {
         return (this as MainActivity?)?.mSessionManager?.currentCastSession
@@ -56,6 +67,30 @@ object CommonActivity {
 
     var currentToast: Toast? = null
 
+    fun showToast(@StringRes message: Int, duration: Int? = null) {
+        val act = activity ?: return
+        act.runOnUiThread {
+            showToast(act, act.getString(message), duration)
+        }
+    }
+
+    fun showToast(message: String?, duration: Int? = null) {
+        val act = activity ?: return
+        act.runOnUiThread {
+            showToast(act, message, duration)
+        }
+    }
+
+    fun showToast(message: UiText?, duration: Int? = null) {
+        val act = activity ?: return
+        if (message == null) return
+        act.runOnUiThread {
+            showToast(act, message.asString(act), duration)
+        }
+    }
+
+
+    @MainThread
     fun showToast(act: Activity?, text: UiText, duration: Int) {
         if (act == null) return
         text.asStringNull(act)?.let {
@@ -140,6 +175,7 @@ object CommonActivity {
 
     fun init(act: ComponentActivity?) {
         if (act == null) return
+        activity = act
         //https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission
         //https://developer.android.com/guide/topics/ui/picture-in-picture
         canShowPipMode =
@@ -260,27 +296,58 @@ object CommonActivity {
         ) // THEME IS SET BEFORE VIEW IS CREATED TO APPLY THE THEME TO THE MAIN VIEW
     }
 
+    /** because we want closes find, aka when multiple have the same id, we go to parent
+    until the correct one is found */
+    private fun localLook(from: View, id: Int): View? {
+        if (id == NO_ID) return null
+        var currentLook: View = from
+        while (true) {
+            currentLook.findViewById<View?>(id)?.let { return it }
+            currentLook = (currentLook.parent as? View) ?: break
+        }
+        return null
+    }
+    /*var currentLook: View = view
+    while (true) {
+        val tmpNext = currentLook.findViewById<View?>(nextId)
+        if (tmpNext != null) {
+            next = tmpNext
+            break
+        }
+        currentLook = currentLook.parent as? View ?: break
+    }*/
+
+    /** recursively looks for a next focus up to a depth of 10,
+     * this is used to override the normal shit focus system
+     * because this application has a lot of invisible views that messes with some tv devices*/
     private fun getNextFocus(
         act: Activity?,
         view: View?,
         direction: FocusDirection,
         depth: Int = 0
-    ): Int? {
+    ): View? {
+        // if input is invalid let android decide + depth test to not crash if loop is found
         if (view == null || depth >= 10 || act == null) {
             return null
         }
 
-        val nextId = when (direction) {
-            FocusDirection.Left -> {
-                view.nextFocusLeftId
+        var nextId = when (direction) {
+            FocusDirection.Start -> {
+                if (view.isRtl())
+                    view.nextFocusRightId
+                else
+                    view.nextFocusLeftId
             }
 
             FocusDirection.Up -> {
                 view.nextFocusUpId
             }
 
-            FocusDirection.Right -> {
-                view.nextFocusRightId
+            FocusDirection.End -> {
+                if (view.isRtl())
+                    view.nextFocusLeftId
+                else
+                    view.nextFocusRightId
             }
 
             FocusDirection.Down -> {
@@ -288,27 +355,35 @@ object CommonActivity {
             }
         }
 
-        return if (nextId != -1) {
-            val next = act.findViewById<View?>(nextId)
-            //println("NAME: ${next.accessibilityClassName} | ${next?.isShown}" )
-
-            if (next?.isShown == false) {
-                getNextFocus(act, next, direction, depth + 1)
-            } else {
-                if (depth == 0) {
-                    null
-                } else {
-                    nextId
-                }
-            }
-        } else {
-            null
+        if (nextId == NO_ID) {
+            // if not specified then use forward id
+            nextId = view.nextFocusForwardId
+            // if view is still not found to next focus then return and let android decide
+            if (nextId == NO_ID) return null
         }
+
+        var next = act.findViewById<View?>(nextId) ?: return null
+
+        next = localLook(view, nextId) ?: next
+
+        var currentLook: View = view
+        while (currentLook.findViewById<View?>(nextId)?.also { next = it } == null) {
+            currentLook = (currentLook.parent as? View) ?: break
+        }
+
+        // if cant focus but visible then break and let android decide
+        if (!next.isFocusable && next.isShown) return null
+
+        // if not shown then continue because we will "skip" over views to get to a replacement
+        if (!next.isShown) return getNextFocus(act, next, direction, depth + 1)
+
+        // nothing wrong with the view found, return it
+        return next
     }
 
-    enum class FocusDirection {
-        Left,
-        Right,
+    private enum class FocusDirection {
+        Start,
+        End,
         Up,
         Down,
     }
@@ -407,67 +482,64 @@ object CommonActivity {
         //}
     }
 
+    /** overrides focus and custom key events */
     fun dispatchKeyEvent(act: Activity?, event: KeyEvent?): Boolean? {
         if (act == null) return null
+        val currentFocus = act.currentFocus
+
         event?.keyCode?.let { keyCode ->
-            when (event.action) {
-                KeyEvent.ACTION_DOWN -> {
-                    if (act.currentFocus != null) {
-                        val next = when (keyCode) {
-                            KeyEvent.KEYCODE_DPAD_LEFT -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Left
-                            )
+            if (currentFocus == null || event.action != KeyEvent.ACTION_DOWN) return@let
+            val nextView = when (keyCode) {
+                KeyEvent.KEYCODE_DPAD_LEFT -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.Start
+                )
 
-                            KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Right
-                            )
+                KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.End
+                )
 
-                            KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Up
-                            )
+                KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.Up
+                )
 
-                            KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Down
-                            )
+                KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.Down
+                )
 
-                            else -> null
-                        }
-
-                        if (next != null && next != -1) {
-                            val nextView = act.findViewById<View?>(next)
-                            if (nextView != null) {
-                                nextView.requestFocus()
-                                keyEventListener?.invoke(Pair(event, true))
-                                return true
-                            }
-                        }
-
-                        when (keyCode) {
-                            KeyEvent.KEYCODE_DPAD_CENTER -> {
-                                if (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete) {
-                                    UIHelper.showInputMethod(act.currentFocus?.findFocus())
-                                }
-                            }
-                        }
-                    }
-                    //println("Keycode: $keyCode")
-                    //showToast(
-                    //    this,
-                    //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
-                    //    Toast.LENGTH_LONG
-                    //)
-                }
+                else -> null
             }
+
+            if (nextView != null) {
+                nextView.requestFocus()
+                keyEventListener?.invoke(Pair(event, true))
+                return true
+            }
+
+            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
+                (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
+            ) {
+                UIHelper.showInputMethod(act.currentFocus?.findFocus())
+            }
+
+            //println("Keycode: $keyCode")
+            //showToast(
+            //    this,
+            //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
+            //    Toast.LENGTH_LONG
+            //)
+
         }
 
+        // if someone else want to override the focus then don't handle the event as it is already
+        // consumed. used in video player
         if (keyEventListener?.invoke(Pair(event, false)) == true) {
             return true
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index c20786c3..51d218bf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -50,8 +50,10 @@ object APIHolder {
     val allProviders = threadSafeListOf<MainAPI>()
 
     fun initAll() {
-        for (api in allProviders) {
-            api.init()
+        synchronized(allProviders) {
+            for (api in allProviders) {
+                api.init()
+            }
         }
         apiMap = null
     }
@@ -64,27 +66,35 @@ object APIHolder {
     var apiMap: Map<String, Int>? = null
 
     fun addPluginMapping(plugin: MainAPI) {
-        apis = apis + plugin
+        synchronized(apis) {
+            apis = apis + plugin
+        }
         initMap(true)
     }
 
     fun removePluginMapping(plugin: MainAPI) {
-        apis = apis.filter { it != plugin }
+        synchronized(apis) {
+            apis = apis.filter { it != plugin }
+        }
         initMap(true)
     }
 
     private fun initMap(forcedUpdate: Boolean = false) {
-        if (apiMap == null || forcedUpdate)
-            apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
+        synchronized(apis) {
+            if (apiMap == null || forcedUpdate)
+                apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
+        }
     }
 
     fun getApiFromNameNull(apiName: String?): MainAPI? {
         if (apiName == null) return null
         synchronized(allProviders) {
             initMap()
-            return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
-            // Leave the ?. null check, it can crash regardless
-                ?: allProviders.firstOrNull { it.name == apiName }
+            synchronized(apis) {
+                return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
+                // Leave the ?. null check, it can crash regardless
+                    ?: allProviders.firstOrNull { it.name == apiName }
+            }
         }
     }
 
@@ -215,7 +225,7 @@ object APIHolder {
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }
+        hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } }
             .map { it.name })
 
         /*val set = settingsManager.getStringSet(
@@ -314,8 +324,9 @@ object APIHolder {
         } ?: default
         val langs = this.getApiProviderLangSettings()
         val hasUniversal = langs.contains(AllLanguagesName)
-        val allApis = apis.filter { hasUniversal || langs.contains(it.lang) }
-            .filter { api -> api.hasMainPage || !hasHomePageIsRequired }
+        val allApis = synchronized(apis) {
+            apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
+        }
         return if (currentPrefMedia.isEmpty()) {
             allApis
         } else {
@@ -736,6 +747,7 @@ fun fixTitle(str: String): String {
             .replaceFirstChar { char -> if (char.isLowerCase()) char.titlecase(Locale.getDefault()) else it }
     }
 }
+
 /**
  * Get rhino context in a safe way as it needs to be initialized on the main thread.
  * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects()
@@ -1122,7 +1134,7 @@ interface LoadResponse {
         var isTrailersEnabled = true
 
         fun LoadResponse.isMovie(): Boolean {
-            return this.type.isMovieType()
+            return this.type.isMovieType() || this is MovieLoadResponse
         }
 
         @JvmName("addActorNames")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 23bd7001..5b33c251 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3
 
+import android.animation.ValueAnimator
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -14,13 +15,17 @@ import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
+import androidx.annotation.MainThread
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.children
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
@@ -40,6 +45,7 @@ import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.Session
 import com.google.android.gms.cast.framework.SessionManager
 import com.google.android.gms.cast.framework.SessionManagerListener
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.navigationrail.NavigationRailView
 import com.google.android.material.snackbar.Snackbar
@@ -58,6 +64,11 @@ import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
 import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.databinding.ActivityMainBinding
+import com.lagradost.cloudstream3.databinding.ActivityMainTvBinding
+import com.lagradost.cloudstream3.databinding.BottomResultviewPreviewBinding
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observeNullable
@@ -69,7 +80,7 @@ import com.lagradost.cloudstream3.receivers.VideoDownloadRestartReceiver
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2Apis
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringPlayer
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
@@ -85,6 +96,7 @@ import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.setImage
 import com.lagradost.cloudstream3.ui.result.setText
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.search.SearchFragment
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
@@ -97,12 +109,14 @@ import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
 import com.lagradost.cloudstream3.utils.ApkInstaller
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
+import com.lagradost.cloudstream3.utils.AppUtils.isLtr
 import com.lagradost.cloudstream3.utils.AppUtils.isNetworkAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.BackupUtils.backup
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
@@ -121,32 +135,19 @@ import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
-import kotlinx.android.synthetic.main.activity_main.cast_mini_controller_holder
-import kotlinx.android.synthetic.main.activity_main.nav_host_fragment
-import kotlinx.android.synthetic.main.activity_main.nav_rail_view
-import kotlinx.android.synthetic.main.activity_main.nav_view
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_description
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_loading
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_loading_shimmer
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_duration
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_rating
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_type
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_year
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_more_info
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_poster
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_result
-import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_title
-import kotlinx.android.synthetic.main.fragment_result_swipe.media_route_button
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.io.File
+import java.lang.ref.WeakReference
 import java.net.URI
 import java.net.URLDecoder
 import java.nio.charset.Charset
+import kotlin.math.absoluteValue
 import kotlin.reflect.KClass
 import kotlin.system.exitProcess
 
@@ -334,7 +335,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                     this@with.runOnUiThread {
                                         try {
                                             showToast(
-                                                this@with,
                                                 getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail).format(
                                                     api.name
                                                 )
@@ -362,8 +362,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
                         // Use both navigation views to support both layouts.
                         // It might be better to use the QuickSearch.
-                        nav_view?.selectedItemId = R.id.navigation_search
-                        nav_rail_view?.selectedItemId = R.id.navigation_search
+                        activity?.findViewById<BottomNavigationView>(R.id.nav_view)?.selectedItemId =
+                            R.id.navigation_search
+                        activity?.findViewById<NavigationRailView>(R.id.nav_rail_view)?.selectedItemId =
+                            R.id.navigation_search
                     } else if (safeURI(str)?.scheme == appStringPlayer) {
                         val uri = Uri.parse(str)
                         val name = uri.getQueryParameter("name")
@@ -396,10 +398,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                             this.navigate(R.id.navigation_downloads)
                             return true
                         } else {
-                            for (api in apis) {
-                                if (str.startsWith(api.mainUrl)) {
-                                    loadResult(str, api.name)
-                                    return true
+                            synchronized(apis) {
+                                for (api in apis) {
+                                    if (str.startsWith(api.mainUrl)) {
+                                        loadResult(str, api.name)
+                                        return true
+                                    }
                                 }
                             }
                         }
@@ -440,7 +444,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         this.hideKeyboard()
 
         // Fucks up anime info layout since that has its own layout
-        cast_mini_controller_holder?.isVisible =
+        binding?.castMiniControllerHolder?.isVisible =
             !listOf(
                 R.id.navigation_results_phone,
                 R.id.navigation_results_tv,
@@ -476,15 +480,27 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             R.id.navigation_player,
         ).contains(destination.id)
 
-        nav_host_fragment?.apply {
+        binding?.navHostFragment?.apply {
             val params = layoutParams as ConstraintLayout.LayoutParams
+            val push =
+                if (!dontPush && isTvSettings()) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0
+
+            if (!this.isLtr()) {
+                params.setMargins(
+                    params.leftMargin,
+                    params.topMargin,
+                    push,
+                    params.bottomMargin
+                )
+            } else {
+                params.setMargins(
+                    push,
+                    params.topMargin,
+                    params.rightMargin,
+                    params.bottomMargin
+                )
+            }
 
-            params.setMargins(
-                if (!dontPush && isTvSettings()) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0,
-                params.topMargin,
-                params.rightMargin,
-                params.bottomMargin
-            )
             layoutParams = params
         }
 
@@ -494,21 +510,22 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             }
 
             Configuration.ORIENTATION_PORTRAIT -> {
-                false
+                isTvSettings()
             }
 
             else -> {
                 false
             }
         }
+        binding?.apply {
+            navView.isVisible = isNavVisible && !landscape
+            navRailView.isVisible = isNavVisible && landscape
 
-        nav_view?.isVisible = isNavVisible && !landscape
-        nav_rail_view?.isVisible = isNavVisible && landscape
-
-        // Hide library on TV since it is not supported yet :(
-        val isTrueTv = isTrueTvSettings()
-        nav_view?.menu?.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
-        nav_rail_view?.menu?.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+            // Hide library on TV since it is not supported yet :(
+            val isTrueTv = isTrueTvSettings()
+            navView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+            navRailView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+        }
     }
 
     //private var mCastSession: CastSession? = null
@@ -576,11 +593,23 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         }
     }
 
-
     override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-        CommonActivity.dispatchKeyEvent(this, event)?.let {
-            return it
+        val start = System.currentTimeMillis()
+        try {
+            val response = CommonActivity.dispatchKeyEvent(this, event)
+
+            if (response != null)
+                return response
+        } finally {
+            debugAssert({
+                val end = System.currentTimeMillis()
+                val delta = end - start
+                delta > 100
+            }) {
+                "Took over 100ms to navigate, smth is VERY wrong"
+            }
         }
+
         return super.dispatchKeyEvent(event)
     }
 
@@ -685,27 +714,29 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     private fun onAllPluginsLoaded(success: Boolean = false) {
         ioSafe {
             pluginsLock.withLock {
-                // Load cloned sites after plugins have been loaded since clones depend on plugins.
-                try {
-                    getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
-                        list.forEach { custom ->
-                            allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
-                                ?.let {
-                                    allProviders.add(it.javaClass.newInstance().apply {
-                                        name = custom.name
-                                        lang = custom.lang
-                                        mainUrl = custom.url.trimEnd('/')
-                                        canBeOverridden = false
-                                    })
-                                }
+                synchronized(allProviders) {
+                    // Load cloned sites after plugins have been loaded since clones depend on plugins.
+                    try {
+                        getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
+                            list.forEach { custom ->
+                                allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
+                                    ?.let {
+                                        allProviders.add(it.javaClass.newInstance().apply {
+                                            name = custom.name
+                                            lang = custom.lang
+                                            mainUrl = custom.url.trimEnd('/')
+                                            canBeOverridden = false
+                                        })
+                                    }
+                            }
                         }
+                        // it.hashCode() is not enough to make sure they are distinct
+                        apis =
+                            allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
+                        APIHolder.apiMap = null
+                    } catch (e: Exception) {
+                        logError(e)
                     }
-                    // it.hashCode() is not enough to make sure they are distinct
-                    apis =
-                        allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
-                    APIHolder.apiMap = null
-                } catch (e: Exception) {
-                    logError(e)
                 }
             }
         }
@@ -721,28 +752,217 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     }
 
     private fun hidePreviewPopupDialog() {
-        viewModel.clear()
         bottomPreviewPopup.dismissSafe(this)
+        bottomPreviewPopup = null
+        bottomPreviewBinding = null
     }
 
-    var bottomPreviewPopup: BottomSheetDialog? = null
-    private fun showPreviewPopupDialog(): BottomSheetDialog {
-        val ret = (bottomPreviewPopup ?: run {
+    private var bottomPreviewPopup: BottomSheetDialog? = null
+    private var bottomPreviewBinding: BottomResultviewPreviewBinding? = null
+    private fun showPreviewPopupDialog(): BottomResultviewPreviewBinding {
+        val ret = (bottomPreviewBinding ?: run {
             val builder =
                 BottomSheetDialog(this)
-            builder.setContentView(R.layout.bottom_resultview_preview)
+            val binding: BottomResultviewPreviewBinding =
+                BottomResultviewPreviewBinding.inflate(builder.layoutInflater, null, false)
+            bottomPreviewBinding = binding
+            builder.setContentView(binding.root)
             builder.setOnDismissListener {
                 bottomPreviewPopup = null
+                bottomPreviewBinding = null
                 viewModel.clear()
             }
             builder.setCanceledOnTouchOutside(true)
             builder.show()
-            builder
+            bottomPreviewPopup = builder
+            binding
         })
-        bottomPreviewPopup = ret
+
         return ret
     }
 
+    private var binding: ActivityMainBinding? = null
+
+    object TvFocus {
+        data class FocusTarget(
+            val width: Int,
+            val height: Int,
+            val x: Float,
+            val y: Float,
+        ) {
+            companion object {
+                fun lerp(a: FocusTarget, b: FocusTarget, lerp: Float): FocusTarget {
+                    val ilerp = 1 - lerp
+                    return FocusTarget(
+                        width = (a.width * ilerp + b.width * lerp).toInt(),
+                        height = (a.height * ilerp + b.height * lerp).toInt(),
+                        x = a.x * ilerp + b.x * lerp,
+                        y = a.y * ilerp + b.y * lerp
+                    )
+                }
+            }
+        }
+
+        var last: FocusTarget = FocusTarget(0, 0, 0.0f, 0.0f)
+        var current: FocusTarget = FocusTarget(0, 0, 0.0f, 0.0f)
+
+        var focusOutline: WeakReference<View> = WeakReference(null)
+        var lastFocus: WeakReference<View> = WeakReference(null)
+        private val layoutListener: View.OnLayoutChangeListener =
+            View.OnLayoutChangeListener { v, _, _, _, _, _, _, _, _ ->
+                updateFocusView(
+                    v, same = true
+                )
+            }
+        private val attachListener: View.OnAttachStateChangeListener =
+            object : View.OnAttachStateChangeListener {
+                override fun onViewAttachedToWindow(v: View) {
+                    updateFocusView(v)
+                }
+
+                override fun onViewDetachedFromWindow(v: View) {
+                    // removes the focus view but not the listener as updateFocusView(null) will remove the listener
+                    focusOutline.get()?.isVisible = false
+                }
+            }
+
+        private fun setTargetPosition(target: FocusTarget) {
+            focusOutline.get()?.apply {
+                layoutParams = layoutParams?.apply {
+                    width = target.width
+                    height = target.height
+                }
+
+                translationX = target.x
+                translationY = target.y
+                bringToFront()
+            }
+        }
+
+        private var animator: ValueAnimator? = null
+
+        @MainThread
+        fun updateFocusView(newFocus: View?, same: Boolean = false) {
+            val focusOutline = focusOutline.get() ?: return
+            lastFocus.get()?.apply {
+                removeOnLayoutChangeListener(layoutListener)
+                removeOnAttachStateChangeListener(attachListener)
+            }
+
+            val wasGone = focusOutline.isGone
+
+            val visible =
+                newFocus != null && newFocus.measuredHeight > 0 && newFocus.measuredWidth > 0 && newFocus.isShown && newFocus.tag != "tv_no_focus_tag"
+            focusOutline.isVisible = visible
+
+            if (newFocus != null) {
+                lastFocus = WeakReference(newFocus)
+
+                val out = IntArray(2)
+                newFocus.getLocationInWindow(out)
+                val (screenX, screenY) = out
+                var (x, y) = screenX.toFloat() to screenY.toFloat()
+                val (currentX, currentY) = focusOutline.translationX to focusOutline.translationY
+                //            println(">><<< $x $y $currentX $currentY")
+                if (!newFocus.isLtr()) {
+                    x = x - focusOutline.rootView.width + newFocus.measuredWidth
+                }
+
+                // out of bounds = 0,0
+                if (screenX == 0 && screenY == 0) {
+                    focusOutline.isVisible = false
+                }
+
+                newFocus.addOnLayoutChangeListener(layoutListener)
+                newFocus.addOnAttachStateChangeListener(attachListener)
+
+                val start = FocusTarget(
+                    x = currentX,
+                    y = currentY,
+                    width = focusOutline.measuredWidth,
+                    height = focusOutline.measuredHeight
+                )
+                val end = FocusTarget(
+                    x = x,
+                    y = y,
+                    width = newFocus.measuredWidth,
+                    height = newFocus.measuredHeight
+                )
+
+                // if they are the same within then snap, aka scrolling
+                val deltaMin = 50.toPx
+                if (start.width == end.width && start.height == end.height && (start.x - end.x).absoluteValue < deltaMin && (start.y - end.y).absoluteValue < deltaMin) {
+                    animator?.cancel()
+                    last = start
+                    current = end
+                    setTargetPosition(end)
+                    return
+                }
+
+                // if running then "reuse"
+                if (animator?.isRunning == true) {
+                    current = end
+                    return
+                } else {
+                    animator?.cancel()
+                }
+
+
+                last = start
+                current = end
+
+                // if previously gone, then tp
+                if (wasGone) {
+                    setTargetPosition(current)
+                    return
+                }
+
+                // animate between a and b
+                animator = ValueAnimator.ofFloat(0.0f, 1.0f).apply {
+                    startDelay = 0
+                    duration = 100
+                    addUpdateListener { animation ->
+                        val animatedValue = animation.animatedValue as Float
+                        val target = FocusTarget.lerp(last, current, minOf(animatedValue, 1.0f))
+                        setTargetPosition(target)
+                    }
+                    start()
+                }
+
+                // post check
+                if (!same) {
+                    newFocus.postDelayed({
+                        updateFocusView(lastFocus.get(), same = true)
+                    }, 200)
+                }
+
+                /*
+
+                the following is working, but somewhat bad code code
+
+                if (!wasGone) {
+                    (focusOutline.parent as? ViewGroup)?.let {
+                        TransitionManager.endTransitions(it)
+                        TransitionManager.beginDelayedTransition(
+                            it,
+                            TransitionSet().addTransition(ChangeBounds())
+                                .addTransition(ChangeTransform())
+                                .setDuration(100)
+                        )
+                    }
+                }
+
+                focusOutline.layoutParams = focusOutline.layoutParams?.apply {
+                    width = newFocus.measuredWidth
+                    height = newFocus.measuredHeight
+                }
+                focusOutline.translationX = x.toFloat()
+                focusOutline.translationY = y.toFloat()*/
+            }
+        }
+    }
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
@@ -767,16 +987,48 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             if (isCastApiAvailable()) {
                 mSessionManager = CastContext.getSharedInstance(this).sessionManager
             }
-        } catch (e: Exception) {
-            logError(e)
+        } catch (t: Throwable) {
+            logError(t)
         }
 
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
         updateTv()
-        if (isTvSettings()) {
-            setContentView(R.layout.activity_main_tv)
-        } else {
-            setContentView(R.layout.activity_main)
+
+        // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
+        try {
+            val appVer = BuildConfig.VERSION_NAME
+            val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
+            if (appVer != lastAppAutoBackup) {
+                setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
+                backup()
+            }
+        } catch (t: Throwable) {
+            logError(t)
+        }
+
+        // just in case, MAIN SHOULD *NEVER* BOOT LOOP CRASH
+        binding = try {
+            if (isTvSettings()) {
+                val newLocalBinding = ActivityMainTvBinding.inflate(layoutInflater, null, false)
+                setContentView(newLocalBinding.root)
+                TvFocus.focusOutline = WeakReference(newLocalBinding.focusOutline)
+                newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus ->
+                    // println("refocus $oldFocus -> $newFocus")
+                    TvFocus.updateFocusView(newFocus)
+                }
+                newLocalBinding.root.viewTreeObserver.addOnScrollChangedListener {
+                    TvFocus.updateFocusView(TvFocus.lastFocus.get(), same = true)
+                }
+
+                ActivityMainBinding.bind(newLocalBinding.root) // this may crash
+            } else {
+                val newLocalBinding = ActivityMainBinding.inflate(layoutInflater, null, false)
+                setContentView(newLocalBinding.root)
+                newLocalBinding
+            }
+        } catch (t: Throwable) {
+            showToast(txt(R.string.unable_to_inflate, t.message ?: ""), Toast.LENGTH_LONG)
+            null
         }
 
         changeStatusBarState(isEmulatorSettings())
@@ -807,7 +1059,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         if (PluginManager.checkSafeModeFile()) {
             normalSafeApiCall {
-                showToast(this, R.string.safe_mode_file, Toast.LENGTH_LONG)
+                showToast(R.string.safe_mode_file, Toast.LENGTH_LONG)
             }
         } else if (lastError == null) {
             ioSafe {
@@ -861,43 +1113,44 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         observeNullable(viewModel.page) { resource ->
             if (resource == null) {
-                bottomPreviewPopup.dismissSafe(this)
+                hidePreviewPopupDialog()
                 return@observeNullable
             }
             when (resource) {
                 is Resource.Failure -> {
-                    showToast(this, R.string.error)
+                    showToast(R.string.error)
+                    viewModel.clear()
                     hidePreviewPopupDialog()
                 }
 
                 is Resource.Loading -> {
                     showPreviewPopupDialog().apply {
-                        resultview_preview_loading?.isVisible = true
-                        resultview_preview_result?.isVisible = false
-                        resultview_preview_loading_shimmer?.startShimmer()
+                        resultviewPreviewLoading.isVisible = true
+                        resultviewPreviewResult.isVisible = false
+                        resultviewPreviewLoadingShimmer.startShimmer()
                     }
                 }
 
                 is Resource.Success -> {
                     val d = resource.value
                     showPreviewPopupDialog().apply {
-                        resultview_preview_loading?.isVisible = false
-                        resultview_preview_result?.isVisible = true
-                        resultview_preview_loading_shimmer?.stopShimmer()
+                        resultviewPreviewLoading.isVisible = false
+                        resultviewPreviewResult.isVisible = true
+                        resultviewPreviewLoadingShimmer.stopShimmer()
 
-                        resultview_preview_title?.text = d.title
+                        resultviewPreviewTitle.text = d.title
 
-                        resultview_preview_meta_type.setText(d.typeText)
-                        resultview_preview_meta_year.setText(d.yearText)
-                        resultview_preview_meta_duration.setText(d.durationText)
-                        resultview_preview_meta_rating.setText(d.ratingText)
+                        resultviewPreviewMetaType.setText(d.typeText)
+                        resultviewPreviewMetaYear.setText(d.yearText)
+                        resultviewPreviewMetaDuration.setText(d.durationText)
+                        resultviewPreviewMetaRating.setText(d.ratingText)
 
-                        resultview_preview_description?.setText(d.plotText)
-                        resultview_preview_poster?.setImage(
+                        resultviewPreviewDescription.setText(d.plotText)
+                        resultviewPreviewPoster.setImage(
                             d.posterImage ?: d.posterBackgroundImage
                         )
 
-                        resultview_preview_poster?.setOnClickListener {
+                        resultviewPreviewPoster.setOnClickListener {
                             //viewModel.updateWatchStatus(WatchType.PLANTOWATCH)
                             val value = viewModel.watchStatus.value ?: WatchType.NONE
 
@@ -908,12 +1161,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                 showApply = false,
                                 {}) {
                                 viewModel.updateWatchStatus(WatchType.values()[it])
-                                bookmarksUpdatedEvent(true)
                             }
                         }
 
                         if (!isTvSettings()) // dont want this clickable on tv layout
-                            resultview_preview_description?.setOnClickListener { view ->
+                            resultviewPreviewDescription.setOnClickListener { view ->
                                 view.context?.let { ctx ->
                                     val builder: AlertDialog.Builder =
                                         AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
@@ -923,7 +1175,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                 }
                             }
 
-                        resultview_preview_more_info?.setOnClickListener {
+                        resultviewPreviewMoreInfo.setOnClickListener {
+                            viewModel.clear()
                             hidePreviewPopupDialog()
                             lastPopup?.let {
                                 loadSearchResult(it)
@@ -964,7 +1217,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         ioSafe {
             initAll()
             // No duplicates (which can happen by registerMainAPI)
-            apis = allProviders.distinctBy { it }
+            apis = synchronized(allProviders) {
+                allProviders.distinctBy { it }
+            }
         }
 
         //  val navView: BottomNavigationView = findViewById(R.id.nav_view)
@@ -977,6 +1232,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         navController.addOnDestinationChangedListener { _: NavController, navDestination: NavDestination, bundle: Bundle? ->
             // Intercept search and add a query
+            updateNavBar(navDestination)
             if (navDestination.matchDestination(R.id.navigation_search) && !nextSearchQuery.isNullOrBlank()) {
                 bundle?.apply {
                     this.putString(SearchFragment.SEARCH_QUERY, nextSearchQuery)
@@ -995,29 +1251,47 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             .setPopExitAnim(R.anim.nav_pop_exit)
             .setPopUpTo(navController.graph.startDestination, false)
             .build()*/
-        nav_view?.setupWithNavController(navController)
-        val nav_rail = findViewById<NavigationRailView?>(R.id.nav_rail_view)
-        nav_rail?.setupWithNavController(navController)
-        if (isTvSettings()) {
-            nav_rail?.background?.alpha = 200
-        } else {
-            nav_rail?.background?.alpha = 255
 
+        val rippleColor = ColorStateList.valueOf(getResourceColor(R.attr.colorPrimary, 0.1f))
+
+        binding?.navView?.apply {
+            itemRippleColor = rippleColor
+            itemActiveIndicatorColor = rippleColor
+            setupWithNavController(navController)
+            setOnItemSelectedListener { item ->
+                onNavDestinationSelected(
+                    item,
+                    navController
+                )
+            }
         }
-        nav_rail?.setOnItemSelectedListener { item ->
-            onNavDestinationSelected(
-                item,
-                navController
-            )
-        }
-        nav_view?.setOnItemSelectedListener { item ->
-            onNavDestinationSelected(
-                item,
-                navController
-            )
-        }
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-            updateNavBar(destination)
+
+        binding?.navRailView?.apply {
+            itemRippleColor = rippleColor
+            itemActiveIndicatorColor = rippleColor
+            setupWithNavController(navController)
+            if (isTvSettings()) {
+                background?.alpha = 200
+            } else {
+                background?.alpha = 255
+            }
+
+            setOnItemSelectedListener { item ->
+                onNavDestinationSelected(
+                    item,
+                    navController
+                )
+            }
+
+            fun noFocus(view: View) {
+                view.tag = view.context.getString(R.string.tv_no_focus_tag)
+                (view as? ViewGroup)?.let {
+                    for (child in it.children) {
+                        noFocus(child)
+                    }
+                }
+            }
+            noFocus(this)
         }
 
         loadCache()
@@ -1040,17 +1314,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             true
         }*/
 
-        val rippleColor = ColorStateList.valueOf(getResourceColor(R.attr.colorPrimary, 0.1f))
-        nav_view?.itemRippleColor = rippleColor
-        nav_rail?.itemRippleColor = rippleColor
-        nav_rail?.itemActiveIndicatorColor = rippleColor
-        nav_view?.itemActiveIndicatorColor = rippleColor
 
         if (!checkWrite()) {
             requestRW()
             if (checkWrite()) return
         }
-        CastButtonFactory.setUpMediaRouteButton(this, media_route_button)
+        //CastButtonFactory.setUpMediaRouteButton(this, media_route_button)
 
         // THIS IS CURRENTLY REMOVED BECAUSE HIGHER VERS OF ANDROID NEEDS A NOTIFICATION
         //if (!VideoDownloadManager.isMyServiceRunning(this, VideoDownloadKeepAliveService::class.java)) {
@@ -1117,14 +1386,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         if (BuildConfig.DEBUG) {
             var providersAndroidManifestString = "Current androidmanifest should be:\n"
-            for (api in allProviders) {
-                providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
-                    api.mainUrl.removePrefix(
-                        "https://"
-                    )
-                }\" android:pathPrefix=\"/\"/>\n"
+            synchronized(allProviders) {
+                for (api in allProviders) {
+                    providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
+                        api.mainUrl.removePrefix(
+                            "https://"
+                        )
+                    }\" android:pathPrefix=\"/\"/>\n"
+                }
             }
-
             println(providersAndroidManifestString)
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
new file mode 100644
index 00000000..7fafe05b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
@@ -0,0 +1,42 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+open class StreamoUpload : ExtractorApi() {
+    override val name = "StreamoUpload"
+    override val mainUrl = "https://streamoupload.xyz"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        val response = app.get(url, referer = referer)
+        val scriptElements = response.document.select("script").map { script ->
+            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+                val data = getAndUnpack(script.data())
+                    .substringAfter("sources:[")
+                    .substringBefore("],")
+                    .replace("file", "\"file\"")
+                    .trim()
+                tryParseJson<File>(data)?.let {
+                    M3u8Helper.generateM3u8(
+                        name,
+                        it.file,
+                        "$mainUrl/",
+                    ).forEach { m3uData -> sources.add(m3uData) }
+                }
+            }
+        }
+        return sources
+    }
+
+    private data class File(
+        @JsonProperty("file") val file: String,
+    )
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
index 07aa904e..5bbb4538 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
@@ -21,10 +21,11 @@ class CrossTmdbProvider : TmdbProvider() {
         return Regex("""[^a-zA-Z0-9-]""").replace(name, "")
     }
 
-    private val validApis by lazy {
-        apis.filter { it.lang == this.lang && it::class.java != this::class.java }
-            //.distinctBy { it.uniqueId }
-    }
+    private val validApis
+        get() =
+            synchronized(apis) { apis.filter { it.lang == this.lang && it::class.java != this::class.java } }
+    //.distinctBy { it.uniqueId }
+
 
     data class CrossMetaData(
         @JsonProperty("isSuccess") val isSuccess: Boolean,
@@ -60,7 +61,8 @@ class CrossTmdbProvider : TmdbProvider() {
 
     override suspend fun load(url: String): LoadResponse? {
         val base = super.load(url)?.apply {
-            this.recommendations = this.recommendations?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
+            this.recommendations =
+                this.recommendations?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
             val matchName = filterName(this.name)
             when (this) {
                 is MovieLoadResponse -> {
@@ -98,6 +100,7 @@ class CrossTmdbProvider : TmdbProvider() {
                     this.dataUrl =
                         CrossMetaData(true, data.map { it.apiName to it.dataUrl }).toJson()
                 }
+
                 else -> {
                     throw ErrorLoadingException("Nothing besides movies are implemented for this provider")
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
index e8ac1876..8cfe1e9a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
@@ -25,13 +25,16 @@ class MultiAnimeProvider : MainAPI() {
         }
     }
 
-    private val validApis by lazy {
-        APIHolder.apis.filter {
-            it.lang == this.lang && it::class.java != this::class.java && it.supportedTypes.contains(
-                TvType.Anime
-            )
-        }
-    }
+    private val validApis
+        get() =
+            synchronized(APIHolder.apis) {
+                APIHolder.apis.filter {
+                    it.lang == this.lang && it::class.java != this::class.java && it.supportedTypes.contains(
+                        TvType.Anime
+                    )
+                }
+            }
+
 
     private fun filterName(name: String): String {
         return Regex("""[^a-zA-Z0-9-]""").replace(name, "")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index bb15bc85..eb575775 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -57,32 +57,6 @@ fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) ->
     liveData.observe(this) { action(it) }
 }
 
-inline fun <reified T : Any> some(value: T?): Some<T> {
-    return if (value == null) {
-        Some.None
-    } else {
-        Some.Success(value)
-    }
-}
-
-sealed class Some<out T> {
-    data class Success<out T>(val value: T) : Some<T>()
-    object None : Some<Nothing>()
-
-    override fun toString(): String {
-        return when (this) {
-            is None -> "None"
-            is Success -> "Some(${value.toString()})"
-        }
-    }
-}
-
-sealed class ResourceSome<out T> {
-    data class Success<out T>(val value: T) : ResourceSome<T>()
-    object None : ResourceSome<Nothing>()
-    data class Loading(val data: Any? = null) : ResourceSome<Nothing>()
-}
-
 sealed class Resource<out T> {
     data class Success<out T>(val value: T) : Resource<T>()
     data class Failure(
@@ -155,6 +129,70 @@ fun CoroutineScope.launchSafe(
     return this.launch(context, start, obj)
 }
 
+fun<T> throwAbleToResource(
+    throwable: Throwable
+): Resource<T> {
+    return when (throwable) {
+        is NullPointerException -> {
+            for (line in throwable.stackTrace) {
+                if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
+                    return Resource.Failure(
+                        false,
+                        null,
+                        null,
+                        "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
+                    )
+                }
+            }
+            safeFail(throwable)
+        }
+        is SocketTimeoutException, is InterruptedIOException -> {
+            Resource.Failure(
+                true,
+                null,
+                null,
+                "Connection Timeout\nPlease try again later."
+            )
+        }
+        is HttpException -> {
+            Resource.Failure(
+                false,
+                throwable.statusCode,
+                null,
+                throwable.message ?: "HttpException"
+            )
+        }
+        is UnknownHostException -> {
+            Resource.Failure(true, null, null, "Cannot connect to server, try again later.\n${throwable.message}")
+        }
+        is ErrorLoadingException -> {
+            Resource.Failure(
+                true,
+                null,
+                null,
+                throwable.message ?: "Error loading, try again later."
+            )
+        }
+        is NotImplementedError -> {
+            Resource.Failure(false, null, null, "This operation is not implemented.")
+        }
+        is SSLHandshakeException -> {
+            Resource.Failure(
+                true,
+                null,
+                null,
+                (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
+            )
+        }
+        is CancellationException -> {
+            throwable.cause?.let {
+                throwAbleToResource(it)
+            } ?: safeFail(throwable)
+        }
+        else -> safeFail(throwable)
+    }
+}
+
 suspend fun <T> safeApiCall(
     apiCall: suspend () -> T,
 ): Resource<T> {
@@ -163,60 +201,7 @@ suspend fun <T> safeApiCall(
             Resource.Success(apiCall.invoke())
         } catch (throwable: Throwable) {
             logError(throwable)
-            when (throwable) {
-                is NullPointerException -> {
-                    for (line in throwable.stackTrace) {
-                        if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
-                            return@withContext Resource.Failure(
-                                false,
-                                null,
-                                null,
-                                "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
-                            )
-                        }
-                    }
-                    safeFail(throwable)
-                }
-                is SocketTimeoutException, is InterruptedIOException -> {
-                    Resource.Failure(
-                        true,
-                        null,
-                        null,
-                        "Connection Timeout\nPlease try again later."
-                    )
-                }
-                is HttpException -> {
-                    Resource.Failure(
-                        false,
-                        throwable.statusCode,
-                        null,
-                        throwable.message ?: "HttpException"
-                    )
-                }
-                is UnknownHostException -> {
-                    Resource.Failure(true, null, null, "Cannot connect to server, try again later.")
-                }
-                is ErrorLoadingException -> {
-                    Resource.Failure(
-                        true,
-                        null,
-                        null,
-                        throwable.message ?: "Error loading, try again later."
-                    )
-                }
-                is NotImplementedError -> {
-                    Resource.Failure(false, null, null, "This operation is not implemented.")
-                }
-                is SSLHandshakeException -> {
-                    Resource.Failure(
-                        true,
-                        null,
-                        null,
-                        (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
-                    )
-                }
-                else -> safeFail(throwable)
-            }
+            throwAbleToResource(throwable)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
index 242baf59..6b7dc90b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
@@ -36,7 +36,9 @@ abstract class Plugin {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) MainAPI")
         element.sourcePlugin = this.__filename
         // Race condition causing which would case duplicates if not for distinctBy
-        APIHolder.allProviders.add(element)
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.add(element)
+        }
         APIHolder.addPluginMapping(element)
     }
 
@@ -51,10 +53,14 @@ abstract class Plugin {
     }
 
     class Manifest {
-        @JsonProperty("name") var name: String? = null
-        @JsonProperty("pluginClassName") var pluginClassName: String? = null
-        @JsonProperty("version") var version: Int? = null
-        @JsonProperty("requiresResources") var requiresResources: Boolean = false
+        @JsonProperty("name")
+        var name: String? = null
+        @JsonProperty("pluginClassName")
+        var pluginClassName: String? = null
+        @JsonProperty("version")
+        var version: Int? = null
+        @JsonProperty("requiresResources")
+        var requiresResources: Boolean = false
     }
 
     /**
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 0dee57eb..49b5a752 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -163,7 +163,8 @@ object PluginManager {
     private val classLoaders: MutableMap<PathClassLoader, Plugin> =
         HashMap<PathClassLoader, Plugin>()
 
-    private var loadedLocalPlugins = false
+    var loadedLocalPlugins = false
+        private set
     private val gson = Gson()
 
     private suspend fun maybeLoadPlugin(context: Context, file: File) {
@@ -531,10 +532,14 @@ object PluginManager {
         }
 
         // remove all registered apis
-        APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
-            removePluginMapping(it)
+        synchronized(APIHolder.apis) {
+            APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
+                removePluginMapping(it)
+            }
+        }
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
         }
-        APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
         extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.__filename }
 
         classLoaders.values.removeIf { v -> v == plugin }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
index b4c07792..28ced48c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
@@ -24,7 +24,7 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         }
     }
 
-    override fun onRequestChildFocus(
+    /*override fun onRequestChildFocus(
         parent: RecyclerView,
         state: RecyclerView.State,
         child: View,
@@ -32,13 +32,17 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
     ): Boolean {
         // android.widget.FrameLayout$LayoutParams cannot be cast to androidx.recyclerview.widget.RecyclerView$LayoutParams
         return try {
-            val pos = maxOf(0, getPosition(focused!!) - 2)
-            parent.scrollToPosition(pos)
+            if(focused != null) {
+              //  val pos = maxOf(0, getPosition(focused) - 2) // IDK WHY
+                val pos = getPosition(focused)
+                if(pos >= 0) parent.scrollToPosition(pos)
+            }
+
             super.onRequestChildFocus(parent, state, child, focused)
         } catch (e: Exception) {
             false
         }
-    }
+    }*/
 
     // Allows moving right and left with focus https://gist.github.com/vganin/8930b41f55820ec49e4d
     override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
@@ -65,8 +69,17 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         val spanCount = this.spanCount
         val orientation = this.orientation
 
+        // fixes arabic by inverting left and right layout focus
+        val correctDirection = if(this.isLayoutRTL) {
+            when(direction) {
+                View.FOCUS_RIGHT -> View.FOCUS_LEFT
+                View.FOCUS_LEFT -> View.FOCUS_RIGHT
+                else -> direction
+            }
+        } else direction
+
         if (orientation == VERTICAL) {
-            when (direction) {
+            when (correctDirection) {
                 View.FOCUS_DOWN -> {
                     return spanCount
                 }
@@ -81,7 +94,7 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
                 }
             }
         } else if (orientation == HORIZONTAL) {
-            when (direction) {
+            when (correctDirection) {
                 View.FOCUS_DOWN -> {
                     return 1
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
index 556ebd34..c7041776 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
@@ -16,14 +16,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.R
-import kotlinx.android.synthetic.main.activity_easter_egg_monke.*
-import java.util.*
+import com.lagradost.cloudstream3.databinding.ActivityEasterEggMonkeBinding
 
 class EasterEggMonke : AppCompatActivity() {
 
+    lateinit var binding : ActivityEasterEggMonkeBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_easter_egg_monke)
+
+        binding = ActivityEasterEggMonkeBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         val handler = Handler(mainLooper)
         lateinit var runnable: Runnable
@@ -32,15 +34,14 @@ class EasterEggMonke : AppCompatActivity() {
             handler.postDelayed(runnable, 300)
         }
         handler.postDelayed(runnable, 1000)
-
     }
 
     private fun shower() {
 
-        val containerW = frame.width
-        val containerH = frame.height
-        var starW: Float = monke.width.toFloat()
-        var starH: Float = monke.height.toFloat()
+        val containerW = binding.frame.width
+        val containerH = binding.frame.height
+        var starW: Float = binding.monke.width.toFloat()
+        var starH: Float = binding.monke.height.toFloat()
 
         val newStar = AppCompatImageView(this)
         val idx = (monkeys.size * Math.random()).toInt()
@@ -48,7 +49,7 @@ class EasterEggMonke : AppCompatActivity() {
         newStar.isVisible = true
         newStar.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
             FrameLayout.LayoutParams.WRAP_CONTENT)
-        frame.addView(newStar)
+        binding.frame.addView(newStar)
 
         newStar.scaleX = Math.random().toFloat() * 1.5f +  newStar.scaleX
         newStar.scaleY = newStar.scaleX
@@ -70,7 +71,7 @@ class EasterEggMonke : AppCompatActivity() {
 
         set.addListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                frame.removeView(newStar)
+                binding.frame.removeView(newStar)
             }
         })
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
index 19e24f74..9ed58e2c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
@@ -12,20 +12,23 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.databinding.FragmentWebviewBinding
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
-import kotlinx.android.synthetic.main.fragment_webview.*
+
 
 class WebviewFragment : Fragment() {
+
+    var binding: FragmentWebviewBinding? = null
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val url = arguments?.getString(WEBVIEW_URL) ?: "".also {
             findNavController().popBackStack()
         }
 
-        web_view.webViewClient = object : WebViewClient() {
+        binding?.webView?.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
                 request: WebResourceRequest?
@@ -40,24 +43,28 @@ class WebviewFragment : Fragment() {
                 return super.shouldOverrideUrlLoading(view, request)
             }
         }
+        binding?.webView?.apply {
+            WebViewResolver.webViewUserAgent = settings.userAgentString
 
-        WebViewResolver.webViewUserAgent = web_view.settings.userAgentString
-
-        web_view.addJavascriptInterface(RepoApi(activity), "RepoApi")
-        web_view.settings.javaScriptEnabled = true
-        web_view.settings.userAgentString = USER_AGENT
-        web_view.settings.domStorageEnabled = true
+            addJavascriptInterface(RepoApi(activity), "RepoApi")
+            settings.javaScriptEnabled = true
+            settings.userAgentString = USER_AGENT
+            settings.domStorageEnabled = true
 //        WebView.setWebContentsDebuggingEnabled(true)
 
-        web_view.loadUrl(url)
+            loadUrl(url)
+        }
+
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
+        val localBinding = FragmentWebviewBinding.inflate(inflater, container, false)
+        binding = localBinding
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_webview, container, false)
+        return localBinding.root//inflater.inflate(R.layout.fragment_webview, container, false)
     }
 
     companion object {
@@ -70,7 +77,7 @@ class WebviewFragment : Fragment() {
 
     private class RepoApi(val activity: FragmentActivity?) {
         @JavascriptInterface
-         fun installRepo(repoUrl: String) {
+        fun installRepo(repoUrl: String) {
             activity?.loadRepository(repoUrl)
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
index add36f1a..10ce67a7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
@@ -5,6 +5,7 @@ import android.content.DialogInterface
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -19,7 +20,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
 
 object DownloadButtonSetup {
-    fun handleDownloadClick(activity: Activity?, click: DownloadClickEvent) {
+    fun handleDownloadClick(click: DownloadClickEvent) {
         val id = click.data.id
         if (click.data !is VideoDownloadHelper.DownloadEpisodeCached) return
         when (click.action) {
@@ -89,9 +90,9 @@ object DownloadButtonSetup {
                         )?.fileLength
                             ?: 0
                     if (length > 0) {
-                        showToast(act, R.string.delete, Toast.LENGTH_LONG)
+                        showToast(R.string.delete, Toast.LENGTH_LONG)
                     } else {
-                        showToast(act, R.string.download, Toast.LENGTH_LONG)
+                        showToast(R.string.download, Toast.LENGTH_LONG)
                     }
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonViewHolder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonViewHolder.kt
deleted file mode 100644
index 0096ff42..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonViewHolder.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lagradost.cloudstream3.ui.download
-
-interface DownloadButtonViewHolder {
-    var downloadButton : EasyDownloadButton
-    fun reattachDownloadButton()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt
index a541171b..b4774cf8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt
@@ -3,18 +3,12 @@ package com.lagradost.cloudstream3.ui.download
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.widget.ContentLoadingProgressBar
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.DownloadChildEpisodeBinding
 import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import kotlinx.android.synthetic.main.download_child_episode.view.*
-import java.util.*
 
 const val DOWNLOAD_ACTION_PLAY_FILE = 0
 const val DOWNLOAD_ACTION_DELETE_FILE = 1
@@ -36,39 +30,9 @@ class DownloadChildAdapter(
     private val clickCallback: (DownloadClickEvent) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
-    private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
-        return Collections.unmodifiableSet(mBoundViewHolders)
-    }
-
-    fun killAdapter() {
-        getAllBoundViewHolders()?.forEach { view ->
-            view?.downloadButton?.dispose()
-        }
-    }
-
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-        }
-    }
-
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-            mBoundViewHolders.remove(holder)
-        }
-    }
-
-    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.reattachDownloadButton()
-        }
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return DownloadChildViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.download_child_episode, parent, false),
+            DownloadChildEpisodeBinding.inflate(LayoutInflater.from(parent.context), parent, false),
             clickCallback
         )
     }
@@ -77,7 +41,6 @@ class DownloadChildAdapter(
         when (holder) {
             is DownloadChildViewHolder -> {
                 holder.bind(cardList[position])
-                mBoundViewHolders.add(holder)
             }
         }
     }
@@ -88,66 +51,44 @@ class DownloadChildAdapter(
 
     class DownloadChildViewHolder
     constructor(
-        itemView: View,
+        val binding: DownloadChildEpisodeBinding,
         private val clickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView), DownloadButtonViewHolder {
-        override var downloadButton = EasyDownloadButton()
+    ) : RecyclerView.ViewHolder(binding.root) {
 
-        private val title: TextView = itemView.download_child_episode_text
+        /*private val title: TextView = itemView.download_child_episode_text
         private val extraInfo: TextView = itemView.download_child_episode_text_extra
         private val holder: CardView = itemView.download_child_episode_holder
         private val progressBar: ContentLoadingProgressBar = itemView.download_child_episode_progress
         private val progressBarDownload: ContentLoadingProgressBar = itemView.download_child_episode_progress_downloaded
-        private val downloadImage: ImageView = itemView.download_child_episode_download
+        private val downloadImage: ImageView = itemView.download_child_episode_download*/
 
-        private var localCard: VisualDownloadChildCached? = null
 
         fun bind(card: VisualDownloadChildCached) {
-            localCard = card
             val d = card.data
 
             val posDur = getViewPos(d.id)
-            if (posDur != null) {
-                val visualPos = posDur.fixVisual()
-                progressBar.max = (visualPos.duration / 1000).toInt()
-                progressBar.progress = (visualPos.position / 1000).toInt()
-                progressBar.visibility = View.VISIBLE
-            } else {
-                progressBar.visibility = View.GONE
+            binding.downloadChildEpisodeProgress.apply {
+                if (posDur != null) {
+                    val visualPos = posDur.fixVisual()
+                    max = (visualPos.duration / 1000).toInt()
+                    progress = (visualPos.position / 1000).toInt()
+                    visibility = View.VISIBLE
+                } else {
+                    visibility = View.GONE
+                }
             }
 
-            title.text = title.context.getNameFull(d.name, d.episode, d.season)
-            title.isSelected = true // is needed for text repeating
+            binding.downloadButton.setDefaultClickListener(card.data, binding.downloadChildEpisodeTextExtra, clickCallback)
 
-            downloadButton.setUpButton(
-                card.currentBytes,
-                card.totalBytes,
-                progressBarDownload,
-                downloadImage,
-                extraInfo,
-                card.data,
-                clickCallback
-            )
+            binding.downloadChildEpisodeText.apply {
+                text = context.getNameFull(d.name, d.episode, d.season)
+                isSelected = true // is needed for text repeating
+            }
 
-            holder.setOnClickListener {
+
+            binding.downloadChildEpisodeHolder.setOnClickListener {
                 clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, d))
             }
         }
-
-        override fun reattachDownloadButton() {
-            downloadButton.dispose()
-            val card = localCard
-            if (card != null) {
-                downloadButton.setUpButton(
-                    card.currentBytes,
-                    card.totalBytes,
-                    progressBarDownload,
-                    downloadImage,
-                    extraInfo,
-                    card.data,
-                    clickCallback
-                )
-            }
-        }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
index 477a18e0..1d813ef1 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
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentChildDownloadsBinding
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
@@ -15,13 +16,12 @@ import com.lagradost.cloudstream3.utils.DataStore.getKeys
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.fragment_child_downloads.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class DownloadChildFragment : Fragment() {
     companion object {
-        fun newInstance(headerName: String, folder: String) : Bundle {
+        fun newInstance(headerName: String, folder: String): Bundle {
             return Bundle().apply {
                 putString("folder", folder)
                 putString("name", headerName)
@@ -30,13 +30,20 @@ class DownloadChildFragment : Fragment() {
     }
 
     override fun onDestroyView() {
-        (download_child_list?.adapter as DownloadChildAdapter?)?.killAdapter()
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent -= it }
+        binding = null
         super.onDestroyView()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_child_downloads, container, false)
+    var binding: FragmentChildDownloadsBinding? = null
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val localBinding = FragmentChildDownloadsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_child_downloads, container, false)
     }
 
     private fun updateList(folder: String) = main {
@@ -50,14 +57,15 @@ class DownloadChildFragment : Fragment() {
                         ?: return@mapNotNull null
                     VisualDownloadChildCached(info.fileLength, info.totalBytes, it)
                 }
-            }.sortedBy { it.data.episode + (it.data.season?: 0)*100000 }
+            }.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 }
             if (eps.isEmpty()) {
                 activity?.onBackPressed()
                 return@main
             }
 
-            (download_child_list?.adapter as DownloadChildAdapter? ?: return@main).cardList = eps
-            download_child_list?.adapter?.notifyDataSetChanged()
+            (binding?.downloadChildList?.adapter as DownloadChildAdapter? ?: return@main).cardList =
+                eps
+            binding?.downloadChildList?.adapter?.notifyDataSetChanged()
         }
     }
 
@@ -72,23 +80,26 @@ class DownloadChildFragment : Fragment() {
             activity?.onBackPressed() // TODO FIX
             return
         }
-        context?.fixPaddingStatusbar(download_child_root)
+        fixPaddingStatusbar(binding?.downloadChildRoot)
 
-        download_child_toolbar.title = name
-        download_child_toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-        download_child_toolbar.setNavigationOnClickListener {
-            activity?.onBackPressed()
+        binding?.downloadChildToolbar?.apply {
+            title = name
+            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+            setNavigationOnClickListener {
+                activity?.onBackPressed()
+            }
         }
 
+
         val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
             DownloadChildAdapter(
                 ArrayList(),
             ) { click ->
-                handleDownloadClick(activity, click)
+                handleDownloadClick(click)
             }
 
         downloadDeleteEventListener = { id: Int ->
-            val list = (download_child_list?.adapter as DownloadChildAdapter?)?.cardList
+            val list = (binding?.downloadChildList?.adapter as DownloadChildAdapter?)?.cardList
             if (list != null) {
                 if (list.any { it.data.id == id }) {
                     updateList(folder)
@@ -98,8 +109,8 @@ class DownloadChildFragment : Fragment() {
 
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
 
-        download_child_list.adapter = adapter
-        download_child_list.layoutManager = GridLayoutManager(context, 1)
+        binding?.downloadChildList?.adapter = adapter
+        binding?.downloadChildList?.layoutManager = GridLayoutManager(context, 1)
 
         updateList(folder)
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index e80a8fa5..c8b381a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -34,10 +34,10 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.fragment_downloads.*
-import kotlinx.android.synthetic.main.stream_input.*
 import android.text.format.Formatter.formatShortFileSize
 import androidx.core.widget.doOnTextChanged
+import com.lagradost.cloudstream3.databinding.FragmentDownloadsBinding
+import com.lagradost.cloudstream3.databinding.StreamInputBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.player.BasicLink
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -60,8 +60,8 @@ class DownloadFragment : Fragment() {
 
     private fun setList(list: List<VisualDownloadHeaderCached>) {
         main {
-            (download_list?.adapter as DownloadHeaderAdapter?)?.cardList = list
-            download_list?.adapter?.notifyDataSetChanged()
+            (binding?.downloadList?.adapter as DownloadHeaderAdapter?)?.cardList = list
+            binding?.downloadList?.adapter?.notifyDataSetChanged()
         }
     }
 
@@ -70,10 +70,12 @@ class DownloadFragment : Fragment() {
             VideoDownloadManager.downloadDeleteEvent -= downloadDeleteEventListener!!
             downloadDeleteEventListener = null
         }
-        (download_list?.adapter as DownloadHeaderAdapter?)?.killAdapter()
+        binding = null
         super.onDestroyView()
     }
 
+    var binding : FragmentDownloadsBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -82,7 +84,9 @@ class DownloadFragment : Fragment() {
         downloadsViewModel =
             ViewModelProvider(this)[DownloadViewModel::class.java]
 
-        return inflater.inflate(R.layout.fragment_downloads, container, false)
+        val localBinding = FragmentDownloadsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_downloads, container, false)
     }
 
     private var downloadDeleteEventListener: ((Int) -> Unit)? = null
@@ -92,36 +96,40 @@ class DownloadFragment : Fragment() {
         hideKeyboard()
 
         observe(downloadsViewModel.noDownloadsText) {
-            text_no_downloads.text = it
+            binding?.textNoDownloads?.text = it
         }
         observe(downloadsViewModel.headerCards) {
             setList(it)
-            download_loading.isVisible = false
+            binding?.downloadLoading?.isVisible = false
         }
         observe(downloadsViewModel.availableBytes) {
-            download_free_txt?.text =
+            binding?.downloadFreeTxt?.text =
                 getString(R.string.storage_size_format).format(
                     getString(R.string.free_storage),
                     formatShortFileSize(view.context, it)
                 )
-            download_free?.setLayoutWidth(it)
+            binding?.downloadFree?.setLayoutWidth(it)
         }
         observe(downloadsViewModel.usedBytes) {
-            download_used_txt?.text =
-                getString(R.string.storage_size_format).format(
-                    getString(R.string.used_storage),
-                    formatShortFileSize(view.context, it)
-                )
-            download_used?.setLayoutWidth(it)
-            download_storage_appbar?.isVisible = it > 0
+            binding?.apply {
+                downloadUsedTxt.text =
+                    getString(R.string.storage_size_format).format(
+                        getString(R.string.used_storage),
+                        formatShortFileSize(view.context, it)
+                    )
+                downloadUsed.setLayoutWidth(it)
+                downloadStorageAppbar.isVisible = it > 0
+            }
         }
         observe(downloadsViewModel.downloadBytes) {
-            download_app_txt?.text =
-                getString(R.string.storage_size_format).format(
-                    getString(R.string.app_storage),
-                    formatShortFileSize(view.context, it)
-                )
-            download_app?.setLayoutWidth(it)
+            binding?.apply {
+                downloadAppTxt.text =
+                    getString(R.string.storage_size_format).format(
+                        getString(R.string.app_storage),
+                        formatShortFileSize(view.context, it)
+                    )
+                downloadApp.setLayoutWidth(it)
+            }
         }
 
         val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
@@ -154,7 +162,7 @@ class DownloadFragment : Fragment() {
                 },
                 { downloadClickEvent ->
                     if (downloadClickEvent.data !is VideoDownloadHelper.DownloadEpisodeCached) return@DownloadHeaderAdapter
-                    handleDownloadClick(activity, downloadClickEvent)
+                    handleDownloadClick(downloadClickEvent)
                     if (downloadClickEvent.action == DOWNLOAD_ACTION_DELETE_FILE) {
                         context?.let { ctx ->
                             downloadsViewModel.updateList(ctx)
@@ -164,7 +172,7 @@ class DownloadFragment : Fragment() {
             )
 
         downloadDeleteEventListener = { id ->
-            val list = (download_list?.adapter as DownloadHeaderAdapter?)?.cardList
+            val list = (binding?.downloadList?.adapter as DownloadHeaderAdapter?)?.cardList
             if (list != null) {
                 if (list.any { it.data.id == id }) {
                     context?.let { ctx ->
@@ -177,31 +185,36 @@ class DownloadFragment : Fragment() {
 
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
 
-        download_list?.adapter = adapter
-        download_list?.layoutManager = GridLayoutManager(context, 1)
+        binding?.downloadList?.apply {
+            this.adapter = adapter
+            layoutManager = GridLayoutManager(context, 1)
+        }
 
         // Should be visible in emulator layout
-        download_stream_button?.isGone = isTrueTvSettings()
-        download_stream_button?.setOnClickListener {
+        binding?.downloadStreamButton?.isGone = isTrueTvSettings()
+        binding?.downloadStreamButton?.setOnClickListener {
             val dialog =
                 Dialog(it.context ?: return@setOnClickListener, R.style.AlertDialogCustom)
-            dialog.setContentView(R.layout.stream_input)
+
+            val binding = StreamInputBinding.inflate(dialog.layoutInflater)
+
+            dialog.setContentView(binding.root)
 
             dialog.show()
 
             // If user has clicked the switch do not interfere
             var preventAutoSwitching = false
-            dialog.hls_switch?.setOnClickListener {
+            binding.hlsSwitch.setOnClickListener {
                 preventAutoSwitching = true
             }
 
             fun activateSwitchOnHls(text: String?) {
-                dialog.hls_switch?.isChecked = normalSafeApiCall {
+                binding.hlsSwitch.isChecked = normalSafeApiCall {
                     URI(text).path?.substringAfterLast(".")?.contains("m3u")
                 } == true
             }
 
-            dialog.stream_referer?.doOnTextChanged { text, _, _, _ ->
+            binding.streamReferer.doOnTextChanged { text, _, _, _ ->
                 if (!preventAutoSwitching)
                     activateSwitchOnHls(text?.toString())
             }
@@ -210,16 +223,16 @@ class DownloadFragment : Fragment() {
                 0
             )?.text?.toString()?.let { copy ->
                 val fixedText = copy.trim()
-                dialog.stream_url?.setText(fixedText)
+                binding.streamUrl.setText(fixedText)
                 activateSwitchOnHls(fixedText)
             }
 
-            dialog.apply_btt?.setOnClickListener {
-                val url = dialog.stream_url.text?.toString()
+            binding.applyBtt.setOnClickListener {
+                val url = binding.streamUrl.text?.toString()
                 if (url.isNullOrEmpty()) {
-                    showToast(activity, R.string.error_invalid_url, Toast.LENGTH_SHORT)
+                    showToast(R.string.error_invalid_url, Toast.LENGTH_SHORT)
                 } else {
-                    val referer = dialog.stream_referer.text?.toString()
+                    val referer = binding.streamReferer.text?.toString()
 
                     activity?.navigate(
                         R.id.global_to_navigation_player,
@@ -228,7 +241,7 @@ class DownloadFragment : Fragment() {
                                 listOf(BasicLink(url)),
                                 extract = true,
                                 referer = referer,
-                                isM3u8 = dialog.hls_switch?.isChecked
+                                isM3u8 = binding.hlsSwitch.isChecked
                             )
                         )
                     )
@@ -237,22 +250,22 @@ class DownloadFragment : Fragment() {
                 }
             }
 
-            dialog.cancel_btt?.setOnClickListener {
+            binding.cancelBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            download_list?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+            binding?.downloadList?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 val dy = scrollY - oldScrollY
                 if (dy > 0) { //check for scroll down
-                    download_stream_button?.shrink() // hide
+                    binding?.downloadStreamButton?.shrink() // hide
                 } else if (dy < -5) {
-                    download_stream_button?.extend() // show
+                    binding?.downloadStreamButton?.extend() // show
                 }
             }
         }
         downloadsViewModel.updateList(requireContext())
 
-        context?.fixPaddingStatusbar(download_root)
+        fixPaddingStatusbar(binding?.downloadRoot)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
index 29bb303a..65a6441f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
@@ -5,16 +5,13 @@ import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.widget.ContentLoadingProgressBar
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.DownloadHeaderEpisodeBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import kotlinx.android.synthetic.main.download_header_episode.view.*
 import java.util.*
 
 data class VisualDownloadHeaderCached(
@@ -26,7 +23,10 @@ data class VisualDownloadHeaderCached(
     val child: VideoDownloadHelper.DownloadEpisodeCached?,
 )
 
-data class DownloadHeaderClickEvent(val action: Int, val data: VideoDownloadHelper.DownloadHeaderCached)
+data class DownloadHeaderClickEvent(
+    val action: Int,
+    val data: VideoDownloadHelper.DownloadHeaderCached
+)
 
 class DownloadHeaderAdapter(
     var cardList: List<VisualDownloadHeaderCached>,
@@ -34,39 +34,13 @@ class DownloadHeaderAdapter(
     private val movieClickCallback: (DownloadClickEvent) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
-    private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
-        return Collections.unmodifiableSet(mBoundViewHolders)
-    }
-
-    fun killAdapter() {
-        getAllBoundViewHolders()?.forEach { view ->
-            view?.downloadButton?.dispose()
-        }
-    }
-
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-        }
-    }
-
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-            mBoundViewHolders.remove(holder)
-        }
-    }
-
-    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.reattachDownloadButton()
-        }
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return DownloadHeaderViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.download_header_episode, parent, false),
+            DownloadHeaderEpisodeBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            ),
             clickCallback,
             movieClickCallback
         )
@@ -76,7 +50,6 @@ class DownloadHeaderAdapter(
         when (holder) {
             is DownloadHeaderViewHolder -> {
                 holder.bind(cardList[position])
-                mBoundViewHolders.add(holder)
             }
         }
     }
@@ -87,93 +60,89 @@ class DownloadHeaderAdapter(
 
     class DownloadHeaderViewHolder
     constructor(
-        itemView: View,
+        val binding: DownloadHeaderEpisodeBinding,
         private val clickCallback: (DownloadHeaderClickEvent) -> Unit,
         private val movieClickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView), DownloadButtonViewHolder {
-        override var downloadButton = EasyDownloadButton()
+    ) : RecyclerView.ViewHolder(binding.root) {
 
-        private val poster: ImageView? = itemView.download_header_poster
+        /*private val poster: ImageView? = itemView.download_header_poster
         private val title: TextView = itemView.download_header_title
         private val extraInfo: TextView = itemView.download_header_info
         private val holder: CardView = itemView.episode_holder
 
         private val downloadBar: ContentLoadingProgressBar = itemView.download_header_progress_downloaded
         private val downloadImage: ImageView = itemView.download_header_episode_download
-        private val normalImage: ImageView = itemView.download_header_goto_child
-        private var localCard: VisualDownloadHeaderCached? = null
+        private val normalImage: ImageView = itemView.download_header_goto_child*/
 
         @SuppressLint("SetTextI18n")
         fun bind(card: VisualDownloadHeaderCached) {
-            localCard = card
             val d = card.data
 
-            poster?.setImage(d.poster)
-            poster?.setOnClickListener {
-                clickCallback.invoke(DownloadHeaderClickEvent(1, d))
+            binding.downloadHeaderPoster.apply {
+                setImage(d.poster)
+                setOnClickListener {
+                    clickCallback.invoke(DownloadHeaderClickEvent(1, d))
+                }
             }
 
-            title.text = d.name
-            val mbString = formatShortFileSize(itemView.context, card.totalBytes)
+            binding.apply {
 
-            //val isMovie = d.type.isMovieType()
-            if (card.child != null) {
-                downloadBar.visibility = View.VISIBLE
-                downloadImage.visibility = View.VISIBLE
-                normalImage.visibility = View.GONE
-                /*setUpButton(
-                    card.currentBytes,
-                    card.totalBytes,
-                    downloadBar,
-                    downloadImage,
-                    extraInfo,
-                    card.child,
-                    movieClickCallback
-                )*/
+                binding.downloadHeaderTitle.text = d.name
+                val mbString = formatShortFileSize(itemView.context, card.totalBytes)
 
-                holder.setOnClickListener {
-                    movieClickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, card.child))
-                }
-            } else {
-                downloadBar.visibility = View.GONE
-                downloadImage.visibility = View.GONE
-                normalImage.visibility = View.VISIBLE
+                //val isMovie = d.type.isMovieType()
+                if (card.child != null) {
+                    //downloadHeaderProgressDownloaded.visibility = View.VISIBLE
 
-                try {
-                    extraInfo.text =
-                        extraInfo.context.getString(R.string.extra_info_format).format(
-                            card.totalDownloads,
-                            if (card.totalDownloads == 1) extraInfo.context.getString(R.string.episode) else extraInfo.context.getString(
-                                R.string.episodes
-                            ),
-                            mbString
+                   // downloadHeaderEpisodeDownload.visibility = View.VISIBLE
+                    binding.downloadHeaderGotoChild.visibility = View.GONE
+
+                    downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, movieClickCallback)
+                    downloadButton.isVisible = true
+                    /*setUpButton(
+                        card.currentBytes,
+                        card.totalBytes,
+                        downloadBar,
+                        downloadImage,
+                        extraInfo,
+                        card.child,
+                        movieClickCallback
+                    )*/
+
+                    episodeHolder.setOnClickListener {
+                        movieClickCallback.invoke(
+                            DownloadClickEvent(
+                                DOWNLOAD_ACTION_PLAY_FILE,
+                                card.child
+                            )
                         )
-                } catch (t : Throwable) {
-                    // you probably formatted incorrectly
-                    extraInfo.text = "Error"
-                    logError(t)
+                    }
+                } else {
+                    downloadButton.isVisible = false
+                   // downloadHeaderProgressDownloaded.visibility = View.GONE
+                   // downloadHeaderEpisodeDownload.visibility = View.GONE
+                    binding.downloadHeaderGotoChild.visibility = View.VISIBLE
+
+                    try {
+                        downloadHeaderInfo.text =
+                            downloadHeaderInfo.context.getString(R.string.extra_info_format).format(
+                                card.totalDownloads,
+                                if (card.totalDownloads == 1) downloadHeaderInfo.context.getString(R.string.episode) else downloadHeaderInfo.context.getString(
+                                    R.string.episodes
+                                ),
+                                mbString
+                            )
+                    } catch (t: Throwable) {
+                        // you probably formatted incorrectly
+                        downloadHeaderInfo.text = "Error"
+                        logError(t)
+                    }
+
+
+                    episodeHolder.setOnClickListener {
+                        clickCallback.invoke(DownloadHeaderClickEvent(0, d))
+                    }
                 }
-
-
-                holder.setOnClickListener {
-                    clickCallback.invoke(DownloadHeaderClickEvent(0, d))
-                }
-            }
-        }
-
-        override fun reattachDownloadButton() {
-            downloadButton.dispose()
-            val card = localCard
-            if (card?.child != null) {
-                downloadButton.setUpButton(
-                    card.currentBytes,
-                    card.totalBytes,
-                    downloadBar,
-                    downloadImage,
-                    extraInfo,
-                    card.child,
-                    movieClickCallback
-                )
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
new file mode 100644
index 00000000..05f630a0
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
@@ -0,0 +1,199 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.content.Context
+import android.text.format.Formatter
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.view.isVisible
+import androidx.core.widget.ContentLoadingProgressBar
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
+
+typealias DownloadStatusTell = VideoDownloadManager.DownloadType
+
+data class DownloadMetadata(
+    var id: Int,
+    var downloadedLength: Long,
+    var totalLength: Long,
+    var status: DownloadStatusTell? = null
+) {
+    val progressPercentage: Long
+        get() = if (downloadedLength < 1024) 0 else maxOf(
+            0,
+            minOf(100, (downloadedLength * 100L) / totalLength)
+        )
+}
+
+abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
+    FrameLayout(context, attributeSet) {
+
+    var persistentId: Int? = null // used to save sessions
+
+    lateinit var progressBar: ContentLoadingProgressBar
+    var progressText: TextView? = null
+
+    /*val gid: String? get() = sessionIdToGid[persistentId]
+
+    // used for resuming data
+    var _lastRequestOverride: UriRequest? = null
+    var lastRequest: UriRequest?
+        get() = _lastRequestOverride ?: sessionIdToLastRequest[persistentId]
+        set(value) {
+            _lastRequestOverride = value
+        }
+
+    var files: List<AbstractClient.JsonFile> = emptyList()*/
+    protected var isZeroBytes: Boolean = true
+
+    fun inflate(@LayoutRes layout: Int) {
+        inflate(context, layout, this)
+    }
+
+    init {
+        resetViewData()
+    }
+
+    open fun resetViewData() {
+        // lastRequest = null
+        isZeroBytes = true
+        persistentId = null
+    }
+
+    var currentMetaData: DownloadMetadata =
+        DownloadMetadata(0, 0, 0, null)
+
+    fun setPersistentId(id: Int) {
+        persistentId = id
+        currentMetaData.id = id
+
+        VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id)?.let { savedData ->
+            val downloadedBytes = savedData.fileLength
+            val totalBytes = savedData.totalBytes
+
+            /*lastRequest = savedData.uriRequest
+            files = savedData.files
+
+            var totalBytes: Long = 0
+            var downloadedBytes: Long = 0
+            for (file in savedData.files) {
+                downloadedBytes += file.completedLength
+                totalBytes += file.length
+            }*/
+            setProgress(downloadedBytes, totalBytes)
+            // some extra padding for just in case
+            val status = VideoDownloadManager.downloadStatus[id]
+                ?: if (downloadedBytes > 1024L && downloadedBytes + 1024L >= totalBytes) DownloadStatusTell.IsDone else DownloadStatusTell.IsPaused
+            currentMetaData.apply {
+                this.id = id
+                this.downloadedLength = downloadedBytes
+                this.totalLength = totalBytes
+                this.status = status
+            }
+            setStatus(status)
+        } ?: run {
+            resetView()
+        }
+    }
+
+    abstract fun setStatus(status: VideoDownloadManager.DownloadType?)
+
+    open fun setProgress(downloadedBytes: Long, totalBytes: Long) {
+        isZeroBytes = downloadedBytes == 0L
+        val steps = 10000L
+        progressBar.max = steps.toInt()
+        // div by zero error and 1 byte off is ok impo
+        val progress = (downloadedBytes * steps / (totalBytes + 1L)).toInt()
+
+        val animation = ProgressBarAnimation(
+            progressBar,
+            progressBar.progress.toFloat(),
+            progress.toFloat()
+        ).apply {
+            fillAfter = true
+            duration =
+                if (progress > progressBar.progress) // we don't want to animate backward changes in progress
+                    100
+                else
+                    0L
+        }
+
+        if (isZeroBytes) {
+            progressText?.isVisible = false
+        } else {
+            progressText?.apply {
+                val currentMbString = Formatter.formatShortFileSize(context, downloadedBytes)
+                val totalMbString = Formatter.formatShortFileSize(context, totalBytes)
+                text =
+                        //if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else
+                    context?.getString(R.string.download_size_format)
+                        ?.format(currentMbString, totalMbString)
+            }
+        }
+
+        progressBar.startAnimation(animation)
+    }
+
+    fun downloadStatusEvent(data: Pair<Int, VideoDownloadManager.DownloadType>) {
+        val (id, status) = data
+        if (id == persistentId) {
+            currentMetaData.status = status
+            setStatus(status)
+        }
+    }
+
+    /*fun downloadDeleteEvent(data: Int) {
+
+    }*/
+
+    /*fun downloadEvent(data: Pair<Int, VideoDownloadManager.DownloadActionType>) {
+        val (id, action) = data
+
+    }*/
+
+    fun downloadProgressEvent(data: Triple<Int, Long, Long>) {
+        val (id, bytesDownloaded, bytesTotal) = data
+        if (id == persistentId) {
+            currentMetaData.downloadedLength = bytesDownloaded
+            currentMetaData.totalLength = bytesTotal
+
+            setProgress(bytesDownloaded, bytesTotal)
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent
+        //VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
+        //VideoDownloadManager.downloadEvent += ::downloadEvent
+        VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent
+
+        val pid = persistentId
+        if (pid != null) {
+            // refresh in case of onDetachedFromWindow -> onAttachedToWindow while still being ???????
+            setPersistentId(pid)
+        }
+
+        super.onAttachedToWindow()
+    }
+
+    override fun onDetachedFromWindow() {
+        VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent
+        //VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
+        //VideoDownloadManager.downloadEvent -= ::downloadEvent
+        VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent
+
+        super.onDetachedFromWindow()
+    }
+
+    /**
+     * No checks required. Arg will always include a download with current id
+     * */
+    abstract fun updateViewOnDownload(metadata: DownloadMetadata)
+
+    /**
+     * Get a clean slate again, might be useful in recyclerview?
+     * */
+    abstract fun resetView()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt
new file mode 100644
index 00000000..bb2ba7b1
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt
@@ -0,0 +1,56 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.google.android.material.button.MaterialButton
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+
+class DownloadButton(context: Context, attributeSet: AttributeSet) :
+    PieFetchButton(context, attributeSet) {
+
+    var mainText: TextView? = null
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        progressText = findViewById(R.id.result_movie_download_text_precentage)
+        mainText = findViewById(R.id.result_movie_download_text)
+    }
+
+    override fun setStatus(status: DownloadStatusTell?) {
+        super.setStatus(status)
+        val txt = when (status) {
+            DownloadStatusTell.IsPaused -> R.string.download_paused
+            DownloadStatusTell.IsDownloading -> R.string.downloading
+            DownloadStatusTell.IsDone -> R.string.downloaded
+            else -> R.string.download
+        }
+        mainText?.setText(txt)
+    }
+
+    override fun setDefaultClickListener(
+        card: VideoDownloadHelper.DownloadEpisodeCached,
+        textView: TextView?,
+        callback: (DownloadClickEvent) -> Unit
+    ) {
+        this.setDefaultClickListener(
+            this.findViewById<MaterialButton>(R.id.download_movie_button),
+            textView,
+            card,
+            callback
+        )
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun updateViewOnDownload(metadata: DownloadMetadata) {
+        super.updateViewOnDownload(metadata)
+
+        val isVis = metadata.progressPercentage > 0
+        progressText?.isVisible = isVis
+        if (isVis)
+            progressText?.text = "${metadata.progressPercentage}%"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
new file mode 100644
index 00000000..0b7a7fea
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
@@ -0,0 +1,322 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.view.animation.AnimationUtils
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PAUSE_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PLAY_FILE
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_RESUME_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
+
+
+open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
+    BaseFetchButton(context, attributeSet) {
+
+    private var waitingAnimation: Int = 0
+    private var animateWaiting: Boolean = false
+    private var activeOutline: Int = 0
+    private var nonActiveOutline: Int = 0
+
+    private var iconInit: Int = 0
+    private var iconError: Int = 0
+    private var iconComplete: Int = 0
+    private var iconActive: Int = 0
+    private var iconWaiting: Int = 0
+    private var iconRemoved: Int = 0
+    private var iconPaused: Int = 0
+    private var hideWhenIcon: Boolean = true
+
+    var overrideLayout: Int? = null
+
+    companion object {
+        val fillArray = arrayOf(
+            R.drawable.circular_progress_bar_clockwise,
+            R.drawable.circular_progress_bar_counter_clockwise,
+            R.drawable.circular_progress_bar_small_to_large,
+            R.drawable.circular_progress_bar_top_to_bottom,
+        )
+    }
+
+    private var progressBarBackground: View
+    private var statusView: ImageView
+
+    open fun onInflate() {}
+
+    init {
+        context.obtainStyledAttributes(attributeSet, R.styleable.PieFetchButton, 0, 0).apply {
+            try {
+                inflate(
+                    overrideLayout ?: getResourceId(
+                        R.styleable.PieFetchButton_download_layout,
+                        R.layout.download_button_view
+                    )
+                )
+            } catch (e: Exception) {
+                Log.e(
+                    "PieFetchButton", "Error inflating PieFetchButton, " +
+                            "check that you have declared the required aria2c attrs: aria2c_icon_scale aria2c_icon_color aria2c_outline_color aria2c_fill_color"
+                )
+                throw e
+            }
+
+
+            progressBar = findViewById(R.id.progress_downloaded)
+            progressBarBackground = findViewById(R.id.progress_downloaded_background)
+            statusView = findViewById(R.id.image_download_status)
+
+            animateWaiting = getBoolean(
+                R.styleable.PieFetchButton_download_animate_waiting,
+                true
+            )
+            hideWhenIcon = getBoolean(
+                R.styleable.PieFetchButton_download_hide_when_icon,
+                true
+            )
+
+            waitingAnimation = getResourceId(
+                R.styleable.PieFetchButton_download_waiting_animation,
+                R.anim.rotate_around_center_point
+            )
+
+            activeOutline = getResourceId(
+                R.styleable.PieFetchButton_download_outline_active, R.drawable.circle_shape
+            )
+
+            nonActiveOutline = getResourceId(
+                R.styleable.PieFetchButton_download_outline_non_active,
+                R.drawable.circle_shape_dotted
+            )
+            iconInit = getResourceId(
+                R.styleable.PieFetchButton_download_icon_init, R.drawable.netflix_download
+            )
+            iconError = getResourceId(
+                R.styleable.PieFetchButton_download_icon_paused, R.drawable.download_icon_error
+            )
+            iconComplete = getResourceId(
+                R.styleable.PieFetchButton_download_icon_complete, R.drawable.download_icon_done
+            )
+            iconPaused = getResourceId(
+                R.styleable.PieFetchButton_download_icon_paused, 0//R.drawable.download_icon_pause
+            )
+            iconActive = getResourceId(
+                R.styleable.PieFetchButton_download_icon_active, 0 //R.drawable.download_icon_load
+            )
+            iconWaiting = getResourceId(
+                R.styleable.PieFetchButton_download_icon_waiting, 0
+            )
+            iconRemoved = getResourceId(
+                R.styleable.PieFetchButton_download_icon_removed, R.drawable.netflix_download
+            )
+
+            val fillIndex = getInt(R.styleable.PieFetchButton_download_fill, 0)
+
+            val progressDrawable = getResourceId(
+                R.styleable.PieFetchButton_download_fill_override, fillArray[fillIndex]
+            )
+
+            progressBar.progressDrawable = ContextCompat.getDrawable(context, progressDrawable)
+
+            recycle()
+        }
+        resetView()
+        onInflate()
+    }
+
+    private var currentStatus: DownloadStatusTell? = null
+    /*private fun getActivity(): Activity? {
+        var context = context
+        while (context is ContextWrapper) {
+            if (context is Activity) {
+                return context
+            }
+            context = context.baseContext
+        }
+        return null
+    }
+
+    fun callback(event : DownloadClickEvent) {
+        handleDownloadClick(
+            getActivity(),
+            event
+        )
+    }*/
+
+    protected fun setDefaultClickListener(
+        view: View, textView: TextView?, card: VideoDownloadHelper.DownloadEpisodeCached,
+        callback: (DownloadClickEvent) -> Unit
+    ) {
+        this.progressText = textView
+        this.setPersistentId(card.id)
+        view.setOnClickListener {
+            if (isZeroBytes) {
+                callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card))
+                //callback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data))
+            } else {
+                val list = arrayListOf(
+                    Pair(DOWNLOAD_ACTION_PLAY_FILE, R.string.popup_play_file),
+                    Pair(DOWNLOAD_ACTION_DELETE_FILE, R.string.popup_delete_file),
+                )
+
+                currentMetaData.apply {
+                    // DON'T RESUME A DOWNLOADED FILE lastState != VideoDownloadManager.DownloadType.IsDone &&
+                    if ((downloadedLength * 100 / totalLength) < 98) {
+                        list.add(
+                            if (status == VideoDownloadManager.DownloadType.IsDownloading)
+                                Pair(DOWNLOAD_ACTION_PAUSE_DOWNLOAD, R.string.popup_pause_download)
+                            else
+                                Pair(
+                                    DOWNLOAD_ACTION_RESUME_DOWNLOAD,
+                                    R.string.popup_resume_download
+                                )
+                        )
+                    }
+                }
+
+
+                it.popupMenuNoIcons(
+                    list
+                ) {
+                    callback(DownloadClickEvent(itemId, card))
+                    //callback.invoke(DownloadClickEvent(itemId, data))
+                }
+            }
+        }
+
+        view.setOnLongClickListener {
+            callback(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, card))
+
+            //clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, data))
+            return@setOnLongClickListener true
+        }
+    }
+
+    open fun setDefaultClickListener(
+        card: VideoDownloadHelper.DownloadEpisodeCached,
+        textView: TextView?,
+        callback: (DownloadClickEvent) -> Unit
+    ) {
+        setDefaultClickListener(this, textView, card, callback)
+    }
+
+    /*open fun setDefaultClickListener(requestGetter: suspend BaseFetchButton.() -> List<UriRequest>) {
+        this.setOnClickListener {
+            when (this.currentStatus) {
+                null -> {
+                    setStatus(DownloadStatusTell.IsPending)
+                    ioThread {
+                        val request = requestGetter.invoke(this)
+                        if (request.size == 1) {
+                            performDownload(request.first())
+                        } else if (request.isNotEmpty()) {
+                            performFailQueueDownload(request)
+                        }
+                    }
+                }
+                DownloadStatusTell.Paused -> {
+                    resumeDownload()
+                }
+                DownloadStatusTell.Active -> {
+                    pauseDownload()
+                }
+                DownloadStatusTell.Error -> {
+                    redownload()
+                }
+                else -> {}
+            }
+        }
+    }*/
+
+    /** Also sets currentStatus */
+    override fun setStatus(status: DownloadStatusTell?) {
+        currentStatus = status
+
+        //progressBar.isVisible =
+        //    status != null && status != DownloadStatusTell.Complete && status != DownloadStatusTell.Error
+        //progressBarBackground.isVisible = status != null && status != DownloadStatusTell.Complete
+        val isPreActive = isZeroBytes && status == DownloadStatusTell.IsDownloading
+
+        if (animateWaiting && (status == DownloadStatusTell.IsPending || isPreActive)) {
+            val animation = AnimationUtils.loadAnimation(context, waitingAnimation)
+            progressBarBackground.startAnimation(animation)
+        } else {
+            progressBarBackground.clearAnimation()
+        }
+
+        val progressDrawable =
+            if (status == DownloadStatusTell.IsDownloading && !isPreActive) activeOutline else nonActiveOutline
+
+        progressBarBackground.background =
+            ContextCompat.getDrawable(context, progressDrawable)
+
+        val drawable = getDrawableFromStatus(status)
+        statusView.setImageDrawable(drawable)
+        val isDrawable = drawable != null
+
+        statusView.isVisible = isDrawable
+        val hide = hideWhenIcon && isDrawable
+        if (hide) {
+            progressBar.clearAnimation()
+            progressBarBackground.clearAnimation()
+        }
+        progressBarBackground.isGone = hide
+        progressBar.isGone = hide
+    }
+
+    override fun resetView() {
+        setStatus(null)
+        currentMetaData = DownloadMetadata(0, 0, 0, null)
+        isZeroBytes = true
+        progressBar.progress = 0
+    }
+
+    override fun updateViewOnDownload(metadata: DownloadMetadata) {
+
+        val newStatus = metadata.status
+
+        if (newStatus == null) {
+            resetView()
+            return
+        }
+
+        val isDone =
+            newStatus == DownloadStatusTell.IsDone || (metadata.downloadedLength > 1024 && metadata.downloadedLength + 1024 >= metadata.totalLength)
+
+        if (isDone)
+            setStatus(DownloadStatusTell.IsDone)
+        else {
+            setProgress(metadata.downloadedLength, metadata.totalLength)
+            setStatus(newStatus)
+        }
+    }
+
+    open fun getDrawableFromStatus(status: DownloadStatusTell?): Drawable? {
+        val drawableInt = when (status) {
+            DownloadStatusTell.IsPaused -> iconPaused
+            DownloadStatusTell.IsPending -> iconWaiting
+            DownloadStatusTell.IsDownloading -> iconActive
+            DownloadStatusTell.IsFailed -> iconError
+            DownloadStatusTell.IsDone -> iconComplete
+            DownloadStatusTell.IsStopped -> iconRemoved
+            null -> iconInit
+        }
+        if (drawableInt == 0) {
+            return null
+        }
+        return ContextCompat.getDrawable(this.context, drawableInt)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/ProgressBarAnimation.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/ProgressBarAnimation.kt
new file mode 100644
index 00000000..11818a7e
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/ProgressBarAnimation.kt
@@ -0,0 +1,18 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.view.animation.Animation
+import android.view.animation.Transformation
+import android.widget.ProgressBar
+
+class ProgressBarAnimation(
+    private val progressBar: ProgressBar,
+    private val from: Float,
+    private val to: Float
+) :
+    Animation() {
+    override fun applyTransformation(interpolatedTime: Float, t: Transformation?) {
+        super.applyTransformation(interpolatedTime, t)
+        val value = from + (to - from) * interpolatedTime
+        progressBar.progress = value.toInt()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
index b90a4e43..607cda01 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@@ -1,22 +1,23 @@
 package com.lagradost.cloudstream3.ui.home
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
+import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
 import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.home_result_grid.view.background_card
-import kotlinx.android.synthetic.main.home_result_grid_expanded.view.*
 
 class HomeChildItemAdapter(
     val cardList: MutableList<SearchResponse>,
-    private val overrideLayout: Int? = null,
+
     private val nextFocusUp: Int? = null,
     private val nextFocusDown: Int? = null,
     private val clickCallback: (SearchClickCallback) -> Unit,
@@ -26,16 +27,28 @@ class HomeChildItemAdapter(
     var hasNext: Boolean = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = overrideLayout
-            ?: if (parent.context.IsBottomLayout()) R.layout.home_result_grid_expanded else R.layout.home_result_grid
+        val expanded = parent.context.IsBottomLayout()
+        /* val layout = if (bottom) R.layout.home_result_grid_expanded else R.layout.home_result_grid
+
+         val root = LayoutInflater.from(parent.context).inflate(layout, parent, false)
+         val binding = HomeResultGridBinding.bind(root)*/
+
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = if (expanded) HomeResultGridExpandedBinding.inflate(
+            inflater,
+            parent,
+            false
+        ) else HomeResultGridBinding.inflate(inflater, parent, false)
+
 
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
+            binding,
             clickCallback,
             itemCount,
             nextFocusUp,
             nextFocusDown,
-            isHorizontal
+            isHorizontal,
+            parent.isRtl()
         )
     }
 
@@ -69,14 +82,15 @@ class HomeChildItemAdapter(
 
     class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: ViewBinding,
         private val clickCallback: (SearchClickCallback) -> Unit,
         var itemCount: Int,
         private val nextFocusUp: Int? = null,
         private val nextFocusDown: Int? = null,
-        private val isHorizontal: Boolean = false
+        private val isHorizontal: Boolean = false,
+        private val isRtl : Boolean
     ) :
-        RecyclerView.ViewHolder(itemView) {
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(card: SearchResponse, position: Int) {
 
@@ -87,26 +101,71 @@ class HomeChildItemAdapter(
                 else -> null
             }
 
-            (itemView.image_holder ?: itemView.background_card)?.apply {
-                val min = 114.toPx
-                val max = 180.toPx
-
-                layoutParams =
-                    layoutParams.apply {
-                        width = if (!isHorizontal) {
-                            min
-                        } else {
-                            max
-                        }
-                        height = if (!isHorizontal) {
-                            max
-                        } else {
-                            min
-                        }
-                    }
+            if (position == 0) { // to fix tv
+                if (isRtl) {
+                    itemView.nextFocusRightId = R.id.nav_rail_view
+                    itemView.nextFocusLeftId = -1
+                }
+                else {
+                    itemView.nextFocusLeftId = R.id.nav_rail_view
+                    itemView.nextFocusRightId = -1
+                }
+            } else {
+                itemView.nextFocusRightId = -1
+                itemView.nextFocusLeftId = -1
             }
 
 
+            when (binding) {
+                is HomeResultGridBinding -> {
+                    binding.backgroundCard.apply {
+                        val min = 114.toPx
+                        val max = 180.toPx
+
+                        layoutParams =
+                            layoutParams.apply {
+                                width = if (!isHorizontal) {
+                                    min
+                                } else {
+                                    max
+                                }
+                                height = if (!isHorizontal) {
+                                    max
+                                } else {
+                                    min
+                                }
+                            }
+                    }
+
+
+                }
+
+                is HomeResultGridExpandedBinding -> {
+                    binding.backgroundCard.apply {
+                        val min = 114.toPx
+                        val max = 180.toPx
+
+                        layoutParams =
+                            layoutParams.apply {
+                                width = if (!isHorizontal) {
+                                    min
+                                } else {
+                                    max
+                                }
+                                height = if (!isHorizontal) {
+                                    max
+                                } else {
+                                    min
+                                }
+                            }
+                    }
+
+                    if (position == 0) { // to fix tv
+                        binding.backgroundCard.nextFocusLeftId = R.id.nav_rail_view
+                    }
+                }
+            }
+
             SearchResultBuilder.bind(
                 clickCallback,
                 card,
@@ -118,9 +177,6 @@ class HomeChildItemAdapter(
             )
             itemView.tag = position
 
-            if (position == 0) { // to fix tv
-                itemView.background_card?.nextFocusLeftId = R.id.nav_rail_view
-            }
             //val ani = ScaleAnimation(0.9f, 1.0f, 0.9f, 1f)
             //ani.fillAfter = true
             //ani.duration = 200
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 5cf6fc8e..a6e1b5e6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -31,17 +31,23 @@ import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.MainActivity.Companion.bookmarksUpdatedEvent
 import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent
+import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
+import com.lagradost.cloudstream3.databinding.HomeEpisodesExpandedBinding
+import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding
+import com.lagradost.cloudstream3.databinding.TvtypesChipsBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
-import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.search.*
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -64,24 +70,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
-import kotlinx.android.synthetic.main.activity_main_tv.*
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_home.home_api_fab
-import kotlinx.android.synthetic.main.fragment_home.home_change_api_loading
-import kotlinx.android.synthetic.main.fragment_home.home_loading
-import kotlinx.android.synthetic.main.fragment_home.home_loading_error
-import kotlinx.android.synthetic.main.fragment_home.home_loading_shimmer
-import kotlinx.android.synthetic.main.fragment_home.home_loading_statusbar
-import kotlinx.android.synthetic.main.fragment_home.home_master_recycler
-import kotlinx.android.synthetic.main.fragment_home.home_reload_connection_open_in_browser
-import kotlinx.android.synthetic.main.fragment_home.home_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_home.result_error_text
-import kotlinx.android.synthetic.main.fragment_home_tv.*
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_search.*
-import kotlinx.android.synthetic.main.home_episodes_expanded.*
-import kotlinx.android.synthetic.main.tvtypes_chips.*
-import kotlinx.android.synthetic.main.tvtypes_chips.view.*
+
 import java.util.*
 
 
@@ -125,22 +114,26 @@ class HomeFragment : Fragment() {
             expand: HomeViewModel.ExpandableHomepageList,
             deleteCallback: (() -> Unit)? = null,
             expandCallback: (suspend (String) -> HomeViewModel.ExpandableHomepageList?)? = null,
-            dismissCallback : (() -> Unit),
+            dismissCallback: (() -> Unit),
         ): BottomSheetDialog {
             val context = this
             val bottomSheetDialogBuilder = BottomSheetDialog(context)
-
-            bottomSheetDialogBuilder.setContentView(R.layout.home_episodes_expanded)
-            val title = bottomSheetDialogBuilder.findViewById<TextView>(R.id.home_expanded_text)!!
+            val binding: HomeEpisodesExpandedBinding = HomeEpisodesExpandedBinding.inflate(
+                bottomSheetDialogBuilder.layoutInflater,
+                null,
+                false
+            )
+            bottomSheetDialogBuilder.setContentView(binding.root)
+            //val title = bottomSheetDialogBuilder.findViewById<TextView>(R.id.home_expanded_text)!!
 
             //title.findViewTreeLifecycleOwner().lifecycle.addObserver()
 
             val item = expand.list
-            title.text = item.name
-            val recycle =
-                bottomSheetDialogBuilder.findViewById<AutofitRecyclerView>(R.id.home_expanded_recycler)!!
-            val titleHolder =
-                bottomSheetDialogBuilder.findViewById<FrameLayout>(R.id.home_expanded_drag_down)!!
+            binding.homeExpandedText.text = item.name
+            // val recycle =
+            //    bottomSheetDialogBuilder.findViewById<AutofitRecyclerView>(R.id.home_expanded_recycler)!!
+            //val titleHolder =
+            //    bottomSheetDialogBuilder.findViewById<FrameLayout>(R.id.home_expanded_drag_down)!!
 
             // main {
             //(bottomSheetDialogBuilder.ownerActivity as androidx.fragment.app.FragmentActivity?)?.supportFragmentManager?.fragments?.lastOrNull()?.viewLifecycleOwner?.apply {
@@ -159,10 +152,10 @@ class HomeFragment : Fragment() {
             //    })
             //}
             // }
-            val delete = bottomSheetDialogBuilder.home_expanded_delete
-            delete.isGone = deleteCallback == null
+            //val delete = bottomSheetDialogBuilder.home_expanded_delete
+            binding.homeExpandedDelete.isGone = deleteCallback == null
             if (deleteCallback != null) {
-                delete.setOnClickListener {
+                binding.homeExpandedDelete.setOnClickListener {
                     try {
                         val builder: AlertDialog.Builder = AlertDialog.Builder(context)
                         val dialogClickListener =
@@ -172,6 +165,7 @@ class HomeFragment : Fragment() {
                                         deleteCallback.invoke()
                                         bottomSheetDialogBuilder.dismissSafe(this)
                                     }
+
                                     DialogInterface.BUTTON_NEGATIVE -> {}
                                 }
                             }
@@ -191,26 +185,27 @@ class HomeFragment : Fragment() {
                     }
                 }
             }
-
-            titleHolder.setOnClickListener {
+            binding.homeExpandedDragDown.setOnClickListener {
                 bottomSheetDialogBuilder.dismissSafe(this)
             }
 
 
             // Span settings
-            recycle.spanCount = currentSpan
+            binding.homeExpandedRecycler.spanCount = currentSpan
 
-            recycle.adapter = SearchAdapter(item.list.toMutableList(), recycle) { callback ->
-                handleSearchClickCallback(this, callback)
-                if (callback.action == SEARCH_ACTION_LOAD || callback.action == SEARCH_ACTION_PLAY_FILE) {
-                    bottomSheetDialogBuilder.ownHide() // we hide here because we want to resume it later
-                    //bottomSheetDialogBuilder.dismissSafe(this)
+            binding.homeExpandedRecycler.adapter =
+                SearchAdapter(item.list.toMutableList(), binding.homeExpandedRecycler) { callback ->
+                    handleSearchClickCallback(callback)
+                    if (callback.action == SEARCH_ACTION_LOAD || callback.action == SEARCH_ACTION_PLAY_FILE) {
+                        bottomSheetDialogBuilder.ownHide() // we hide here because we want to resume it later
+                        //bottomSheetDialogBuilder.dismissSafe(this)
+                    }
+                }.apply {
+                    hasNext = expand.hasNext
                 }
-            }.apply {
-                hasNext = expand.hasNext
-            }
 
-            recycle.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            binding.homeExpandedRecycler.addOnScrollListener(object :
+                RecyclerView.OnScrollListener() {
                 var expandCount = 0
                 val name = expand.list.name
 
@@ -238,7 +233,7 @@ class HomeFragment : Fragment() {
             })
 
             val spanListener = { span: Int ->
-                recycle.spanCount = span
+                binding.homeExpandedRecycler.spanCount = span
                 //(recycle.adapter as SearchAdapter).notifyDataSetChanged()
             }
 
@@ -280,19 +275,19 @@ class HomeFragment : Fragment() {
             )
         }
 
-        private fun getPairList(header: ChipGroup) = getPairList(
-            header.home_select_anime,
-            header.home_select_cartoons,
-            header.home_select_tv_series,
-            header.home_select_documentaries,
-            header.home_select_movies,
-            header.home_select_asian,
-            header.home_select_livestreams,
-            header.home_select_nsfw,
-            header.home_select_others
+        private fun getPairList(header: TvtypesChipsBinding) = getPairList(
+            header.homeSelectAnime,
+            header.homeSelectCartoons,
+            header.homeSelectTvSeries,
+            header.homeSelectDocumentaries,
+            header.homeSelectMovies,
+            header.homeSelectAsian,
+            header.homeSelectLivestreams,
+            header.homeSelectNsfw,
+            header.homeSelectOthers
         )
 
-        fun validateChips(header: ChipGroup?, validTypes: List<TvType>) {
+        fun validateChips(header: TvtypesChipsBinding?, validTypes: List<TvType>) {
             if (header == null) return
             val pairList = getPairList(header)
             for ((button, types) in pairList) {
@@ -301,7 +296,7 @@ class HomeFragment : Fragment() {
             }
         }
 
-        fun updateChips(header: ChipGroup?, selectedTypes: List<TvType>) {
+        fun updateChips(header: TvtypesChipsBinding?, selectedTypes: List<TvType>) {
             if (header == null) return
             val pairList = getPairList(header)
             for ((button, types) in pairList) {
@@ -311,7 +306,7 @@ class HomeFragment : Fragment() {
         }
 
         fun bindChips(
-            header: ChipGroup?,
+            header: TvtypesChipsBinding?,
             selectedTypes: List<TvType>,
             validTypes: List<TvType>,
             callback: (List<TvType>) -> Unit
@@ -344,7 +339,13 @@ class HomeFragment : Fragment() {
                 BottomSheetDialog(this)
 
             builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-            builder.setContentView(R.layout.home_select_mainpage)
+            val binding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate(
+                builder.layoutInflater,
+                null,
+                false
+            )
+
+            builder.setContentView(binding.root)
             builder.show()
             builder.let { dialog ->
                 val isMultiLang = getApiProviderLangSettings().let { set ->
@@ -360,14 +361,11 @@ class HomeFragment : Fragment() {
                     ?.toMutableList()
                     ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
-                val cancelBtt = dialog.findViewById<MaterialButton>(R.id.cancel_btt)
-                val applyBtt = dialog.findViewById<MaterialButton>(R.id.apply_btt)
-
-                cancelBtt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     dialog.dismissSafe()
                 }
 
-                applyBtt?.setOnClickListener {
+                binding.applyBtt.setOnClickListener {
                     if (currentApiName != selectedApiName) {
                         currentApiName?.let(callback)
                     }
@@ -408,7 +406,7 @@ class HomeFragment : Fragment() {
                 }
 
                 bindChips(
-                    dialog.home_select_group,
+                    binding.tvtypesChipsScroll.tvtypesChips,
                     preSelectedTypes,
                     validAPIs.flatMap { it.supportedTypes }.distinct()
                 ) { list ->
@@ -423,6 +421,9 @@ class HomeFragment : Fragment() {
 
     private val homeViewModel: HomeViewModel by activityViewModels()
 
+    var binding: FragmentHomeBinding? = null
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -430,14 +431,25 @@ class HomeFragment : Fragment() {
     ): View? {
         //homeViewModel =
         //     ViewModelProvider(this).get(HomeViewModel::class.java)
+
         bottomSheetDialog?.ownShow()
         val layout =
             if (isTvSettings()) R.layout.fragment_home_tv else R.layout.fragment_home
-        return inflater.inflate(layout, container, false)
+        val root = inflater.inflate(layout, container, false)
+        binding = try {
+            FragmentHomeBinding.bind(root)
+        } catch (t: Throwable) {
+            showToast(txt(R.string.unable_to_inflate, t.message ?: ""), Toast.LENGTH_LONG)
+            logError(t)
+            null
+        }
+
+        return root
     }
 
     override fun onDestroyView() {
         bottomSheetDialog?.ownHide()
+        binding = null
         super.onDestroyView()
     }
 
@@ -450,7 +462,7 @@ class HomeFragment : Fragment() {
 
     private val apiChangeClickListener = View.OnClickListener { view ->
         view.context.selectHomepage(currentApiName) { api ->
-            homeViewModel.loadAndCancel(api)
+            homeViewModel.loadAndCancel(api, forceReload = true,fromUI = true)
         }
         /*val validAPIs = view.context?.filterProviderByPreferredMedia()?.toMutableList() ?: mutableListOf()
 
@@ -467,196 +479,149 @@ class HomeFragment : Fragment() {
         fixGrid()
     }
 
-    fun bookmarksUpdated(_data : Boolean) {
-        reloadStored()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        reloadStored()
-        bookmarksUpdatedEvent += ::bookmarksUpdated
-        afterPluginsLoadedEvent += ::afterPluginsLoaded
-        mainPluginsLoadedEvent += ::afterMainPluginsLoaded
-    }
-
-    override fun onStop() {
-        bookmarksUpdatedEvent -= ::bookmarksUpdated
-        afterPluginsLoadedEvent -= ::afterPluginsLoaded
-        mainPluginsLoadedEvent -= ::afterMainPluginsLoaded
-        super.onStop()
-    }
-
-    private fun reloadStored() {
-        homeViewModel.loadResumeWatching()
-        val list = EnumSet.noneOf(WatchType::class.java)
-        getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)?.map { WatchType.fromInternalId(it) }?.let {
-            list.addAll(it)
-        }
-        homeViewModel.loadStoredData(list)
-    }
-
-    private fun afterMainPluginsLoaded(unused: Boolean = false) {
-        loadHomePage(false)
-    }
-
-    private fun afterPluginsLoaded(forceReload: Boolean) {
-        loadHomePage(forceReload)
-    }
-
-    private fun loadHomePage(forceReload: Boolean) {
-        val apiName = context?.getKey<String>(USER_SELECTED_HOMEPAGE_API)
-
-        if (homeViewModel.apiName.value != apiName || apiName == null || forceReload) {
-            //println("Caught home: " + homeViewModel.apiName.value + " at " + apiName)
-            homeViewModel.loadAndCancel(apiName, forceReload)
-        }
-    }
-
-    private fun homeHandleSearch(callback: SearchClickCallback) {
-        if (callback.action == SEARCH_ACTION_FOCUSED) {
-            //focusCallback(callback.card)
-        } else {
-            handleSearchClickCallback(activity, callback)
-        }
-    }
-
     private var currentApiName: String? = null
     private var toggleRandomButton = false
 
     private var bottomSheetDialog: BottomSheetDialog? = null
 
+
     @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         fixGrid()
 
-        home_change_api_loading?.setOnClickListener(apiChangeClickListener)
-        home_api_fab?.setOnClickListener(apiChangeClickListener)
-        home_random?.setOnClickListener {
-            if (listHomepageItems.isNotEmpty()) {
-                activity.loadSearchResult(listHomepageItems.random())
+        binding?.apply {
+            homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
+            //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
+            homeApiFab.setOnClickListener(apiChangeClickListener)
+            homeRandom.setOnClickListener {
+                if (listHomepageItems.isNotEmpty()) {
+                    activity.loadSearchResult(listHomepageItems.random())
+                }
             }
+
+            homeMasterRecycler.adapter =
+                HomeParentItemAdapterPreview(
+                    mutableListOf(),
+                    homeViewModel
+                )
+            fixPaddingStatusbar(homeLoadingStatusbar)
+
+            if (isTvSettings()) {
+                homeApiFab.isVisible = false
+                if (isTrueTvSettings()) {
+                    homeChangeApiLoading.isVisible = true
+                    homeChangeApiLoading.isFocusable = true
+                    homeChangeApiLoading.isFocusableInTouchMode = true
+                }
+                // home_bookmark_select?.isFocusable = true
+                // home_bookmark_select?.isFocusableInTouchMode = true
+            } else {
+                homeApiFab.isVisible = true
+                homeChangeApiLoading.isVisible = false
+            }
+
+            homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    if (dy > 0) { //check for scroll down
+                        homeApiFab.shrink() // hide
+                        homeRandom.shrink()
+                    } else if (dy < -5) {
+                        if (!isTvSettings()) {
+                            homeApiFab.extend() // show
+                            homeRandom.extend()
+                        }
+                    }
+                    super.onScrolled(recyclerView, dx, dy)
+                }
+            })
         }
 
+
         //Load value for toggling Random button. Hide at startup
         context?.let {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
             toggleRandomButton =
-                settingsManager.getBoolean(getString(R.string.random_button_key), false)
-            home_random?.visibility = View.GONE
-        }
-
-        observe(homeViewModel.preview) { preview ->
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setPreviewData(
-                preview
-            )
+                settingsManager.getBoolean(
+                    getString(R.string.random_button_key),
+                    false
+                ) && !isTvSettings()
+            binding?.homeRandom?.visibility = View.GONE
         }
 
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
-            home_api_fab?.text = apiName
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setApiName(
-                apiName
-            )
+            binding?.homeApiFab?.text = apiName
         }
 
         observe(homeViewModel.page) { data ->
-            when (data) {
-                is Resource.Success -> {
-                    home_loading_shimmer?.stopShimmer()
+            binding?.apply {
+                when (data) {
+                    is Resource.Success -> {
+                        homeLoadingShimmer.stopShimmer()
 
-                    val d = data.value
-                    val mutableListOfResponse = mutableListOf<SearchResponse>()
-                    listHomepageItems.clear()
+                        val d = data.value
+                        val mutableListOfResponse = mutableListOf<SearchResponse>()
+                        listHomepageItems.clear()
 
-                    (home_master_recycler?.adapter as? ParentItemAdapter)?.updateList(
-                        d.values.toMutableList(),
-                        home_master_recycler
-                    )
+                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.updateList(
+                            d.values.toMutableList(),
+                            homeMasterRecycler
+                        )
 
-                    home_loading?.isVisible = false
-                    home_loading_error?.isVisible = false
-                    home_master_recycler?.isVisible = true
-                    //home_loaded?.isVisible = true
-                    if (toggleRandomButton) {
-                        //Flatten list
-                        d.values.forEach { dlist ->
-                            mutableListOfResponse.addAll(dlist.list.list)
+                        homeLoading.isVisible = false
+                        homeLoadingError.isVisible = false
+                        homeMasterRecycler.isVisible = true
+                        //home_loaded?.isVisible = true
+                        if (toggleRandomButton) {
+                            //Flatten list
+                            d.values.forEach { dlist ->
+                                mutableListOfResponse.addAll(dlist.list.list)
+                            }
+                            listHomepageItems.addAll(mutableListOfResponse.distinctBy { it.url })
+
+                            homeRandom.isVisible = listHomepageItems.isNotEmpty()
+                        } else {
+                            homeRandom.isGone = true
                         }
-                        listHomepageItems.addAll(mutableListOfResponse.distinctBy { it.url })
-                        home_random?.isVisible = listHomepageItems.isNotEmpty()
-                    } else {
-                        home_random?.isGone = true
                     }
-                }
-                is Resource.Failure -> {
-                    home_loading_shimmer?.stopShimmer()
 
-                    result_error_text.text = data.errorString
+                    is Resource.Failure -> {
+                        homeLoadingShimmer.stopShimmer()
+                        resultErrorText.text = data.errorString
+                        homeReloadConnectionerror.setOnClickListener(apiChangeClickListener)
+                        homeReloadConnectionOpenInBrowser.setOnClickListener { view ->
+                            val validAPIs = apis//.filter { api -> api.hasMainPage }
 
-                    home_reload_connectionerror.setOnClickListener(apiChangeClickListener)
-
-                    home_reload_connection_open_in_browser.setOnClickListener { view ->
-                        val validAPIs = apis//.filter { api -> api.hasMainPage }
-
-                        view.popupMenuNoIconsAndNoStringRes(validAPIs.mapIndexed { index, api ->
-                            Pair(
-                                index,
-                                api.name
-                            )
-                        }) {
-                            try {
-                                val i = Intent(Intent.ACTION_VIEW)
-                                i.data = Uri.parse(validAPIs[itemId].mainUrl)
-                                startActivity(i)
-                            } catch (e: Exception) {
-                                logError(e)
+                            view.popupMenuNoIconsAndNoStringRes(validAPIs.mapIndexed { index, api ->
+                                Pair(
+                                    index,
+                                    api.name
+                                )
+                            }) {
+                                try {
+                                    val i = Intent(Intent.ACTION_VIEW)
+                                    i.data = Uri.parse(validAPIs[itemId].mainUrl)
+                                    startActivity(i)
+                                } catch (e: Exception) {
+                                    logError(e)
+                                }
                             }
                         }
+
+                        homeLoading.isVisible = false
+                        homeLoadingError.isVisible = true
+                        homeMasterRecycler.isVisible = false
+                        //home_loaded?.isVisible = false
                     }
 
-                    home_loading?.isVisible = false
-                    home_loading_error?.isVisible = true
-                    home_master_recycler?.isVisible = false
-                    //home_loaded?.isVisible = false
-                }
-                is Resource.Loading -> {
-                    (home_master_recycler?.adapter as? ParentItemAdapter)?.updateList(listOf())
-                    home_loading_shimmer?.startShimmer()
-                    home_loading?.isVisible = true
-                    home_loading_error?.isVisible = false
-                    home_master_recycler?.isVisible = false
-                    //home_loaded?.isVisible = false
-                }
-            }
-        }
-
-
-
-        observe(homeViewModel.availableWatchStatusTypes) { availableWatchStatusTypes ->
-            context?.setKey(
-                HOME_BOOKMARK_VALUE_LIST,
-                availableWatchStatusTypes.first.map { it.internalId }.toIntArray()
-            )
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setAvailableWatchStatusTypes(
-                availableWatchStatusTypes
-            )
-        }
-
-        observe(homeViewModel.bookmarks) { data ->
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setBookmarkData(
-                data
-            )
-        }
-
-        observe(homeViewModel.resumeWatching) { resumeWatching ->
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setResumeWatchingData(
-                resumeWatching
-            )
-            if (isTrueTvSettings()) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    ioSafe {
-                        activity?.addProgramsToContinueWatching(resumeWatching.mapNotNull { it as? DataStoreHelper.ResumeWatchingResult })
+                    is Resource.Loading -> {
+                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.updateList(listOf())
+                        homeLoadingShimmer.startShimmer()
+                        homeLoading.isVisible = true
+                        homeLoadingError.isVisible = false
+                        homeMasterRecycler.isVisible = false
+                        //home_loaded?.isVisible = false
                     }
                 }
             }
@@ -665,72 +630,35 @@ class HomeFragment : Fragment() {
 
         //context?.fixPaddingStatusbarView(home_statusbar)
         //context?.fixPaddingStatusbar(home_padding)
-        context?.fixPaddingStatusbar(home_loading_statusbar)
 
-        home_master_recycler?.adapter =
-            HomeParentItemAdapterPreview(mutableListOf(), { callback ->
-                homeHandleSearch(callback)
-            }, { item ->
-                bottomSheetDialog = activity?.loadHomepageList(item, expandCallback = {
-                    homeViewModel.expandAndReturn(it)
-                }, dismissCallback = {
-                    bottomSheetDialog = null
-                })
-            }, { name ->
-                homeViewModel.expand(name)
-            }, { load ->
-                activity?.loadResult(load.response.url, load.response.apiName, load.action)
-            }, {
-                homeViewModel.loadMoreHomeScrollResponses()
-            }, {
-                apiChangeClickListener.onClick(it)
-            }, reloadStored = {
-                reloadStored()
-            }, loadStoredData = {
-                homeViewModel.loadStoredData(it)
-            }, { (isQuickSearch, text) ->
-                if (!isQuickSearch) {
-                    QuickSearchFragment.pushSearch(
-                        activity,
-                        text,
-                        currentApiName?.let { arrayOf(it) })
-                }
-            })
-
-        reloadStored()
-        loadHomePage(false)
-        home_master_recycler?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                if (dy > 0) { //check for scroll down
-                    home_api_fab?.shrink() // hide
-                    home_random?.shrink()
-                } else if (dy < -5) {
-                    if (!isTvSettings()) {
-                        home_api_fab?.extend() // show
-                        home_random?.extend()
-                    }
-                }
-
-                super.onScrolled(recyclerView, dx, dy)
+        observeNullable(homeViewModel.popup) { item ->
+            if (item == null) {
+                bottomSheetDialog?.dismissSafe()
+                bottomSheetDialog = null
+                return@observeNullable
             }
-        })
+
+            // don't recreate
+            if (bottomSheetDialog != null) {
+                return@observeNullable
+            }
+
+            bottomSheetDialog = activity?.loadHomepageList(item, expandCallback = {
+                homeViewModel.expandAndReturn(it)
+            }, dismissCallback = {
+                homeViewModel.popup(null)
+                bottomSheetDialog = null
+            })
+        }
+
+        homeViewModel.reloadStored()
+        homeViewModel.loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), false)
+        //loadHomePage(false)
 
         // nice profile pic on homepage
         //home_profile_picture_holder?.isVisible = false
         // just in case
-        if (isTvSettings()) {
-            home_api_fab?.isVisible = false
-            if (isTrueTvSettings()) {
-                home_change_api_loading?.isVisible = true
-                home_change_api_loading?.isFocusable = true
-                home_change_api_loading?.isFocusableInTouchMode = true
-            }
-            // home_bookmark_select?.isFocusable = true
-            // home_bookmark_select?.isFocusableInTouchMode = true
-        } else {
-            home_api_fab?.isVisible = true
-            home_change_api_loading?.isVisible = false
-        }
+
         //TODO READD THIS
         /*for (syncApi in OAuth2Apis) {
             val login = syncApi.loginInfo()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index 58c6dbe0..f6c3fead 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -3,50 +3,19 @@ package com.lagradost.cloudstream3.ui.home
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.recyclerview.widget.RecyclerView
-import androidx.transition.ChangeBounds
-import androidx.transition.TransitionManager
-import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
-import com.lagradost.cloudstream3.APIHolder.getId
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.result.LinearListLayout
-import com.lagradost.cloudstream3.ui.result.ResultViewModel2
-import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.databinding.HomepageParentBinding
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
-import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchFragment.Companion.filterSearchResponse
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
-import com.lagradost.cloudstream3.utils.AppUtils.loadResult
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
-import kotlinx.android.synthetic.main.activity_main_tv.*
-import kotlinx.android.synthetic.main.activity_main_tv.view.*
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_home.view.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
-import kotlinx.android.synthetic.main.homepage_parent.view.*
 
 class LoadClickCallback(
     val action: Int = 0,
@@ -57,17 +26,23 @@ class LoadClickCallback(
 
 open class ParentItemAdapter(
     private var items: MutableList<HomeViewModel.ExpandableHomepageList>,
+    //private val viewModel: HomeViewModel,
     private val clickCallback: (SearchClickCallback) -> Unit,
     private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
     private val expandCallback: ((String) -> Unit)? = null,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+
+        val root = LayoutInflater.from(parent.context).inflate(
+            if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent,
+            parent,
+            false
+        )
+
+        val binding = HomepageParentBinding.bind(root)
+
         return ParentViewHolder(
-            LayoutInflater.from(parent.context).inflate(
-                if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent,
-                parent,
-                false
-            ),
+            binding,
             clickCallback,
             moreInfoClickCallback,
             expandCallback
@@ -178,14 +153,15 @@ open class ParentItemAdapter(
 
     class ParentViewHolder
     constructor(
-        itemView: View,
+        val binding: HomepageParentBinding,
+       // val viewModel: HomeViewModel,
         private val clickCallback: (SearchClickCallback) -> Unit,
         private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
         private val expandCallback: ((String) -> Unit)? = null,
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        val title: TextView = itemView.home_child_more_info
-        private val recyclerView: RecyclerView = itemView.home_child_recyclerview
+        RecyclerView.ViewHolder(binding.root) {
+        val title: TextView = binding.homeChildMoreInfo
+        private val recyclerView: RecyclerView = binding.homeChildRecyclerview
 
         fun update(expand: HomeViewModel.ExpandableHomepageList) {
             val info = expand.list
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 94a1a526..fd2412da 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
@@ -8,20 +8,29 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
+import com.google.android.material.navigationrail.NavigationRailView
 import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.FragmentHomeHeadBinding
+import com.lagradost.cloudstream3.databinding.FragmentHomeHeadTvBinding
 import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugException
+import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.selectHomepage
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
@@ -32,118 +41,51 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectSt
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.activity_main.view.*
-import kotlinx.android.synthetic.main.fragment_home_head.view.*
-import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home_head.view.home_watch_parent_item_title
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_none_padding
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_plan_to_watch_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_completed_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_dropped_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_on_hold_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_watching_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_holder
-import kotlinx.android.synthetic.main.toast.view.*
 
 class HomeParentItemAdapterPreview(
     items: MutableList<HomeViewModel.ExpandableHomepageList>,
-    val clickCallback: (SearchClickCallback) -> Unit,
-    private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
-    expandCallback: ((String) -> Unit)? = null,
-    private val loadCallback: (LoadClickCallback) -> Unit,
-    private val loadMoreCallback: (() -> Unit),
-    private val changeHomePageCallback: ((View) -> Unit),
-    private val reloadStored: (() -> Unit),
-    private val loadStoredData: ((Set<WatchType>) -> Unit),
-    private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit)
-) : ParentItemAdapter(items, clickCallback, moreInfoClickCallback, expandCallback) {
-    private var previewData: Resource<Pair<Boolean, List<LoadResponse>>> = Resource.Loading()
-    private var resumeWatchingData: List<SearchResponse> = listOf()
-    private var bookmarkData: Pair<Boolean, List<SearchResponse>> =
-        false to listOf()
-    private var apiName: String = "NONE"
-
+    private val viewModel: HomeViewModel,
+) : ParentItemAdapter(items, clickCallback = {
+    viewModel.click(it)
+}, moreInfoClickCallback = {
+    viewModel.popup(it)
+}, expandCallback = {
+    viewModel.expand(it)
+}) {
     val headItems = 1
 
-    private var availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>> =
-        setOf<WatchType>() to setOf()
-
-    fun setAvailableWatchStatusTypes(data: Pair<Set<WatchType>, Set<WatchType>>) {
-        availableWatchStatusTypes = data
-        holder?.setAvailableWatchStatusTypes(data)
-    }
-
     companion object {
         private const val VIEW_TYPE_HEADER = 2
         private const val VIEW_TYPE_ITEM = 1
     }
 
-    fun setResumeWatchingData(resumeWatching: List<SearchResponse>) {
-        resumeWatchingData = resumeWatching
-        holder?.updateResume(resumeWatchingData)
-    }
-
-    fun setPreviewData(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
-        previewData = preview
-        holder?.updatePreview(preview)
-    }
-
-    fun setApiName(name: String) {
-        apiName = name
-        holder?.updateApiName(name)
-    }
-
-    fun setBookmarkData(data: Pair<Boolean, List<SearchResponse>>) {
-        bookmarkData = data
-        holder?.updateBookmarks(data)
-    }
-
     override fun getItemViewType(position: Int) = when (position) {
         0 -> VIEW_TYPE_HEADER
         else -> VIEW_TYPE_ITEM
     }
 
-    var holder: HeaderViewHolder? = null
-
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is HeaderViewHolder -> {
-                holder.updatePreview(previewData)
-                holder.updateResume(resumeWatchingData)
-                holder.updateBookmarks(bookmarkData)
-                holder.setAvailableWatchStatusTypes(availableWatchStatusTypes)
-                holder.updateApiName(apiName)
-            }
-            else -> super.onBindViewHolder(holder, position - 1)
+            is HeaderViewHolder -> {}
+            else -> super.onBindViewHolder(holder, position - headItems)
         }
     }
 
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        println("onCreateViewHolder $viewType")
         return when (viewType) {
-            VIEW_TYPE_HEADER -> HeaderViewHolder(
-                LayoutInflater.from(parent.context).inflate(
-                    if (isTvSettings()) R.layout.fragment_home_head_tv else R.layout.fragment_home_head,
+            VIEW_TYPE_HEADER -> {
+                val inflater = LayoutInflater.from(parent.context)
+                val binding = if (isTvSettings()) FragmentHomeHeadTvBinding.inflate(
+                    inflater,
                     parent,
                     false
-                ),
-                loadCallback,
-                loadMoreCallback,
-                changeHomePageCallback,
-                clickCallback,
-                reloadStored,
-                loadStoredData,
-                searchQueryCallback,
-                moreInfoClickCallback
-            ).also {
-                this.holder = it
+                ) else FragmentHomeHeadBinding.inflate(inflater, parent, false)
+                HeaderViewHolder(
+                    binding,
+                    viewModel,
+                )
             }
+
             VIEW_TYPE_ITEM -> super.onCreateViewHolder(parent, viewType)
             else -> error("Unhandled viewType=$viewType")
         }
@@ -154,7 +96,7 @@ class HomeParentItemAdapterPreview(
     }
 
     override fun getItemId(position: Int): Long {
-        if (position == 0) return previewData.hashCode().toLong()
+        if (position == 0) return 0//previewData.hashCode().toLong()
         return super.getItemId(position - headItems)
     }
 
@@ -163,6 +105,7 @@ class HomeParentItemAdapterPreview(
             is HeaderViewHolder -> {
                 holder.onViewDetachedFromWindow()
             }
+
             else -> super.onViewDetachedFromWindow(holder)
         }
     }
@@ -172,448 +115,448 @@ class HomeParentItemAdapterPreview(
             is HeaderViewHolder -> {
                 holder.onViewAttachedToWindow()
             }
+
             else -> super.onViewAttachedToWindow(holder)
         }
     }
 
-
     class HeaderViewHolder
     constructor(
-        itemView: View,
-        private val clickCallback: ((LoadClickCallback) -> Unit)?,
-        private val loadMoreCallback: (() -> Unit),
-        private val changeHomePageCallback: ((View) -> Unit),
-        private val searchClickCallback: (SearchClickCallback) -> Unit,
-        private val reloadStored: () -> Unit,
-        private val loadStoredData: ((Set<WatchType>) -> Unit),
-        private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit),
-        private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit
-    ) : RecyclerView.ViewHolder(itemView) {
-        private var previewAdapter: HomeScrollAdapter? = null
-        private val previewViewpager: ViewPager2? = itemView.home_preview_viewpager
-        private val previewHeader: FrameLayout? = itemView.home_preview
+        val binding: ViewBinding,
+        val viewModel: HomeViewModel,
+    ) : RecyclerView.ViewHolder(binding.root) {
+        private var previewAdapter: HomeScrollAdapter = HomeScrollAdapter()
+        private var resumeAdapter: HomeChildItemAdapter = HomeChildItemAdapter(
+            ArrayList(),
+            nextFocusUp = itemView.nextFocusUpId,
+            nextFocusDown = itemView.nextFocusDownId
+        ) { callback ->
+            if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
+                viewModel.click(callback)
+                return@HomeChildItemAdapter
+            }
+            callback.view.context?.getActivity()?.showOptionSelectStringRes(
+                callback.view,
+                callback.card.posterUrl,
+                listOf(
+                    R.string.action_open_watching,
+                    R.string.action_remove_watching
+                ),
+                listOf(
+                    R.string.action_open_play,
+                    R.string.action_open_watching,
+                    R.string.action_remove_watching
+                )
+            ) { (isTv, actionId) ->
+                when (actionId + if (isTv) 0 else 1) {
+                    // play
+                    0 -> {
+                        viewModel.click(
+                            SearchClickCallback(
+                                START_ACTION_RESUME_LATEST,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+                    //info
+                    1 -> {
+                        viewModel.click(
+                            SearchClickCallback(
+                                SEARCH_ACTION_LOAD,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+                    // remove
+                    2 -> {
+                        val card = callback.card
+                        if (card is DataStoreHelper.ResumeWatchingResult) {
+                            DataStoreHelper.removeLastWatched(card.parentId)
+                            viewModel.reloadStored()
+                        }
+                    }
+                }
+            }
+        }
+        private var bookmarkAdapter: HomeChildItemAdapter = HomeChildItemAdapter(
+            ArrayList(),
+            nextFocusUp = itemView.nextFocusUpId,
+            nextFocusDown = itemView.nextFocusDownId
+        ) { callback ->
+            if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
+                viewModel.click(callback)
+                return@HomeChildItemAdapter
+            }
+            callback.view.context?.getActivity()?.showOptionSelectStringRes(
+                callback.view,
+                callback.card.posterUrl,
+                listOf(
+                    R.string.action_open_watching,
+                    R.string.action_remove_from_bookmarks,
+                ),
+                listOf(
+                    R.string.action_open_play,
+                    R.string.action_open_watching,
+                    R.string.action_remove_from_bookmarks
+                )
+            ) { (isTv, actionId) ->
+                when (actionId + if (isTv) 0 else 1) { // play
+                    0 -> {
+                        viewModel.click(
+                            SearchClickCallback(
+                                START_ACTION_RESUME_LATEST,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+
+                    1 -> { // info
+                        viewModel.click(
+                            SearchClickCallback(
+                                SEARCH_ACTION_LOAD,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+
+                    2 -> { // remove
+                        DataStoreHelper.setResultWatchState(
+                            callback.card.id,
+                            WatchType.NONE.internalId
+                        )
+                        viewModel.reloadStored()
+                    }
+                }
+            }
+        }
+
+
+        private val previewViewpager: ViewPager2 =
+            itemView.findViewById(R.id.home_preview_viewpager)
+        private val previewHeader: FrameLayout = itemView.findViewById(R.id.home_preview)
+        private var resumeHolder: View = itemView.findViewById(R.id.home_watch_holder)
+        private var resumeRecyclerView: RecyclerView =
+            itemView.findViewById(R.id.home_watch_child_recyclerview)
+        private var bookmarkHolder: View = itemView.findViewById(R.id.home_bookmarked_holder)
+        private var bookmarkRecyclerView: RecyclerView =
+            itemView.findViewById(R.id.home_bookmarked_child_recyclerview)
+
+        private val homeNonePadding: View = itemView.findViewById(R.id.home_none_padding)
+
         private val previewCallback: ViewPager2.OnPageChangeCallback =
             object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
-                    // home_search?.isIconified = true
-                    //home_search?.isVisible = true
-                    //home_search?.clearFocus()
-
-                    previewAdapter?.apply {
+                    previewAdapter.apply {
                         if (position >= itemCount - 1 && hasMoreItems) {
-                            hasMoreItems = false // dont make two requests
-                            loadMoreCallback()
-                            //homeViewModel.loadMoreHomeScrollResponses()
+                            hasMoreItems = false // don't make two requests
+                            viewModel.loadMoreHomeScrollResponses()
                         }
                     }
-                    previewAdapter?.getItem(position)
-                        ?.apply {
-                            //itemView.home_preview_title_holder?.let { parent ->
-                            //    TransitionManager.beginDelayedTransition(
-                            //        parent,
-                            //        ChangeBounds()
-                            //    )
-                            //}
-                            itemView.home_preview_description?.isGone =
-                                this.plot.isNullOrBlank()
-                            itemView.home_preview_description?.text =
-                                this.plot ?: ""
-                            itemView.home_preview_text?.text = this.name
-                            itemView.home_preview_tags?.apply {
-                                removeAllViews()
-                                tags?.forEach { tag ->
-                                    val chip = Chip(context)
-                                    val chipDrawable =
-                                        ChipDrawable.createFromAttributes(
-                                            context,
-                                            null,
-                                            0,
-                                            R.style.ChipFilledSemiTransparent
-                                        )
-                                    chip.setChipDrawable(chipDrawable)
-                                    chip.text = tag
-                                    chip.isChecked = false
-                                    chip.isCheckable = false
-                                    chip.isFocusable = false
-                                    chip.isClickable = false
-                                    addView(chip)
-                                }
-                            }
-                            itemView.home_preview_tags?.isGone =
-                                tags.isNullOrEmpty()
-                            itemView.home_preview_image?.setImage(
-                                posterUrl,
-                                posterHeaders
-                            )
-                            //  itemView.home_preview_title?.text = name
-
-                            itemView.home_preview_play?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        view,
-                                        position,
-                                        this
-                                    )
-                                )
-                            }
-                            itemView.home_preview_info?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(0, view, position, this)
-                                )
-                            }
-
-                            itemView.home_preview_play_btt?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        view,
-                                        position,
-                                        this
-                                    )
-                                )
-                            }
-
-                            // This makes the hidden next buttons only available when on the info button
-                            // Otherwise you might be able to go to the next item without being at the info button
-                            itemView.home_preview_info_btt?.setOnFocusChangeListener { _, hasFocus ->
-                                itemView.home_preview_hidden_next_focus?.isFocusable = hasFocus
-                            }
-                            itemView.home_preview_play_btt?.setOnFocusChangeListener { _, hasFocus ->
-                                itemView.home_preview_hidden_prev_focus?.isFocusable = hasFocus
-                            }
-
-
-                            itemView.home_preview_info_btt?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(0, view, position, this)
-                                )
-                            }
-
-                            itemView.home_preview_hidden_next_focus?.setOnFocusChangeListener { _, hasFocus ->
-                                if (hasFocus) {
-                                    previewViewpager?.apply {
-                                        setCurrentItem(currentItem + 1, true)
-                                    }
-                                    itemView.home_preview_info_btt?.requestFocus()
-                                }
-                            }
-
-                            itemView.home_preview_hidden_prev_focus?.setOnFocusChangeListener { _, hasFocus ->
-                                if (hasFocus) {
-                                    previewViewpager?.apply {
-                                        if (currentItem <= 0) {
-                                            nav_rail_view?.menu?.getItem(0)?.actionView?.requestFocus()
-                                        } else {
-                                            setCurrentItem(currentItem - 1, true)
-                                            itemView.home_preview_play_btt?.requestFocus()
-                                        }
-                                    }
-                                }
-                            }
-                            // very ugly code, but I dont care
-                            val watchType =
-                                DataStoreHelper.getResultWatchState(this.getId())
-                            itemView.home_preview_bookmark?.setText(watchType.stringRes)
-                            itemView.home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                null,
-                                ContextCompat.getDrawable(
-                                    itemView.home_preview_bookmark.context,
-                                    watchType.iconRes
-                                ),
-                                null,
-                                null
-                            )
-                            itemView.home_preview_bookmark?.setOnClickListener { fab ->
-                                fab.context.getActivity()?.showBottomDialog(
-                                    WatchType.values()
-                                        .map { fab.context.getString(it.stringRes) }
-                                        .toList(),
-                                    DataStoreHelper.getResultWatchState(this.getId()).ordinal,
-                                    fab.context.getString(R.string.action_add_to_bookmarks),
-                                    showApply = false,
-                                    {}) {
-                                    val newValue = WatchType.values()[it]
-                                    itemView.home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                        null,
-                                        ContextCompat.getDrawable(
-                                            itemView.home_preview_bookmark.context,
-                                            newValue.iconRes
-                                        ),
-                                        null,
-                                        null
-                                    )
-                                    itemView.home_preview_bookmark?.setText(newValue.stringRes)
-
-                                    ResultViewModel2.updateWatchStatus(
-                                        this,
-                                        newValue
-                                    )
-                                    reloadStored()
-                                }
-                            }
-                        }
+                    val item = previewAdapter.getItem(position) ?: return
+                    onSelect(item, position)
                 }
             }
 
-        private var resumeAdapter: HomeChildItemAdapter? = null
-        private var resumeHolder: View? = itemView.home_watch_holder
-        private var resumeRecyclerView: RecyclerView? = itemView.home_watch_child_recyclerview
+        fun onSelect(item: LoadResponse, position: Int) {
+            (binding as? FragmentHomeHeadTvBinding)?.apply {
+                homePreviewDescription.isGone =
+                    item.plot.isNullOrBlank()
+                homePreviewDescription.text =
+                    item.plot ?: ""
 
-        private var bookmarkHolder: View? = itemView.home_bookmarked_holder
-        private var bookmarkAdapter: HomeChildItemAdapter? = null
-        private var bookmarkRecyclerView: RecyclerView? =
-            itemView.home_bookmarked_child_recyclerview
+                homePreviewText.text = item.name
+                homePreviewTags.apply {
+                    removeAllViews()
+                    item.tags?.forEach { tag ->
+                        val chip = Chip(context)
+                        val chipDrawable =
+                            ChipDrawable.createFromAttributes(
+                                context,
+                                null,
+                                0,
+                                R.style.ChipFilledSemiTransparent
+                            )
+                        chip.setChipDrawable(chipDrawable)
+                        chip.text = tag
+                        chip.isChecked = false
+                        chip.isCheckable = false
+                        chip.isFocusable = false
+                        chip.isClickable = false
+                        addView(chip)
+                    }
+                }
+                homePreviewTags.isGone =
+                    item.tags.isNullOrEmpty()
+
+                homePreviewPlayBtt.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(
+                            START_ACTION_RESUME_LATEST,
+                            view,
+                            position,
+                            item
+                        )
+                    )
+                }
+
+                homePreviewInfoBtt.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(0, view, position, item)
+                    )
+                }
+
+            }
+            (binding as? FragmentHomeHeadBinding)?.apply {
+                homePreviewImage.setImage(item.posterUrl, item.posterHeaders)
+
+                homePreviewPlay.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(
+                            START_ACTION_RESUME_LATEST,
+                            view,
+                            position,
+                            item
+                        )
+                    )
+                }
+
+                homePreviewInfo.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(0, view, position, item)
+                    )
+                }
+
+                // very ugly code, but I don't care
+                val id = item.getId()
+                val watchType =
+                    DataStoreHelper.getResultWatchState(id)
+                homePreviewBookmark.setText(watchType.stringRes)
+                homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds(
+                    null,
+                    ContextCompat.getDrawable(
+                        homePreviewBookmark.context,
+                        watchType.iconRes
+                    ),
+                    null,
+                    null
+                )
+
+                homePreviewBookmark.setOnClickListener { fab ->
+                    fab.context.getActivity()?.showBottomDialog(
+                        WatchType.values()
+                            .map { fab.context.getString(it.stringRes) }
+                            .toList(),
+                        DataStoreHelper.getResultWatchState(id).ordinal,
+                        fab.context.getString(R.string.action_add_to_bookmarks),
+                        showApply = false,
+                        {}) {
+                        val newValue = WatchType.values()[it]
+                        homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            ContextCompat.getDrawable(
+                                homePreviewBookmark.context,
+                                newValue.iconRes
+                            ),
+                            null,
+                            null
+                        )
+                        homePreviewBookmark.setText(newValue.stringRes)
+
+                        ResultViewModel2.updateWatchStatus(
+                            item,
+                            newValue
+                        )
+                    }
+                }
+            }
+        }
 
         fun onViewDetachedFromWindow() {
-            previewViewpager?.unregisterOnPageChangeCallback(previewCallback)
+            previewViewpager.unregisterOnPageChangeCallback(previewCallback)
         }
 
         fun onViewAttachedToWindow() {
-            previewViewpager?.registerOnPageChangeCallback(previewCallback)
+            previewViewpager.registerOnPageChangeCallback(previewCallback)
+
+            binding.root.findViewTreeLifecycleOwner()?.apply {
+                observe(viewModel.preview) {
+                    updatePreview(it)
+                }
+                if (binding is FragmentHomeHeadTvBinding) {
+                    observe(viewModel.apiName) { name ->
+                        binding.homePreviewChangeApi.text = name
+                        binding.homePreviewChangeApi2.text = name
+                    }
+                }
+                observe(viewModel.resumeWatching) {
+                    updateResume(it)
+                }
+                observe(viewModel.bookmarks) {
+                    updateBookmarks(it)
+                }
+                observe(viewModel.availableWatchStatusTypes) { (checked, visible) ->
+                    for ((chip, watch) in toggleList) {
+                        chip.apply {
+                            isVisible = visible.contains(watch)
+                            isChecked = checked.contains(watch)
+                        }
+                    }
+                }
+            } ?: debugException { "Expected findViewTreeLifecycleOwner" }
         }
 
-        private val toggleList = listOf(
-            Pair(itemView.home_type_watching_btt, WatchType.WATCHING),
-            Pair(itemView.home_type_completed_btt, WatchType.COMPLETED),
-            Pair(itemView.home_type_dropped_btt, WatchType.DROPPED),
-            Pair(itemView.home_type_on_hold_btt, WatchType.ONHOLD),
-            Pair(itemView.home_plan_to_watch_btt, WatchType.PLANTOWATCH),
+        private val toggleList = listOf<Pair<Chip, WatchType>>(
+            Pair(itemView.findViewById(R.id.home_type_watching_btt), WatchType.WATCHING),
+            Pair(itemView.findViewById(R.id.home_type_completed_btt), WatchType.COMPLETED),
+            Pair(itemView.findViewById(R.id.home_type_dropped_btt), WatchType.DROPPED),
+            Pair(itemView.findViewById(R.id.home_type_on_hold_btt), WatchType.ONHOLD),
+            Pair(itemView.findViewById(R.id.home_plan_to_watch_btt), WatchType.PLANTOWATCH),
         )
 
         init {
-            itemView.home_preview_change_api?.setOnClickListener { view ->
-                changeHomePageCallback(view)
-            }
-            itemView.home_preview_change_api2?.setOnClickListener { view ->
-                changeHomePageCallback(view)
-            }
+            previewViewpager.setPageTransformer(HomeScrollTransformer())
 
-            previewViewpager?.apply {
-                //if (!isTvSettings())
-                setPageTransformer(HomeScrollTransformer())
-                //else
-                //    setPageTransformer(null)
+            previewViewpager.adapter = previewAdapter
+            resumeRecyclerView.adapter = resumeAdapter
+            bookmarkRecyclerView.adapter = bookmarkAdapter
 
-                if (adapter == null)
-                    adapter = HomeScrollAdapter(
-                        if (isTvSettings()) R.layout.home_scroll_view_tv else R.layout.home_scroll_view,
-                        if (isTvSettings()) true else null
-                    )
-            }
-            previewAdapter = previewViewpager?.adapter as? HomeScrollAdapter?
-            // previewViewpager?.registerOnPageChangeCallback(previewCallback)
-
-            if (resumeAdapter == null) {
-                resumeRecyclerView?.adapter = HomeChildItemAdapter(
-                    ArrayList(),
-                    nextFocusUp = itemView.nextFocusUpId,
-                    nextFocusDown = itemView.nextFocusDownId
-                ) { callback ->
-                    if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
-                        searchClickCallback(callback)
-                        return@HomeChildItemAdapter
-                    }
-                    callback.view.context?.getActivity()?.showOptionSelectStringRes(
-                        callback.view,
-                        callback.card.posterUrl,
-                        listOf(
-                            R.string.action_open_watching,
-                            R.string.action_remove_watching
-                        ),
-                        listOf(
-                            R.string.action_open_play,
-                            R.string.action_open_watching,
-                            R.string.action_remove_watching
-                        )
-                    ) { (isTv, actionId) ->
-                        when (actionId + if (isTv) 0 else 1) {
-                            // play
-                            0 -> {
-                                searchClickCallback.invoke(
-                                    SearchClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-                                reloadStored()
-                            }
-                            //info
-                            1 -> {
-                                searchClickCallback(
-                                    SearchClickCallback(
-                                        SEARCH_ACTION_LOAD,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-
-                                reloadStored()
-                            }
-                            // remove
-                            2 -> {
-                                val card = callback.card
-                                if (card is DataStoreHelper.ResumeWatchingResult) {
-                                    DataStoreHelper.removeLastWatched(card.parentId)
-                                    reloadStored()
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            resumeAdapter = resumeRecyclerView?.adapter as? HomeChildItemAdapter
-            if (bookmarkAdapter == null) {
-                bookmarkRecyclerView?.adapter = HomeChildItemAdapter(
-                    ArrayList(),
-                    nextFocusUp = itemView.nextFocusUpId,
-                    nextFocusDown = itemView.nextFocusDownId
-                ) { callback ->
-                    if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
-                        searchClickCallback(callback)
-                        return@HomeChildItemAdapter
-                    }
-                    callback.view.context?.getActivity()?.showOptionSelectStringRes(
-                        callback.view,
-                        callback.card.posterUrl,
-                        listOf(
-                            R.string.action_open_watching,
-                            R.string.action_remove_from_bookmarks,
-                        ),
-                        listOf(
-                            R.string.action_open_play,
-                            R.string.action_open_watching,
-                            R.string.action_remove_from_bookmarks
-                        )
-                    ) { (isTv, actionId) ->
-                        when (actionId + if (isTv) 0 else 1) { // play
-                            0 -> {
-                                searchClickCallback.invoke(
-                                    SearchClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-                                reloadStored()
-                            }
-                            1 -> { // info
-                                searchClickCallback(
-                                    SearchClickCallback(
-                                        SEARCH_ACTION_LOAD,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-
-                                reloadStored()
-                            }
-                            2 -> { // remove
-                                DataStoreHelper.setResultWatchState(
-                                    callback.card.id,
-                                    WatchType.NONE.internalId
-                                )
-                                reloadStored()
-                            }
-                        }
-                    }
-                }
-            }
-            bookmarkAdapter = bookmarkRecyclerView?.adapter as? HomeChildItemAdapter
+            resumeRecyclerView.setLinearListLayout()
+            bookmarkRecyclerView.setLinearListLayout()
 
             for ((chip, watch) in toggleList) {
-                chip?.isChecked = false
-                chip?.setOnCheckedChangeListener { _, isChecked ->
+                chip.isChecked = false
+                chip.setOnCheckedChangeListener { _, isChecked ->
                     if (isChecked) {
-                        loadStoredData(
-                            setOf(watch)
-                            // If we filter all buttons then two can be checked at the same time
-                            // Revert this if you want to go back to multi selection
-//                    toggleList.filter { it.first?.isChecked == true }.map { it.second }.toSet()
-                        )
+                        viewModel.loadStoredData(setOf(watch))
                     }
                     // Else if all are unchecked -> Do not load data
-                    else if (toggleList.all { it.first?.isChecked != true }) {
-                        loadStoredData(emptySet())
+                    else if (toggleList.all { !it.first.isChecked }) {
+                        viewModel.loadStoredData(emptySet())
                     }
                 }
             }
 
-            itemView.home_search?.context?.fixPaddingStatusbar(itemView.home_search)
-
-            itemView.home_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String): Boolean {
-                    searchQueryCallback.invoke(false to query)
-                    //QuickSearchFragment.pushSearch(activity, query, currentApiName?.let { arrayOf(it) }
-                    return true
+            (binding as? FragmentHomeHeadTvBinding)?.apply {
+                homePreviewChangeApi.setOnClickListener { view ->
+                    view.context.selectHomepage(viewModel.repo?.name) { api ->
+                        viewModel.loadAndCancel(api, forceReload = true, fromUI = true)
+                    }
+                }
+                homePreviewChangeApi2.setOnClickListener { view ->
+                    view.context.selectHomepage(viewModel.repo?.name) { api ->
+                        viewModel.loadAndCancel(api, forceReload = true, fromUI = true)
+                    }
                 }
 
-                override fun onQueryTextChange(newText: String): Boolean {
-                    searchQueryCallback.invoke(true to newText)
-                    //searchViewModel.quickSearch(newText)
-                    return true
+                // This makes the hidden next buttons only available when on the info button
+                // Otherwise you might be able to go to the next item without being at the info button
+                homePreviewInfoBtt.setOnFocusChangeListener { _, hasFocus ->
+                    homePreviewHiddenNextFocus.isFocusable = hasFocus
                 }
-            })
+
+                homePreviewPlayBtt.setOnFocusChangeListener { _, hasFocus ->
+                    homePreviewHiddenPrevFocus.isFocusable = hasFocus
+                }
+
+                homePreviewHiddenNextFocus.setOnFocusChangeListener { _, hasFocus ->
+                    if (hasFocus) {
+                        previewViewpager.setCurrentItem(previewViewpager.currentItem + 1, true)
+                        homePreviewInfoBtt.requestFocus()
+                    }
+                }
+
+                homePreviewHiddenPrevFocus.setOnFocusChangeListener { _, hasFocus ->
+                    if (hasFocus) {
+                        previewViewpager.apply {
+                            if (currentItem <= 0) {
+                                findViewById<NavigationRailView?>(R.id.nav_rail_view)?.menu?.getItem(
+                                    0
+                                )?.actionView?.requestFocus()
+                            } else {
+                                setCurrentItem(currentItem - 1, true)
+                                binding.homePreviewPlayBtt.requestFocus()
+                            }
+                        }
+                    }
+                }
+            }
+
+            (binding as? FragmentHomeHeadBinding)?.apply {
+                fixPaddingStatusbar(binding.homeSearch)
+
+                homeSearch.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                    override fun onQueryTextSubmit(query: String): Boolean {
+                        viewModel.queryTextSubmit(query)
+                        return true
+                    }
+
+                    override fun onQueryTextChange(newText: String): Boolean {
+                        viewModel.queryTextChange(newText)
+                        return true
+                    }
+                })
+            }
         }
 
-        fun updateApiName(name: String) {
-            itemView.home_preview_change_api2?.text = name
-            itemView.home_preview_change_api?.text = name
-        }
+        private fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
+            if (binding is FragmentHomeHeadTvBinding) {
+                binding.homePreviewChangeApi2.isGone = preview is Resource.Success
+            }
 
-        fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
-            itemView.home_preview_change_api2?.isGone = preview is Resource.Success
             if (preview is Resource.Success) {
-                itemView.home_none_padding?.apply {
+                homeNonePadding.apply {
                     val params = layoutParams
                     params.height = 0
                     layoutParams = params
                 }
             } else {
-                itemView.home_none_padding?.context?.fixPaddingStatusbarView(itemView.home_none_padding)
+                fixPaddingStatusbarView(homeNonePadding)
             }
+
             when (preview) {
                 is Resource.Success -> {
-                    if (true != previewAdapter?.setItems(
+                    if (!previewAdapter.setItems(
                             preview.value.second,
                             preview.value.first
                         )
                     ) {
                         // this might seam weird and useless, however this prevents a very weird andrid bug were the viewpager is not rendered properly
                         // I have no idea why that happens, but this is my ducktape solution
-                        previewViewpager?.setCurrentItem(0, false)
-                        previewViewpager?.beginFakeDrag()
-                        previewViewpager?.fakeDragBy(1f)
-                        previewViewpager?.endFakeDrag()
+                        previewViewpager.setCurrentItem(0, false)
+                        previewViewpager.beginFakeDrag()
+                        previewViewpager.fakeDragBy(1f)
+                        previewViewpager.endFakeDrag()
                         previewCallback.onPageSelected(0)
-                        previewHeader?.isVisible = true
+                        previewHeader.isVisible = true
                     }
                 }
+
                 else -> {
-                    previewAdapter?.setItems(listOf(), false)
-                    previewViewpager?.setCurrentItem(0, false)
-                    previewHeader?.isVisible = false
+                    previewAdapter.setItems(listOf(), false)
+                    previewViewpager.setCurrentItem(0, false)
+                    previewHeader.isVisible = false
                 }
             }
-            // previewViewpager?.postDelayed({ previewViewpager?.scr(100, 0) }, 1000)
-            //previewViewpager?.postInvalidate()
         }
 
-        fun updateResume(resumeWatching: List<SearchResponse>) {
-            resumeHolder?.isVisible = resumeWatching.isNotEmpty()
-            resumeAdapter?.updateList(resumeWatching)
+        private fun updateResume(resumeWatching: List<SearchResponse>) {
+            resumeHolder.isVisible = resumeWatching.isNotEmpty()
+            resumeAdapter.updateList(resumeWatching)
 
-            if (!isTvSettings()) {
-                itemView.home_watch_parent_item_title?.setOnClickListener {
-                    moreInfoClickCallback.invoke(
+            if (binding is FragmentHomeHeadBinding) {
+                binding.homeBookmarkParentItemTitle.setOnClickListener {
+                    viewModel.popup(
                         HomeViewModel.ExpandableHomepageList(
                             HomePageList(
-                                itemView.home_watch_parent_item_title?.text.toString(),
+                                binding.homeWatchParentItemTitle.text.toString(),
                                 resumeWatching,
                                 false
                             ), 1, false
@@ -623,21 +566,23 @@ class HomeParentItemAdapterPreview(
             }
         }
 
-        fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
-            bookmarkHolder?.isVisible = data.first
-            bookmarkAdapter?.updateList(data.second)
-            if (!isTvSettings()) {
-                itemView.home_bookmark_parent_item_title?.setOnClickListener {
-                    val items = toggleList.mapNotNull { it.first }.filter { it.isChecked }
+        private fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
+            val (visible, list) = data
+            bookmarkHolder.isVisible = visible
+            bookmarkAdapter.updateList(list)
+
+            if (binding is FragmentHomeHeadBinding) {
+                binding.homeBookmarkParentItemTitle.setOnClickListener {
+                    val items = toggleList.map { it.first }.filter { it.isChecked }
                     if (items.isEmpty()) return@setOnClickListener // we don't want to show an empty dialog
                     val textSum = items
                         .mapNotNull { it.text }.joinToString()
 
-                    moreInfoClickCallback.invoke(
+                    viewModel.popup(
                         HomeViewModel.ExpandableHomepageList(
                             HomePageList(
                                 textSum,
-                                data.second,
+                                list,
                                 false
                             ), 1, false
                         )
@@ -645,14 +590,5 @@ class HomeParentItemAdapterPreview(
                 }
             }
         }
-
-        fun setAvailableWatchStatusTypes(availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>>) {
-            for ((chip, watch) in toggleList) {
-                chip?.apply {
-                    isVisible = availableWatchStatusTypes.second.contains(watch)
-                    isChecked = availableWatchStatusTypes.first.contains(watch)
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
index f296e53d..9d95a5fa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -2,24 +2,18 @@ package com.lagradost.cloudstream3.ui.home
 
 import android.content.res.Configuration
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.core.view.isGone
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.HomeScrollViewBinding
+import com.lagradost.cloudstream3.databinding.HomeScrollViewTvBinding
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.fragment_home_head_tv.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
-import kotlinx.android.synthetic.main.home_scroll_view.view.*
 
-
-class HomeScrollAdapter(
-    @LayoutRes val layout: Int = R.layout.home_scroll_view,
-    private val forceHorizontalPosters: Boolean? = null
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var items: MutableList<LoadResponse> = mutableListOf()
     var hasMoreItems: Boolean = false
 
@@ -45,9 +39,16 @@ class HomeScrollAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = if (isTvSettings()) {
+            HomeScrollViewTvBinding.inflate(inflater, parent, false)
+        } else {
+            HomeScrollViewBinding.inflate(inflater, parent, false)
+        }
+
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
-            forceHorizontalPosters
+            binding,
+            //forceHorizontalPosters
         )
     }
 
@@ -61,22 +62,32 @@ class HomeScrollAdapter(
 
     class CardViewHolder
     constructor(
-        itemView: View,
-        private val forceHorizontalPosters: Boolean? = null
+        val binding: ViewBinding,
+        //private val forceHorizontalPosters: Boolean? = null
     ) :
-        RecyclerView.ViewHolder(itemView) {
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(card: LoadResponse) {
-            card.apply {
-                val isHorizontal =
-                    (forceHorizontalPosters == true) || ((forceHorizontalPosters != false) && itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
+            val isHorizontal =
+                binding is HomeScrollViewTvBinding || itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
-                val posterUrl = if (isHorizontal) backgroundPosterUrl ?: posterUrl else posterUrl
-                    ?: backgroundPosterUrl
-                itemView.home_scroll_preview_tags?.text = tags?.joinToString(" • ") ?: ""
-                itemView.home_scroll_preview_tags?.isGone = tags.isNullOrEmpty()
-                itemView.home_scroll_preview?.setImage(posterUrl, posterHeaders)
-                itemView.home_scroll_preview_title?.text = name
+            val posterUrl =
+                if (isHorizontal) card.backgroundPosterUrl ?: card.posterUrl else card.posterUrl
+                    ?: card.backgroundPosterUrl
+
+            when (binding) {
+                is HomeScrollViewBinding -> {
+                    binding.homeScrollPreview.setImage(posterUrl)
+                    binding.homeScrollPreviewTags.apply {
+                        text = card.tags?.joinToString(" • ") ?: ""
+                        isGone = card.tags.isNullOrEmpty()
+                    }
+                    binding.homeScrollPreviewTitle.text = card.name
+                }
+
+                is HomeScrollViewTvBinding -> {
+                    binding.homeScrollPreview.setImage(posterUrl)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index edf58008..a2dc9821 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -1,10 +1,10 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterHomePageListByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
@@ -13,11 +13,30 @@ import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.mvvm.*
+import com.lagradost.cloudstream3.CommonActivity.activity
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugWarning
+import com.lagradost.cloudstream3.mvvm.launchSafe
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
+import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching
+import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.DataStoreHelper
@@ -32,7 +51,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
-import java.util.*
+import java.util.EnumSet
 import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
@@ -72,7 +91,7 @@ class HomeViewModel : ViewModel() {
         }
     }
 
-    private var repo: APIRepository? = null
+    var repo: APIRepository? = null
 
     private val _apiName = MutableLiveData<String>()
     val apiName: LiveData<String> = _apiName
@@ -83,7 +102,7 @@ class HomeViewModel : ViewModel() {
     private var currentShuffledList: List<SearchResponse> = listOf()
 
     private fun autoloadRepo(): APIRepository {
-        return APIRepository(apis.first { it.hasMainPage })
+        return APIRepository(synchronized(apis) { apis.first { it.hasMainPage }})
     }
 
     private val _availableWatchStatusTypes =
@@ -101,8 +120,14 @@ class HomeViewModel : ViewModel() {
     val resumeWatching: LiveData<List<SearchResponse>> = _resumeWatching
     val preview: LiveData<Resource<Pair<Boolean, List<LoadResponse>>>> = _preview
 
-    fun loadResumeWatching() = viewModelScope.launchSafe {
+    private fun loadResumeWatching() = viewModelScope.launchSafe {
         val resumeWatchingResult = getResumeWatching()
+        if (isTrueTvSettings() && resumeWatchingResult != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ioSafe {
+                // this WILL crash on non tvs, so keep this inside a try catch
+                activity?.addProgramsToContinueWatching(resumeWatchingResult)
+            }
+        }
         resumeWatchingResult?.let {
             _resumeWatching.postValue(it)
         }
@@ -128,6 +153,10 @@ class HomeViewModel : ViewModel() {
         currentWatchTypes.remove(WatchType.NONE)
 
         if (currentWatchTypes.size <= 0) {
+            setKey(
+                HOME_BOOKMARK_VALUE_LIST,
+                intArrayOf()
+            )
             _availableWatchStatusTypes.postValue(setOf<WatchType>() to setOf())
             _bookmarks.postValue(Pair(false, ArrayList()))
             return@launchSafe
@@ -135,7 +164,10 @@ class HomeViewModel : ViewModel() {
 
         val watchPrefNotNull = preferredWatchStatus ?: EnumSet.of(currentWatchTypes.first())
         //if (currentWatchTypes.any { watchPrefNotNull.contains(it) }) watchPrefNotNull else listOf(currentWatchTypes.first())
-
+        setKey(
+            HOME_BOOKMARK_VALUE_LIST,
+            watchPrefNotNull.map { it.internalId }.toIntArray()
+        )
         _availableWatchStatusTypes.postValue(
             Pair(
                 watchPrefNotNull,
@@ -152,8 +184,10 @@ class HomeViewModel : ViewModel() {
     }
 
     private var onGoingLoad: Job? = null
-    private fun loadAndCancel(api: MainAPI?) {
+    private var isCurrentlyLoadingName : String? = null
+    private fun loadAndCancel(api: MainAPI) {
         onGoingLoad?.cancel()
+        isCurrentlyLoadingName = api.name
         onGoingLoad = load(api)
     }
 
@@ -255,12 +289,12 @@ class HomeViewModel : ViewModel() {
         }
     }
 
-    private fun load(api: MainAPI?) = ioSafe {
-        repo = if (api != null) {
+    private fun load(api: MainAPI) : Job = ioSafe {
+        repo = //if (api != null) {
             APIRepository(api)
-        } else {
-            autoloadRepo()
-        }
+        //} else {
+        //    autoloadRepo()
+        //}
 
         _apiName.postValue(repo?.name)
         _randomItems.postValue(listOf())
@@ -274,6 +308,7 @@ class HomeViewModel : ViewModel() {
 
         _page.postValue(Resource.Loading())
         _preview.postValue(Resource.Loading())
+        // cancel the current preview expand as that is no longer relevant
         addJob?.cancel()
 
         when (val data = repo?.getMainPage(1, null)) {
@@ -337,41 +372,126 @@ class HomeViewModel : ViewModel() {
                     logError(e)
                 }
             }
+
             is Resource.Failure -> {
                 _page.postValue(data!!)
                 _preview.postValue(data!!)
             }
+
             else -> Unit
         }
+        isCurrentlyLoadingName = null
+    }
+
+    fun click(callback: SearchClickCallback) {
+        if (callback.action == SEARCH_ACTION_FOCUSED) {
+            //focusCallback(callback.card)
+        } else {
+            SearchHelper.handleSearchClickCallback(callback)
+        }
     }
 
-    fun loadAndCancel(preferredApiName: String?, forceReload: Boolean = true) =
-        viewModelScope.launchSafe {
+
+    private val _popup = MutableLiveData<ExpandableHomepageList?>(null)
+    val popup: LiveData<ExpandableHomepageList?> = _popup
+
+    fun popup(list: ExpandableHomepageList?) {
+        _popup.postValue(list)
+    }
+
+    private fun bookmarksUpdated(unused: Boolean) {
+        reloadStored()
+    }
+
+    private fun afterPluginsLoaded(forceReload: Boolean) {
+        loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), forceReload)
+    }
+
+    private fun afterMainPluginsLoaded(unused: Boolean = false) {
+        loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), false)
+    }
+
+    init {
+        MainActivity.bookmarksUpdatedEvent += ::bookmarksUpdated
+        MainActivity.afterPluginsLoadedEvent += ::afterPluginsLoaded
+        MainActivity.mainPluginsLoadedEvent += ::afterMainPluginsLoaded
+    }
+
+    override fun onCleared() {
+        MainActivity.bookmarksUpdatedEvent -= ::bookmarksUpdated
+        MainActivity.afterPluginsLoadedEvent -= ::afterPluginsLoaded
+        MainActivity.mainPluginsLoadedEvent -= ::afterMainPluginsLoaded
+        super.onCleared()
+    }
+
+    fun queryTextSubmit(query: String) {
+        QuickSearchFragment.pushSearch(
+            query,
+            repo?.name?.let { arrayOf(it) })
+    }
+
+    fun queryTextChange(newText: String) {
+        // do nothing
+    }
+
+    fun reloadStored() {
+        loadResumeWatching()
+        val list = EnumSet.noneOf(WatchType::class.java)
+        getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)?.map { WatchType.fromInternalId(it) }?.let {
+            list.addAll(it)
+        }
+        loadStoredData(list)
+    }
+
+    fun click(load: LoadClickCallback) {
+        loadResult(load.response.url, load.response.apiName, load.action)
+    }
+
+    // only save the key if it is from UI, as we don't want internal functions changing the setting
+    fun loadAndCancel(
+        preferredApiName: String?,
+        forceReload: Boolean = true,
+        fromUI: Boolean = false
+    ) =
+        ioSafe {
             // Since plugins are loaded in stages this function can get called multiple times.
             // The issue with this is that the homepage may be fetched multiple times while the first request is loading
             val api = getApiFromNameNull(preferredApiName)
-            if (!forceReload && api?.let { expandable[it.name]?.list?.list?.isNotEmpty() } == true) {
-                return@launchSafe
+            // api?.let { expandable[it.name]?.list?.list?.isNotEmpty() } == true
+            val currentPage = page.value
+
+            // if we don't need to reload and we have a valid homepage or currently loading the same thing then return
+            val currentLoading = isCurrentlyLoadingName
+            if (!forceReload && (currentPage is Resource.Success && currentPage.value.isNotEmpty() || (currentLoading != null && currentLoading == preferredApiName))) {
+                return@ioSafe
             }
 
             if (preferredApiName == noneApi.name) {
-                setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name)
+                // just set to random
+                if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name)
                 loadAndCancel(noneApi)
             } else if (preferredApiName == randomApi.name) {
+                // randomize the api, if none exist like if not loaded or not installed
+                // then use nothing
                 val validAPIs = context?.filterProviderByPreferredMedia()
                 if (validAPIs.isNullOrEmpty()) {
-                    // Do not set USER_SELECTED_HOMEPAGE_API when there is no plugins loaded
                     loadAndCancel(noneApi)
                 } else {
                     val apiRandom = validAPIs.random()
                     loadAndCancel(apiRandom)
-                    setKey(USER_SELECTED_HOMEPAGE_API, apiRandom.name)
+                    if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, apiRandom.name)
                 }
-                // If the plugin isn't loaded yet. (Does not set the key)
             } else if (api == null) {
-                loadAndCancel(noneApi)
+                // API is not found aka not loaded or removed, post the loading
+                // progress if waiting for plugins, otherwise nothing
+                if(PluginManager.loadedLocalPlugins) {
+                    loadAndCancel(noneApi)
+                } else {
+                    _page.postValue(Resource.Loading())
+                }
             } else {
-                setKey(USER_SELECTED_HOMEPAGE_API, api.name)
+                // if the api is found, then set it to it and save key
+                if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, api.name)
                 loadAndCancel(api)
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index d7c06c4e..04ef3d96 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
@@ -6,7 +6,6 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,6 +13,7 @@ import android.view.animation.AlphaAnimation
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.tabs.TabLayoutMediator
 import com.lagradost.cloudstream3.APIHolder
@@ -22,6 +22,7 @@ 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.R
+import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.observe
@@ -37,7 +38,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.reduceDragSensitivity
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
-import kotlinx.android.synthetic.main.fragment_library.*
 import kotlin.math.abs
 
 const val LIBRARY_FOLDER = "library_folder"
@@ -73,14 +73,25 @@ class LibraryFragment : Fragment() {
 
     private val libraryViewModel: LibraryViewModel by activityViewModels()
 
+    var binding: FragmentLibraryBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_library, container, false)
+    ): View {
+        val localBinding = FragmentLibraryBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+
+        //return inflater.inflate(R.layout.fragment_library, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        viewpager?.currentItem?.let { currentItem ->
+        binding?.viewpager?.currentItem?.let { currentItem ->
             outState.putInt(VIEWPAGER_ITEM_KEY, currentItem)
         }
         super.onSaveInstanceState(outState)
@@ -88,9 +99,9 @@ class LibraryFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(search_status_bar_padding)
+        fixPaddingStatusbar(binding?.searchStatusBarPadding)
 
-        sort_fab?.setOnClickListener {
+        binding?.sortFab?.setOnClickListener {
             val methods = libraryViewModel.sortingMethods.map {
                 txt(it.stringRes).asString(view.context)
             }
@@ -106,7 +117,7 @@ class LibraryFragment : Fragment() {
                 })
         }
 
-        main_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 libraryViewModel.sort(ListSorting.Query, query)
                 return true
@@ -129,7 +140,7 @@ class LibraryFragment : Fragment() {
 
         libraryViewModel.reloadPages(false)
 
-        list_selector?.setOnClickListener {
+        binding?.listSelector?.setOnClickListener {
             val items = libraryViewModel.availableApiNames
             val currentItem = libraryViewModel.currentApiName.value
 
@@ -152,12 +163,14 @@ class LibraryFragment : Fragment() {
             syncId: SyncIdName,
             apiName: String? = null,
         ) {
-            val availableProviders = allProviders.filter {
-                it.supportedSyncNames.contains(syncId)
-            }.map { it.name } +
-                    // Add the api if it exists
-                    (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) } ?: emptyList())
-
+            val availableProviders = synchronized(allProviders) {
+                allProviders.filter {
+                    it.supportedSyncNames.contains(syncId)
+                }.map { it.name } +
+                        // Add the api if it exists
+                        (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) }
+                            ?: emptyList())
+            }
             val baseOptions = listOf(
                 LibraryOpenerType.Default,
                 LibraryOpenerType.None,
@@ -209,20 +222,22 @@ class LibraryFragment : Fragment() {
             }
         }
 
-        provider_selector?.setOnClickListener {
+        binding?.providerSelector?.setOnClickListener {
             val syncName = libraryViewModel.currentSyncApi?.syncIdName ?: return@setOnClickListener
             activity?.showPluginSelectionDialog(syncName.name, syncName)
         }
 
-        viewpager?.setPageTransformer(LibraryScrollTransformer())
-        viewpager?.adapter =
-            viewpager.adapter ?: ViewpagerAdapter(mutableListOf(), { isScrollingDown: Boolean ->
-                if (isScrollingDown) {
-                    sort_fab?.shrink()
-                } else {
-                    sort_fab?.extend()
-                }
-            }) callback@{ searchClickCallback ->
+        binding?.viewpager?.setPageTransformer(LibraryScrollTransformer())
+        binding?.viewpager?.adapter =
+            binding?.viewpager?.adapter ?: ViewpagerAdapter(
+                mutableListOf(),
+                { isScrollingDown: Boolean ->
+                    if (isScrollingDown) {
+                        binding?.sortFab?.shrink()
+                    } else {
+                        binding?.sortFab?.extend()
+                    }
+                }) callback@{ searchClickCallback ->
                 // To prevent future accidents
                 debugAssert({
                     searchClickCallback.card !is SyncAPI.LibraryItem
@@ -267,6 +282,7 @@ class LibraryFragment : Fragment() {
                                     )
                                 }
                             }
+
                             LibraryOpenerType.None -> {}
                             LibraryOpenerType.Provider ->
                                 savedSelection.providerData?.apiName?.let { apiName ->
@@ -275,8 +291,10 @@ class LibraryFragment : Fragment() {
                                         apiName,
                                     )
                                 }
+
                             LibraryOpenerType.Browser ->
                                 openBrowser(searchClickCallback.card.url)
+
                             LibraryOpenerType.Search -> {
                                 QuickSearchFragment.pushSearch(
                                     activity,
@@ -288,22 +306,28 @@ class LibraryFragment : Fragment() {
                 }
             }
 
-        viewpager?.offscreenPageLimit = 2
-        viewpager?.reduceDragSensitivity()
+        binding?.apply {
+            viewpager.offscreenPageLimit = 2
+            viewpager.reduceDragSensitivity()
+        }
 
         val startLoading = Runnable {
-            gridview?.numColumns = context?.getSpanCount() ?: 3
-            gridview?.adapter =
-                context?.let { LoadingPosterAdapter(it, 6 * 3) }
-            library_loading_overlay?.isVisible = true
-            library_loading_shimmer?.startShimmer()
-            empty_list_textview?.isVisible = false
+            binding?.apply {
+                gridview.numColumns = context?.getSpanCount() ?: 3
+                gridview.adapter =
+                    context?.let { LoadingPosterAdapter(it, 6 * 3) }
+                libraryLoadingOverlay.isVisible = true
+                libraryLoadingShimmer.startShimmer()
+                emptyListTextview.isVisible = false
+            }
         }
 
         val stopLoading = Runnable {
-            gridview?.adapter = null
-            library_loading_overlay?.isVisible = false
-            library_loading_shimmer?.stopShimmer()
+            binding?.apply {
+                gridview.adapter = null
+                libraryLoadingOverlay.isVisible = false
+                libraryLoadingShimmer.stopShimmer()
+            }
         }
 
         val handler = Handler(Looper.getMainLooper())
@@ -314,65 +338,75 @@ class LibraryFragment : Fragment() {
                     handler.removeCallbacks(startLoading)
                     val pages = resource.value
                     val showNotice = pages.all { it.items.isEmpty() }
-                    empty_list_textview?.isVisible = showNotice
-                    if (showNotice) {
-                        if (libraryViewModel.availableApiNames.size > 1) {
-                            empty_list_textview?.setText(R.string.empty_library_logged_in_message)
-                        } else {
-                            empty_list_textview?.setText(R.string.empty_library_no_accounts_message)
+
+
+                    binding?.apply {
+                        emptyListTextview.isVisible = showNotice
+                        if (showNotice) {
+                            if (libraryViewModel.availableApiNames.size > 1) {
+                                emptyListTextview.setText(R.string.empty_library_logged_in_message)
+                            } else {
+                                emptyListTextview.setText(R.string.empty_library_no_accounts_message)
+                            }
                         }
+
+                        (viewpager.adapter as? ViewpagerAdapter)?.pages = pages
+                        // Using notifyItemRangeChanged keeps the animations when sorting
+                        viewpager.adapter?.notifyItemRangeChanged(
+                            0,
+                            viewpager.adapter?.itemCount ?: 0
+                        )
+
+                        // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
+                        // Without this there would be a flashing effect:
+                        // loading -> show old viewpager -> black screen -> show new viewpager
+                        handler.postDelayed(stopLoading, 300)
+
+                        savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
+                            if (currentPos < 0) return@let
+                            viewpager.setCurrentItem(currentPos, false)
+                            // Using remove() sets the key to 0 instead of removing it
+                            savedInstanceState.putInt(VIEWPAGER_ITEM_KEY, -1)
+                        }
+
+                        // Since the animation to scroll multiple items is so much its better to just hide
+                        // the viewpager a bit while the fastest animation is running
+                        fun hideViewpager(distance: Int) {
+                            if (distance < 3) return
+
+                            val hideAnimation = AlphaAnimation(1f, 0f).apply {
+                                duration = distance * 50L
+                                fillAfter = true
+                            }
+                            val showAnimation = AlphaAnimation(0f, 1f).apply {
+                                duration = distance * 50L
+                                startOffset = distance * 100L
+                                fillAfter = true
+                            }
+                            viewpager.startAnimation(hideAnimation)
+                            viewpager.startAnimation(showAnimation)
+                        }
+
+                        TabLayoutMediator(
+                            libraryTabLayout,
+                            viewpager,
+                        ) { tab, position ->
+                            tab.text = pages.getOrNull(position)?.title?.asStringNull(context)
+                            tab.view.setOnClickListener {
+                                val currentItem =
+                                    binding?.viewpager?.currentItem ?: return@setOnClickListener
+                                val distance = abs(position - currentItem)
+                                hideViewpager(distance)
+                            }
+                        }.attach()
                     }
-
-                    (viewpager.adapter as? ViewpagerAdapter)?.pages = pages
-                    // Using notifyItemRangeChanged keeps the animations when sorting
-                    viewpager.adapter?.notifyItemRangeChanged(0, viewpager.adapter?.itemCount ?: 0)
-
-                    // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
-                    // Without this there would be a flashing effect:
-                    // loading -> show old viewpager -> black screen -> show new viewpager
-                    handler.postDelayed(stopLoading, 300)
-
-                    savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
-                        if (currentPos < 0) return@let
-                        viewpager?.setCurrentItem(currentPos, false)
-                        // Using remove() sets the key to 0 instead of removing it
-                        savedInstanceState.putInt(VIEWPAGER_ITEM_KEY, -1)
-                    }
-
-                    // Since the animation to scroll multiple items is so much its better to just hide
-                    // the viewpager a bit while the fastest animation is running
-                    fun hideViewpager(distance: Int) {
-                        if (distance < 3) return
-
-                        val hideAnimation = AlphaAnimation(1f, 0f).apply {
-                            duration = distance * 50L
-                            fillAfter = true
-                        }
-                        val showAnimation = AlphaAnimation(0f, 1f).apply {
-                            duration = distance * 50L
-                            startOffset = distance * 100L
-                            fillAfter = true
-                        }
-                        viewpager?.startAnimation(hideAnimation)
-                        viewpager?.startAnimation(showAnimation)
-                    }
-
-                    TabLayoutMediator(
-                        library_tab_layout,
-                        viewpager,
-                    ) { tab, position ->
-                        tab.text = pages.getOrNull(position)?.title?.asStringNull(context)
-                        tab.view.setOnClickListener {
-                            val currentItem = viewpager?.currentItem ?: return@setOnClickListener
-                            val distance = abs(position - currentItem)
-                            hideViewpager(distance)
-                        }
-                    }.attach()
                 }
+
                 is Resource.Loading -> {
                     // Only start loading after 200ms to prevent loading cached lists
                     handler.postDelayed(startLoading, 200)
                 }
+
                 is Resource.Failure -> {
                     stopLoading.run()
                     // No user indication it failed :(
@@ -383,7 +417,7 @@ class LibraryFragment : Fragment() {
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        (viewpager.adapter as? ViewpagerAdapter)?.rebind()
+        (binding?.viewpager?.adapter as? ViewpagerAdapter)?.rebind()
         super.onConfigurationChanged(newConfig)
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
index 8aafbdd6..c3cee183 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
@@ -2,13 +2,13 @@ package com.lagradost.cloudstream3.ui.library
 
 import android.view.View
 import androidx.viewpager2.widget.ViewPager2
-import kotlinx.android.synthetic.main.library_viewpager_page.view.*
+import com.lagradost.cloudstream3.R
 import kotlin.math.roundToInt
 
 class LibraryScrollTransformer : ViewPager2.PageTransformer {
     override fun transformPage(page: View, position: Float) {
         val padding = (-position * page.width).roundToInt()
-        page.page_recyclerview.setPadding(
+        page.findViewById<View>(R.id.page_recyclerview).setPadding(
             padding, 0,
             -padding, 0
         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
index 5f64880c..14d31356 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
@@ -11,7 +11,6 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import kotlinx.coroutines.delay
 
 enum class ListSorting(@StringRes val stringRes: Int) {
     Query(R.string.none),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
index a637133b..160fbe2b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
@@ -5,15 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import android.widget.ListPopupWindow.MATCH_PARENT
-import android.widget.RelativeLayout
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.loading_poster_dynamic.view.*
-import kotlin.math.roundToInt
-import kotlin.math.sqrt
 
 class LoadingPosterAdapter(context: Context, private val itemCount: Int) :
     BaseAdapter() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
index 2435f8be..b8feb656 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
@@ -3,23 +3,21 @@ package com.lagradost.cloudstream3.ui.library
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.search_result_grid_expanded.view.*
 import kotlin.math.roundToInt
 
 
@@ -32,8 +30,11 @@ class PageAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return LibraryItemViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.search_result_grid_expanded, parent, false)
+            SearchResultGridExpandedBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
         )
     }
 
@@ -57,8 +58,8 @@ class PageAdapter(
         }
     }
 
-    inner class LibraryItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val cardView: ImageView = itemView.imageView
+    inner class LibraryItemViewHolder(val binding: SearchResultGridExpandedBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
         private val compactView = false//itemView.context.getGridIsCompact()
         private val coverHeight: Int =
@@ -85,11 +86,12 @@ class PageAdapter(
 
                         val fg =
                             getDifferentColor(bg)//palette.getVibrantColor(ContextCompat.getColor(ctx,R.color.ratingColor))
-                        itemView.text_rating.apply {
+                        binding.textRating.apply {
                             setTextColor(ColorStateList.valueOf(fg))
                         }
-                        itemView.text_rating_holder?.backgroundTintList = ColorStateList.valueOf(bg)
-                        itemView.watchProgress?.apply {
+                        binding.textRating.compoundDrawables.getOrNull(0)?.setTint(fg)
+                        binding.textRating.backgroundTintList = ColorStateList.valueOf(bg)
+                        binding.watchProgress.apply {
                             progressTintList = ColorStateList.valueOf(fg)
                             progressBackgroundTintList = ColorStateList.valueOf(bg)
                         }
@@ -99,7 +101,7 @@ class PageAdapter(
 
             // See searchAdaptor for this, it basically fixes the height
             if (!compactView) {
-                cardView.apply {
+                binding.imageView.apply {
                     layoutParams = FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         coverHeight
@@ -108,23 +110,13 @@ class PageAdapter(
             }
 
             val showProgress = item.episodesCompleted != null && item.episodesTotal != null
-            itemView.watchProgress.isVisible = showProgress
+            binding.watchProgress.isVisible = showProgress
             if (showProgress) {
-                itemView.watchProgress.max = item.episodesTotal!!
-                itemView.watchProgress.progress = item.episodesCompleted!!
+                binding.watchProgress.max = item.episodesTotal!!
+                binding.watchProgress.progress = item.episodesCompleted!!
             }
 
-            itemView.imageText.text = item.name
-
-            val showRating = (item.personalRating ?: 0) != 0
-            itemView.text_rating_holder.isVisible = showRating
-            if (showRating) {
-                // We want to show 8.5 but not 8.0 hence the replace
-                val rating = ((item.personalRating ?: 0).toDouble() / 10).toString()
-                    .replace(".0", "")
-
-                itemView.text_rating.text = "★ $rating"
-            }
+            binding.imageText.text = item.name
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
index 33a40386..95fefcbe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
@@ -2,16 +2,14 @@ package com.lagradost.cloudstream3.ui.library
 
 import android.os.Build
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.doOnAttach
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnFlingListener
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.LibraryViewpagerPageBinding
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
-import kotlinx.android.synthetic.main.library_viewpager_page.view.*
 
 class ViewpagerAdapter(
     var pages: List<SyncAPI.Page>,
@@ -20,8 +18,7 @@ class ViewpagerAdapter(
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return PageViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.library_viewpager_page, parent, false)
+            LibraryViewpagerPageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         )
     }
 
@@ -34,6 +31,7 @@ class ViewpagerAdapter(
     }
 
     private val unbound = mutableSetOf<Int>()
+
     /**
      * Used to mark all pages for re-binding and forces all items to be refreshed
      * Without this the pages will still use the same adapters
@@ -43,44 +41,46 @@ class ViewpagerAdapter(
         this.notifyItemRangeChanged(0, pages.size)
     }
 
-    inner class PageViewHolder(private val itemViewTest: View) :
-        RecyclerView.ViewHolder(itemViewTest) {
+    inner class PageViewHolder(private val binding: LibraryViewpagerPageBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         fun bind(page: SyncAPI.Page, rebind: Boolean) {
-            itemView.page_recyclerview?.spanCount =
-                this@PageViewHolder.itemView.context.getSpanCount() ?: 3
-
-            if (itemViewTest.page_recyclerview?.adapter == null || rebind) {
-                // Only add the items after it has been attached since the items rely on ItemWidth
-                // Which is only determined after the recyclerview is attached.
-                // If this fails then item height becomes 0 when there is only one item
-                itemViewTest.page_recyclerview?.doOnAttach {
-                    itemViewTest.page_recyclerview?.adapter = PageAdapter(
-                        page.items.toMutableList(),
-                        itemViewTest.page_recyclerview,
-                        clickCallback
-                    )
+            binding.pageRecyclerview.apply {
+                spanCount =
+                    this@PageViewHolder.itemView.context.getSpanCount() ?: 3
+                if (adapter == null || rebind) {
+                    // Only add the items after it has been attached since the items rely on ItemWidth
+                    // Which is only determined after the recyclerview is attached.
+                    // If this fails then item height becomes 0 when there is only one item
+                    doOnAttach {
+                        adapter = PageAdapter(
+                            page.items.toMutableList(),
+                            this,
+                            clickCallback
+                        )
+                    }
+                } else {
+                    (adapter as? PageAdapter)?.updateList(page.items)
+                    scrollToPosition(0)
                 }
-            } else {
-                (itemViewTest.page_recyclerview?.adapter as? PageAdapter)?.updateList(page.items)
-                itemViewTest.page_recyclerview?.scrollToPosition(0)
-            }
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                itemViewTest.page_recyclerview.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
-                    val diff = scrollY - oldScrollY
-                    if (diff == 0) return@setOnScrollChangeListener
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                        val diff = scrollY - oldScrollY
+                        if (diff == 0) return@setOnScrollChangeListener
 
-                    scrollCallback.invoke(diff > 0)
-                }
-            } else {
-                itemViewTest.page_recyclerview.onFlingListener = object : OnFlingListener() {
-                    override fun onFling(velocityX: Int, velocityY: Int): Boolean {
-                        scrollCallback.invoke(velocityY > 0)
-                        return false
+                        scrollCallback.invoke(diff > 0)
+                    }
+                } else {
+                    onFlingListener = object : OnFlingListener() {
+                        override fun onFling(velocityX: Int, velocityY: Int): Boolean {
+                            scrollCallback.invoke(velocityY > 0)
+                            return false
+                        }
                     }
                 }
             }
 
+
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index 27b37be8..706d7631 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
@@ -11,6 +11,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
@@ -41,8 +44,6 @@ import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.fragment_player.*
-import kotlinx.android.synthetic.main.player_custom_layout.*
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
     Fit(R.string.resize_fit),
@@ -71,9 +72,15 @@ abstract class AbstractPlayerFragment(
     var isBuffering = true
     protected open var hasPipModeSupport = true
 
+    var playerPausePlayHolderHolder : FrameLayout? = null
+    var playerPausePlay : ImageView? = null
+    var playerBuffering : ProgressBar? = null
+    var playerView : PlayerView? = null
+    var piphide : FrameLayout? = null
+    var subtitleHolder : FrameLayout? = null
 
     @LayoutRes
-    protected var layout: Int = R.layout.fragment_player
+    protected open var layout: Int = R.layout.fragment_player
 
     open fun nextEpisode() {
         throw NotImplementedError()
@@ -132,15 +139,15 @@ abstract class AbstractPlayerFragment(
 
         isBuffering = CSPlayerLoading.IsBuffering == isPlaying
         if (isBuffering) {
-            player_pause_play_holder_holder?.isVisible = false
-            player_buffering?.isVisible = true
+            playerPausePlayHolderHolder?.isVisible = false
+            playerBuffering?.isVisible = true
         } else {
-            player_pause_play_holder_holder?.isVisible = true
-            player_buffering?.isVisible = false
+            playerPausePlayHolderHolder?.isVisible = true
+            playerBuffering?.isVisible = false
 
             if (wasPlaying != isPlaying) {
-                player_pause_play?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
-                val drawable = player_pause_play?.drawable
+                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
+                val drawable = playerPausePlay?.drawable
 
                 var startedAnimation = false
                 if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
@@ -162,10 +169,10 @@ abstract class AbstractPlayerFragment(
 
                 // somehow the phone is wacked
                 if (!startedAnimation) {
-                    player_pause_play?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
+                    playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
                 }
             } else {
-                player_pause_play?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
+                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
             }
         }
 
@@ -244,14 +251,12 @@ abstract class AbstractPlayerFragment(
         fun showToast(message: String, gotoNext: Boolean = false) {
             if (gotoNext && hasNextMirror()) {
                 showToast(
-                    activity,
                     message,
                     Toast.LENGTH_SHORT
                 )
                 nextMirror()
             } else {
                 showToast(
-                    activity,
                     context?.getString(R.string.no_links_found_toast) + "\n" + message,
                     Toast.LENGTH_LONG
                 )
@@ -327,9 +332,9 @@ abstract class AbstractPlayerFragment(
             }
 
             // Necessary for multiple combined videos
-            player_view?.setShowMultiWindowTimeBar(true)
-            player_view?.player = player
-            player_view?.performClick()
+            playerView?.setShowMultiWindowTimeBar(true)
+            playerView?.player = player
+            playerView?.performClick()
         }
     }
 
@@ -386,9 +391,9 @@ abstract class AbstractPlayerFragment(
         )
 
         if (player is CS3IPlayer) {
-            subView = player_view?.findViewById(R.id.exo_subtitles)
+            subView = playerView?.findViewById(R.id.exo_subtitles)
             subStyle = SubtitlesFragment.getCurrentSavedStyle()
-            player.initSubtitles(subView, subtitle_holder, subStyle)
+            player.initSubtitles(subView, subtitleHolder, subStyle)
 
             SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged
 
@@ -457,10 +462,10 @@ abstract class AbstractPlayerFragment(
             PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
             PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
         }
-        player_view?.resizeMode = type
+        playerView?.resizeMode = type
 
         if (showToast)
-            showToast(activity, resize.nameRes, Toast.LENGTH_SHORT)
+            showToast(resize.nameRes, Toast.LENGTH_SHORT)
     }
 
     override fun onStop() {
@@ -481,6 +486,13 @@ abstract class AbstractPlayerFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(layout, container, false)
+        val root = inflater.inflate(layout, container, false)
+        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
+        playerPausePlay = root.findViewById(R.id.player_pause_play)
+        playerBuffering = root.findViewById(R.id.player_buffering)
+        playerView = root.findViewById(R.id.player_view)
+        piphide = root.findViewById(R.id.piphide)
+        subtitleHolder = root.findViewById(R.id.subtitle_holder)
+        return root
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 0e8e5e6e..70e12a47 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
@@ -63,7 +63,15 @@ import javax.net.ssl.SSLSession
 const val TAG = "CS3ExoPlayer"
 const val PREFERRED_AUDIO_LANGUAGE_KEY = "preferred_audio_language"
 
-/** Cache */
+/** toleranceBeforeUs – The maximum time that the actual position seeked to may precede the
+ * requested seek position, in microseconds. Must be non-negative. */
+const val toleranceBeforeUs = 300_000L
+
+/**
+ * toleranceAfterUs – The maximum time that the actual position seeked to may exceed the requested
+ * seek position, in microseconds. Must be non-negative.
+ */
+const val toleranceAfterUs = 300_000L
 
 class CS3IPlayer : IPlayer {
     private var isPlaying = false
@@ -721,7 +729,7 @@ class CS3IPlayer : IPlayer {
                         )
                     )
                     // Allows any seeking to be +- 0.3s to allow for faster seeking
-                    .setSeekParameters(SeekParameters(300_000, 300_000))
+                    .setSeekParameters(SeekParameters(toleranceBeforeUs, toleranceAfterUs))
                     .setLoadControl(
                         DefaultLoadControl.Builder()
                             .setTargetBufferBytes(
@@ -788,7 +796,7 @@ class CS3IPlayer : IPlayer {
     private fun getCurrentTimestamp(writePosition: Long? = null): EpisodeSkip.SkipStamp? {
         val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
         for (lastTimeStamp in lastTimeStamps) {
-            if (lastTimeStamp.startMs <= position && position < lastTimeStamp.endMs) {
+            if (lastTimeStamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.endMs) {
                 return lastTimeStamp
             }
         }
@@ -796,11 +804,12 @@ class CS3IPlayer : IPlayer {
     }
 
     fun updatedTime(writePosition: Long? = null) {
-        getCurrentTimestamp(writePosition)?.let { timestamp ->
+        val position = writePosition ?: exoPlayer?.currentPosition
+
+        getCurrentTimestamp(position)?.let { timestamp ->
             onTimestampInvoked?.invoke(timestamp)
         }
 
-        val position = writePosition ?: exoPlayer?.currentPosition
         val duration = exoPlayer?.contentDuration
         if (duration != null && position != null) {
             playerPositionChanged?.invoke(Pair(position, duration))
@@ -1086,9 +1095,9 @@ class CS3IPlayer : IPlayer {
                 }
 
                 override fun onRenderedFirstFrame() {
-                    updatedTime()
                     super.onRenderedFirstFrame()
                     onRenderFirst()
+                    updatedTime()
                 }
             })
         } catch (e: Exception) {
@@ -1116,42 +1125,43 @@ class CS3IPlayer : IPlayer {
     }
 
     fun onRenderFirst() {
-        if (!hasUsedFirstRender) { // this insures that we only call this once per player load
-            Log.i(TAG, "Rendered first frame")
-            val invalid = exoPlayer?.duration?.let { duration ->
-                // Only errors short playback when not playing downloaded files
-                duration < 20_000L && currentDownloadedFile == null
-                        // Concatenated sources (non 1 periodCount) bypasses the invalid check as exoPlayer.duration gives only the current period
-                        // If you can get the total time that'd be better, but this is already niche.
-                        && exoPlayer?.currentTimeline?.periodCount == 1
-                        && exoPlayer?.isCurrentMediaItemLive != true
-            } ?: false
+        if (hasUsedFirstRender) { // this insures that we only call this once per player load
+            return
+        }
+        Log.i(TAG, "Rendered first frame")
+        hasUsedFirstRender = true
+        val invalid = exoPlayer?.duration?.let { duration ->
+            // Only errors short playback when not playing downloaded files
+            duration < 20_000L && currentDownloadedFile == null
+                    // Concatenated sources (non 1 periodCount) bypasses the invalid check as exoPlayer.duration gives only the current period
+                    // If you can get the total time that'd be better, but this is already niche.
+                    && exoPlayer?.currentTimeline?.periodCount == 1
+                    && exoPlayer?.isCurrentMediaItemLive != true
+        } ?: false
 
-            if (invalid) {
-                releasePlayer(saveTime = false)
-                playerError?.invoke(InvalidFileException("Too short playback"))
-                return
-            }
+        if (invalid) {
+            releasePlayer(saveTime = false)
+            playerError?.invoke(InvalidFileException("Too short playback"))
+            return
+        }
 
-            setPreferredSubtitles(currentSubtitles)
-            hasUsedFirstRender = true
-            val format = exoPlayer?.videoFormat
-            val width = format?.width
-            val height = format?.height
-            if (height != null && width != null) {
-                playerDimensionsLoaded?.invoke(Pair(width, height))
-                updatedTime()
-                exoPlayer?.apply {
-                    requestedListeningPercentages?.forEach { percentage ->
-                        createMessage { _, _ ->
-                            updatedTime()
-                        }
-                            .setLooper(Looper.getMainLooper())
-                            .setPosition( /* positionMs= */contentDuration * percentage / 100)
-                            //   .setPayload(customPayloadData)
-                            .setDeleteAfterDelivery(false)
-                            .send()
+        setPreferredSubtitles(currentSubtitles)
+        val format = exoPlayer?.videoFormat
+        val width = format?.width
+        val height = format?.height
+        if (height != null && width != null) {
+            playerDimensionsLoaded?.invoke(Pair(width, height))
+            updatedTime()
+            exoPlayer?.apply {
+                requestedListeningPercentages?.forEach { percentage ->
+                    createMessage { _, _ ->
+                        updatedTime()
                     }
+                        .setLooper(Looper.getMainLooper())
+                        .setPosition(contentDuration * percentage / 100)
+                        //   .setPayload(customPayloadData)
+                        .setDeleteAfterDelivery(false)
+                        .send()
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 9ff1c52d..9b72f6c9 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
@@ -14,16 +14,15 @@ import android.provider.Settings
 import android.text.Editable
 import android.util.DisplayMetrics
 import android.view.KeyEvent
+import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
@@ -37,10 +36,13 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
 import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
+import com.lagradost.cloudstream3.databinding.SubtitleOffsetBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer.Companion.subsProvidersIsActive
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
-import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.ui.result.setText
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
@@ -52,29 +54,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.Vector2
-import kotlinx.android.synthetic.main.player_custom_layout.*
-import kotlinx.android.synthetic.main.player_custom_layout.bottom_player_bar
-import kotlinx.android.synthetic.main.player_custom_layout.exo_ffwd
-import kotlinx.android.synthetic.main.player_custom_layout.exo_ffwd_text
-import kotlinx.android.synthetic.main.player_custom_layout.exo_progress
-import kotlinx.android.synthetic.main.player_custom_layout.exo_rew
-import kotlinx.android.synthetic.main.player_custom_layout.exo_rew_text
-import kotlinx.android.synthetic.main.player_custom_layout.player_center_menu
-import kotlinx.android.synthetic.main.player_custom_layout.player_ffwd_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_pause_play
-import kotlinx.android.synthetic.main.player_custom_layout.player_pause_play_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_left
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_left_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_left_icon
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_right
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_right_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_right_icon
-import kotlinx.android.synthetic.main.player_custom_layout.player_rew_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_time_text
-import kotlinx.android.synthetic.main.player_custom_layout.player_video_bar
-import kotlinx.android.synthetic.main.player_custom_layout.shadow_overlay
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
 import kotlin.math.*
 
 const val MINIMUM_SEEK_TIME = 7000L         // when swipe seeking
@@ -93,16 +72,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected open var isFullScreenPlayer = true
     protected open var isTv = false
 
+    protected var playerBinding: PlayerCustomLayoutBinding? = null
+
+
     // state of player UI
     protected var isShowing = false
     protected var isLocked = false
 
-    //private var episodes: List<Any> = listOf()
-    protected fun setEpisodes(ep: List<Any>) {
-        //hasEpisodes = ep.size > 1 // if has 2 episodes or more because you dont want to switch to your current episode
-        //(player_episode_list?.adapter as? PlayerEpisodeAdapter?)?.updateList(ep)
-    }
-
     protected var hasEpisodes = false
         private set
     //protected val hasEpisodes
@@ -116,7 +92,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
      * This will be set in runtime based on settings.
      **/
     protected var currentQualityProfile = 1
-//    protected var currentPrefQuality =
+
+    //    protected var currentPrefQuality =
 //        Qualities.P2160.value // preferred maximum quality, used for ppl w bad internet or on cell
     protected var fastForwardTime = 10000L
     protected var androidTVInterfaceOffSeekTime = 10000L;
@@ -184,6 +161,21 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         R.drawable.ic_baseline_volume_up_24,
     )
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        playerBinding = PlayerCustomLayoutBinding.bind(root.findViewById(R.id.player_holder))
+        return root
+    }
+
+    override fun onDestroyView() {
+        playerBinding = null
+        super.onDestroyView()
+    }
+
     open fun showMirrorsDialogue() {
         throw NotImplementedError()
     }
@@ -216,24 +208,24 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         if (isShowing) {
             updateUIVisibility()
         } else {
-            player_holder?.postDelayed({ updateUIVisibility() }, 200)
+            playerBinding?.playerHolder?.postDelayed({ updateUIVisibility() }, 200)
         }
 
         val titleMove = if (isShowing) 0f else -50.toPx.toFloat()
-        player_video_title?.let {
+        playerBinding?.playerVideoTitle?.let {
             ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
                 duration = 200
                 start()
             }
         }
-        player_video_title_rez?.let {
+        playerBinding?.playerVideoTitleRez?.let {
             ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
                 duration = 200
                 start()
             }
         }
         val playerBarMove = if (isShowing) 0f else 50.toPx.toFloat()
-        bottom_player_bar?.let {
+        playerBinding?.bottomPlayerBar?.let {
             ObjectAnimator.ofFloat(it, "translationY", playerBarMove).apply {
                 duration = 200
                 start()
@@ -249,7 +241,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val sView = subView
         val sStyle = subStyle
         if (sView != null && sStyle != null) {
-            val move = if (isShowing) -((bottom_player_bar?.height?.toFloat()
+            val move = if (isShowing) -((playerBinding?.bottomPlayerBar?.height?.toFloat()
                 ?: 0f) + 40.toPx) else -sStyle.elevation.toPx.toFloat()
             ObjectAnimator.ofFloat(sView, "translationY", move).apply {
                 duration = 200
@@ -258,42 +250,46 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val playerSourceMove = if (isShowing) 0f else -50.toPx.toFloat()
-        player_open_source?.let {
-            ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply {
-                duration = 200
-                start()
+
+
+        playerBinding?.apply {
+            playerOpenSource.let {
+                ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply {
+                    duration = 200
+                    start()
+                }
             }
+
+            if (!isLocked) {
+                playerFfwdHolder.alpha = 1f
+                playerRewHolder.alpha = 1f
+                // player_pause_play_holder?.alpha = 1f
+                shadowOverlay.isVisible = true
+                shadowOverlay.startAnimation(fadeAnimation)
+                playerFfwdHolder.startAnimation(fadeAnimation)
+                playerRewHolder.startAnimation(fadeAnimation)
+                playerPausePlay.startAnimation(fadeAnimation)
+
+                /*if (isBuffering) {
+                        player_pause_play?.isVisible = false
+                        player_pause_play_holder?.isVisible = false
+                    } else {
+                        player_pause_play?.isVisible = true
+                        player_pause_play_holder?.startAnimation(fadeAnimation)
+                        player_pause_play?.startAnimation(fadeAnimation)
+                    }*/
+                //player_buffering?.startAnimation(fadeAnimation)
+            }
+
+            bottomPlayerBar.startAnimation(fadeAnimation)
+            playerOpenSource.startAnimation(fadeAnimation)
+            playerTopHolder.startAnimation(fadeAnimation)
         }
-
-
-        if (!isLocked) {
-            player_ffwd_holder?.alpha = 1f
-            player_rew_holder?.alpha = 1f
-            // player_pause_play_holder?.alpha = 1f
-            shadow_overlay?.isVisible = true
-            shadow_overlay?.startAnimation(fadeAnimation)
-            player_ffwd_holder?.startAnimation(fadeAnimation)
-            player_rew_holder?.startAnimation(fadeAnimation)
-            player_pause_play?.startAnimation(fadeAnimation)
-
-            /*if (isBuffering) {
-                    player_pause_play?.isVisible = false
-                    player_pause_play_holder?.isVisible = false
-                } else {
-                    player_pause_play?.isVisible = true
-                    player_pause_play_holder?.startAnimation(fadeAnimation)
-                    player_pause_play?.startAnimation(fadeAnimation)
-                }*/
-            //player_buffering?.startAnimation(fadeAnimation)
-        }
-
-        bottom_player_bar?.startAnimation(fadeAnimation)
-        player_open_source?.startAnimation(fadeAnimation)
-        player_top_holder?.startAnimation(fadeAnimation)
     }
 
     override fun subtitlesChanged() {
-        player_subtitle_offset_btt?.isGone = player.getCurrentPreferredSubtitle() == null
+        playerBinding?.playerSubtitleOffsetBtt?.isGone =
+            player.getCurrentPreferredSubtitle() == null
     }
 
     protected fun enterFullscreen() {
@@ -339,7 +335,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun setPlayBackSpeed(speed: Float) {
         try {
             setKey(PLAYBACK_SPEED_KEY, speed)
-            player_speed_btt?.text =
+            playerBinding?.playerSpeedBtt?.text =
                 getString(R.string.player_speed_text_format).format(speed)
                     .replace(".0x", "x")
         } catch (e: Exception) {
@@ -355,67 +351,68 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     private fun showSubtitleOffsetDialog() {
-        context?.let { ctx ->
-            val builder =
-                AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                    .setView(R.layout.subtitle_offset)
-            val dialog = builder.create()
-            dialog.show()
+        val ctx = context ?: return
 
-            val beforeOffset = subtitleDelay
+        val binding = SubtitleOffsetBinding.inflate(LayoutInflater.from(ctx), null, false)
 
-            val applyButton = dialog.findViewById<TextView>(R.id.apply_btt)!!
-            val cancelButton = dialog.findViewById<TextView>(R.id.cancel_btt)!!
-            val input = dialog.findViewById<EditText>(R.id.subtitle_offset_input)!!
-            val sub = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract)!!
-            val subMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract_more)!!
-            val add = dialog.findViewById<ImageView>(R.id.subtitle_offset_add)!!
-            val addMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_add_more)!!
-            val subTitle = dialog.findViewById<TextView>(R.id.subtitle_offset_sub_title)!!
+        val builder =
+            AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                .setView(binding.root)
+        val dialog = builder.create()
+        dialog.show()
 
-            input.doOnTextChanged { text, _, _, _ ->
-                text?.toString()?.toLongOrNull()?.let {
-                    subtitleDelay = it
-                    when {
-                        it > 0L -> {
-                            context?.getString(R.string.subtitle_offset_extra_hint_later_format)
-                                ?.format(it)
+        val beforeOffset = subtitleDelay
+
+        /*val applyButton = dialog.findViewById<TextView>(R.id.apply_btt)!!
+        val cancelButton = dialog.findViewById<TextView>(R.id.cancel_btt)!!
+        val input = dialog.findViewById<EditText>(R.id.subtitle_offset_input)!!
+        val sub = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract)!!
+        val subMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract_more)!!
+        val add = dialog.findViewById<ImageView>(R.id.subtitle_offset_add)!!
+        val addMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_add_more)!!
+        val subTitle = dialog.findViewById<TextView>(R.id.subtitle_offset_sub_title)!!*/
+        binding.apply {
+            subtitleOffsetInput.doOnTextChanged { text, _, _, _ ->
+                text?.toString()?.toLongOrNull()?.let { time ->
+                    subtitleDelay = time
+                    val str = when {
+                        time > 0L -> {
+                            txt(R.string.subtitle_offset_extra_hint_later_format, time)
                         }
-                        it < 0L -> {
-                            context?.getString(R.string.subtitle_offset_extra_hint_before_format)
-                                ?.format(-it)
-                        }
-                        it == 0L -> {
-                            context?.getString(R.string.subtitle_offset_extra_hint_none_format)
+
+                        time < 0L -> {
+                            txt(R.string.subtitle_offset_extra_hint_before_format, -time)
                         }
+
                         else -> {
-                            null
+                            txt(R.string.subtitle_offset_extra_hint_none_format)
                         }
-                    }?.let { str ->
-                        subTitle.text = str
                     }
+                    subtitleOffsetSubTitle.setText(str)
                 }
             }
-            input.text = Editable.Factory.getInstance()?.newEditable(beforeOffset.toString())
+            subtitleOffsetInput.text =
+                Editable.Factory.getInstance()?.newEditable(beforeOffset.toString())
 
             val buttonChange = 100L
             val buttonChangeMore = 1000L
 
             fun changeBy(by: Long) {
-                val current = (input.text?.toString()?.toLongOrNull() ?: 0) + by
-                input.text = Editable.Factory.getInstance()?.newEditable(current.toString())
+                val current = (subtitleOffsetInput.text?.toString()?.toLongOrNull() ?: 0) + by
+                subtitleOffsetInput.text =
+                    Editable.Factory.getInstance()?.newEditable(current.toString())
             }
 
-            add.setOnClickListener {
+            subtitleOffsetAdd.setOnClickListener {
                 changeBy(buttonChange)
             }
-            addMore.setOnClickListener {
+            subtitleOffsetAddMore.setOnClickListener {
                 changeBy(buttonChangeMore)
             }
-            sub.setOnClickListener {
+            subtitleOffsetSubtract.setOnClickListener {
                 changeBy(-buttonChange)
             }
-            subMore.setOnClickListener {
+            subtitleOffsetSubtractMore.setOnClickListener {
                 changeBy(-buttonChangeMore)
             }
 
@@ -423,17 +420,18 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 if (isFullScreenPlayer)
                     activity?.hideSystemUI()
             }
-            applyButton.setOnClickListener {
+            applyBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
                 player.seekTime(1L)
             }
-            cancelButton.setOnClickListener {
+            cancelBtt.setOnClickListener {
                 subtitleDelay = beforeOffset
                 dialog.dismissSafe(activity)
             }
         }
     }
 
+
     private fun showSpeedDialog() {
         val speedsText =
             listOf(
@@ -470,39 +468,42 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     fun resetRewindText() {
-        exo_rew_text?.text =
+        playerBinding?.exoRewText?.text =
             getString(R.string.rew_text_regular_format).format(fastForwardTime / 1000)
     }
 
     fun resetFastForwardText() {
-        exo_ffwd_text?.text =
+        playerBinding?.exoFfwdText?.text =
             getString(R.string.ffw_text_regular_format).format(fastForwardTime / 1000)
     }
 
     private fun rewind() {
         try {
-            player_center_menu?.isGone = false
-            player_rew_holder?.alpha = 1f
+            playerBinding?.apply {
+                playerCenterMenu.isGone = false
+                playerRewHolder.alpha = 1f
 
-            val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
-            exo_rew?.startAnimation(rotateLeft)
+                val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
+                exoRew.startAnimation(rotateLeft)
 
-            val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
-            goLeft.setAnimationListener(object : Animation.AnimationListener {
-                override fun onAnimationStart(animation: Animation?) {}
+                val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
+                goLeft.setAnimationListener(object : Animation.AnimationListener {
+                    override fun onAnimationStart(animation: Animation?) {}
 
-                override fun onAnimationRepeat(animation: Animation?) {}
+                    override fun onAnimationRepeat(animation: Animation?) {}
 
-                override fun onAnimationEnd(animation: Animation?) {
-                    exo_rew_text?.post {
-                        resetRewindText()
-                        player_center_menu?.isGone = !isShowing
-                        player_rew_holder?.alpha = if (isShowing) 1f else 0f
+                    override fun onAnimationEnd(animation: Animation?) {
+                        exoRewText.post {
+                            resetRewindText()
+                            playerCenterMenu.isGone = !isShowing
+                            playerRewHolder.alpha = if (isShowing) 1f else 0f
+                        }
                     }
-                }
-            })
-            exo_rew_text?.startAnimation(goLeft)
-            exo_rew_text?.text = getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+                })
+                exoRewText.startAnimation(goLeft)
+                exoRewText.text =
+                    getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+            }
             player.seekTime(-fastForwardTime)
         } catch (e: Exception) {
             logError(e)
@@ -511,28 +512,31 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private fun fastForward() {
         try {
-            player_center_menu?.isGone = false
-            player_ffwd_holder?.alpha = 1f
+            playerBinding?.apply {
+                playerCenterMenu.isGone = false
+                playerFfwdHolder.alpha = 1f
 
-            val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
-            exo_ffwd?.startAnimation(rotateRight)
+                val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
+                exoFfwd.startAnimation(rotateRight)
 
-            val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
-            goRight.setAnimationListener(object : Animation.AnimationListener {
-                override fun onAnimationStart(animation: Animation?) {}
+                val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
+                goRight.setAnimationListener(object : Animation.AnimationListener {
+                    override fun onAnimationStart(animation: Animation?) {}
 
-                override fun onAnimationRepeat(animation: Animation?) {}
+                    override fun onAnimationRepeat(animation: Animation?) {}
 
-                override fun onAnimationEnd(animation: Animation?) {
-                    exo_ffwd_text?.post {
-                        resetFastForwardText()
-                        player_center_menu?.isGone = !isShowing
-                        player_ffwd_holder?.alpha = if (isShowing) 1f else 0f
+                    override fun onAnimationEnd(animation: Animation?) {
+                        exoFfwdText.post {
+                            resetFastForwardText()
+                            playerCenterMenu.isGone = !isShowing
+                            playerFfwdHolder.alpha = if (isShowing) 1f else 0f
+                        }
                     }
-                }
-            })
-            exo_ffwd_text?.startAnimation(goRight)
-            exo_ffwd_text?.text = getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+                })
+                exoFfwdText.startAnimation(goRight)
+                exoFfwdText.text =
+                    getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+            }
             player.seekTime(fastForwardTime)
         } catch (e: Exception) {
             logError(e)
@@ -542,13 +546,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun onClickChange() {
         isShowing = !isShowing
         if (isShowing) {
-            player_intro_play?.isGone = true
+            playerBinding?.playerIntroPlay?.isGone = true
             autoHide()
         }
         if (isFullScreenPlayer)
             activity?.hideSystemUI()
         animateLayoutChanges()
-        player_pause_play?.requestFocus()
+        playerBinding?.playerPausePlay?.requestFocus()
     }
 
     private fun toggleLock() {
@@ -558,7 +562,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
         isLocked = !isLocked
         if (isLocked && isShowing) {
-            player_holder?.postDelayed({
+            playerBinding?.playerHolder?.postDelayed({
                 if (isLocked && isShowing) {
                     onClickChange()
                 }
@@ -566,36 +570,36 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val fadeTo = if (isLocked) 0f else 1f
+        playerBinding?.apply {
+            val fadeAnimation = AlphaAnimation(playerVideoTitle.alpha, fadeTo).apply {
+                duration = 100
+                fillAfter = true
+            }
 
-        val fadeAnimation = AlphaAnimation(player_video_title.alpha, fadeTo).apply {
-            duration = 100
-            fillAfter = true
+            updateUIVisibility()
+            // MENUS
+            //centerMenu.startAnimation(fadeAnimation)
+            playerPausePlay.startAnimation(fadeAnimation)
+            playerFfwdHolder.startAnimation(fadeAnimation)
+            playerRewHolder.startAnimation(fadeAnimation)
+
+            //if (hasEpisodes)
+            //    player_episodes_button?.startAnimation(fadeAnimation)
+            //player_media_route_button?.startAnimation(fadeAnimation)
+            //video_bar.startAnimation(fadeAnimation)
+
+            //TITLE
+            playerVideoTitleRez.startAnimation(fadeAnimation)
+            playerEpisodeFiller.startAnimation(fadeAnimation)
+            playerVideoTitle.startAnimation(fadeAnimation)
+            playerTopHolder.startAnimation(fadeAnimation)
+            // BOTTOM
+            playerLockHolder.startAnimation(fadeAnimation)
+            //player_go_back_holder?.startAnimation(fadeAnimation)
+
+            shadowOverlay.isVisible = true
+            shadowOverlay.startAnimation(fadeAnimation)
         }
-
-        updateUIVisibility()
-        // MENUS
-        //centerMenu.startAnimation(fadeAnimation)
-        player_pause_play?.startAnimation(fadeAnimation)
-        player_ffwd_holder?.startAnimation(fadeAnimation)
-        player_rew_holder?.startAnimation(fadeAnimation)
-
-        //if (hasEpisodes)
-        //    player_episodes_button?.startAnimation(fadeAnimation)
-        //player_media_route_button?.startAnimation(fadeAnimation)
-        //video_bar.startAnimation(fadeAnimation)
-
-        //TITLE
-        player_video_title_rez?.startAnimation(fadeAnimation)
-        player_episode_filler?.startAnimation(fadeAnimation)
-        player_video_title?.startAnimation(fadeAnimation)
-        player_top_holder?.startAnimation(fadeAnimation)
-        // BOTTOM
-        player_lock_holder?.startAnimation(fadeAnimation)
-        //player_go_back_holder?.startAnimation(fadeAnimation)
-
-        shadow_overlay?.isVisible = true
-        shadow_overlay?.startAnimation(fadeAnimation)
-
         updateLockUI()
     }
 
@@ -609,34 +613,39 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 togglePlayerTitleGone = true
             }
         }
-        player_lock_holder?.isGone = isGone
-        player_video_bar?.isGone = isGone
-        player_pause_play_holder?.isGone = isGone
-        player_pause_play?.isGone = isGone
-        //player_buffering?.isGone = isGone
-        player_top_holder?.isGone = isGone
-        //player_episodes_button?.isVisible = !isGone && hasEpisodes
-        player_video_title?.isGone = togglePlayerTitleGone
+        playerBinding?.apply {
+
+            playerLockHolder.isGone = isGone
+            playerVideoBar.isGone = isGone
+
+            playerPausePlay.isGone = isGone
+            //player_buffering?.isGone = isGone
+            playerTopHolder.isGone = isGone
+            //player_episodes_button?.isVisible = !isGone && hasEpisodes
+            playerVideoTitle.isGone = togglePlayerTitleGone
 //        player_video_title_rez?.isGone = isGone
-        player_episode_filler?.isGone = isGone
-        player_center_menu?.isGone = isGone
-        player_lock?.isGone = !isShowing
-        //player_media_route_button?.isClickable = !isGone
-        player_go_back_holder?.isGone = isGone
-        player_sources_btt?.isGone = isGone
-        player_skip_episode?.isClickable = !isGone
+            playerEpisodeFiller.isGone = isGone
+            playerCenterMenu.isGone = isGone
+            playerLock.isGone = !isShowing
+            //player_media_route_button?.isClickable = !isGone
+            playerGoBackHolder.isGone = isGone
+            playerSourcesBtt.isGone = isGone
+            playerSkipEpisode.isClickable = !isGone
+        }
     }
 
     private fun updateLockUI() {
-        player_lock?.setIconResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
-        if (layout == R.layout.fragment_player) {
-            val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
-            else Color.WHITE
-            if (color != null) {
-                player_lock?.setTextColor(color)
-                player_lock?.iconTint = ColorStateList.valueOf(color)
-                player_lock?.rippleColor =
-                    ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
+        playerBinding?.apply {
+            playerLock.setIconResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
+            if (layout == R.layout.fragment_player) {
+                val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
+                else Color.WHITE
+                if (color != null) {
+                    playerLock.setTextColor(color)
+                    playerLock.iconTint = ColorStateList.valueOf(color)
+                    playerLock.rippleColor =
+                        ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
+                }
             }
         }
     }
@@ -645,7 +654,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected fun autoHide() {
         currentTapIndex++
         val index = currentTapIndex
-        player_holder?.postDelayed({
+        playerBinding?.playerHolder?.postDelayed({
             if (!isCurrentTouchValid && isShowing && index == currentTapIndex && player.getIsPlaying()) {
                 onClickChange()
             }
@@ -657,7 +666,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun toggleShowDelayed() {
         if (doubleTapEnabled || doubleTapPauseEnabled) {
             val index = currentDoubleTapIndex
-            player_holder?.postDelayed({
+            playerBinding?.playerHolder?.postDelayed({
                 if (index == currentDoubleTapIndex) {
                     onClickChange()
                 }
@@ -788,249 +797,267 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         if (event == null || view == null) return false
         val currentTouch = Vector2(event.x, event.y)
         val startTouch = currentTouchStart
-        player_intro_play?.isGone = true
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                // validates if the touch is inside of the player area
-                isCurrentTouchValid = isValidTouch(currentTouch.x, currentTouch.y)
-                /*if (isCurrentTouchValid && player_episode_list?.isVisible == true) {
-                    player_episode_list?.isVisible = false
-                } else*/ if (isCurrentTouchValid) {
-                    currentTouchStartTime = System.currentTimeMillis()
-                    currentTouchStart = currentTouch
-                    currentTouchLast = currentTouch
-                    currentTouchStartPlayerTime = player.getPosition()
 
-                    getBrightness()?.let {
-                        currentRequestedBrightness = it
-                    }
-                    (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
-                        val currentVolume =
-                            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-                        val maxVolume =
-                            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+        playerBinding?.apply {
+            playerIntroPlay.isGone = true
 
-                        currentRequestedVolume = currentVolume.toFloat() / maxVolume.toFloat()
-                    }
-                }
-            }
-            MotionEvent.ACTION_UP -> {
-                if (isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                    // seek time
-                    if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time) {
-                        val startTime = currentTouchStartPlayerTime
-                        if (startTime != null) {
-                            calculateNewTime(startTime, startTouch, currentTouch)?.let { seekTo ->
-                                if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
-                                    player.seekTo(seekTo)
-                                }
-                            }
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    // validates if the touch is inside of the player area
+                    isCurrentTouchValid = isValidTouch(currentTouch.x, currentTouch.y)
+                    /*if (isCurrentTouchValid && player_episode_list?.isVisible == true) {
+                        player_episode_list?.isVisible = false
+                    } else*/ if (isCurrentTouchValid) {
+                        currentTouchStartTime = System.currentTimeMillis()
+                        currentTouchStart = currentTouch
+                        currentTouchLast = currentTouch
+                        currentTouchStartPlayerTime = player.getPosition()
+
+                        getBrightness()?.let {
+                            currentRequestedBrightness = it
+                        }
+                        (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
+                            val currentVolume =
+                                audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                            val maxVolume =
+                                audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+
+                            currentRequestedVolume = currentVolume.toFloat() / maxVolume.toFloat()
                         }
                     }
                 }
 
-                // see if click is eligible for seek 10s
-                val holdTime = currentTouchStartTime?.minus(System.currentTimeMillis())
-                if (isCurrentTouchValid // is valid
-                    && currentTouchAction == null // no other action like swiping is taking place
-                    && currentLastTouchAction == null // last action was none, this prevents mis input random seek
-                    && holdTime != null
-                    && holdTime < DOUBLE_TAB_MAXIMUM_HOLD_TIME // it is a click not a long hold
-                ) {
-                    if (!isLocked
-                        && (System.currentTimeMillis() - currentLastTouchEndTime) < DOUBLE_TAB_MINIMUM_TIME_BETWEEN // the time since the last action is short
-                    ) {
-                        currentClickCount++
-
-                        if (currentClickCount >= 1) { // have double clicked
-                            currentDoubleTapIndex++
-                            if (doubleTapPauseEnabled && isFullScreenPlayer) { // you can pause if your tap is in the middle of the screen
-                                when {
-                                    currentTouch.x < screenWidth / 2 - (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
-                                        if (doubleTapEnabled)
-                                            rewind()
+                MotionEvent.ACTION_UP -> {
+                    if (isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
+                        // seek time
+                        if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time) {
+                            val startTime = currentTouchStartPlayerTime
+                            if (startTime != null) {
+                                calculateNewTime(
+                                    startTime,
+                                    startTouch,
+                                    currentTouch
+                                )?.let { seekTo ->
+                                    if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
+                                        player.seekTo(seekTo)
                                     }
-                                    currentTouch.x > screenWidth / 2 + (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
-                                        if (doubleTapEnabled)
-                                            fastForward()
-                                    }
-                                    else -> {
-                                        player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                                    }
-                                }
-                            } else if (doubleTapEnabled && isFullScreenPlayer) {
-                                if (currentTouch.x < screenWidth / 2) {
-                                    rewind()
-                                } else {
-                                    fastForward()
                                 }
                             }
                         }
+                    }
+
+                    // see if click is eligible for seek 10s
+                    val holdTime = currentTouchStartTime?.minus(System.currentTimeMillis())
+                    if (isCurrentTouchValid // is valid
+                        && currentTouchAction == null // no other action like swiping is taking place
+                        && currentLastTouchAction == null // last action was none, this prevents mis input random seek
+                        && holdTime != null
+                        && holdTime < DOUBLE_TAB_MAXIMUM_HOLD_TIME // it is a click not a long hold
+                    ) {
+                        if (!isLocked
+                            && (System.currentTimeMillis() - currentLastTouchEndTime) < DOUBLE_TAB_MINIMUM_TIME_BETWEEN // the time since the last action is short
+                        ) {
+                            currentClickCount++
+
+                            if (currentClickCount >= 1) { // have double clicked
+                                currentDoubleTapIndex++
+                                if (doubleTapPauseEnabled && isFullScreenPlayer) { // you can pause if your tap is in the middle of the screen
+                                    when {
+                                        currentTouch.x < screenWidth / 2 - (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
+                                            if (doubleTapEnabled)
+                                                rewind()
+                                        }
+
+                                        currentTouch.x > screenWidth / 2 + (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
+                                            if (doubleTapEnabled)
+                                                fastForward()
+                                        }
+
+                                        else -> {
+                                            player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+                                        }
+                                    }
+                                } else if (doubleTapEnabled && isFullScreenPlayer) {
+                                    if (currentTouch.x < screenWidth / 2) {
+                                        rewind()
+                                    } else {
+                                        fastForward()
+                                    }
+                                }
+                            }
+                        } else {
+                            // is a valid click but not fast enough for seek
+                            currentClickCount = 0
+                            toggleShowDelayed()
+                            //onClickChange()
+                        }
                     } else {
-                        // is a valid click but not fast enough for seek
                         currentClickCount = 0
-                        toggleShowDelayed()
-                        //onClickChange()
                     }
-                } else {
-                    currentClickCount = 0
+
+                    // call auto hide as it wont hide when you have your finger down
+                    autoHide()
+
+                    // reset variables
+                    isCurrentTouchValid = false
+                    currentTouchStart = null
+                    currentLastTouchAction = currentTouchAction
+                    currentTouchAction = null
+                    currentTouchStartPlayerTime = null
+                    currentTouchLast = null
+                    currentTouchStartTime = null
+
+                    // resets UI
+                    playerTimeText.isVisible = false
+                    playerProgressbarLeftHolder.isVisible = false
+                    playerProgressbarRightHolder.isVisible = false
+
+                    currentLastTouchEndTime = System.currentTimeMillis()
                 }
 
-                // call auto hide as it wont hide when you have your finger down
-                autoHide()
+                MotionEvent.ACTION_MOVE -> {
+                    // if current touch is valid
+                    if (startTouch != null && isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
+                        // action is unassigned and can therefore be assigned
+                        if (currentTouchAction == null) {
+                            val diffFromStart = startTouch - currentTouch
 
-                // reset variables
-                isCurrentTouchValid = false
-                currentTouchStart = null
-                currentLastTouchAction = currentTouchAction
-                currentTouchAction = null
-                currentTouchStartPlayerTime = null
-                currentTouchLast = null
-                currentTouchStartTime = null
+                            if (swipeVerticalEnabled) {
+                                if (abs(diffFromStart.y * 100 / screenHeight) > MINIMUM_VERTICAL_SWIPE) {
+                                    // left = Brightness, right = Volume, but the UI is reversed to show the UI better
+                                    currentTouchAction = if (startTouch.x < screenWidth / 2) {
+                                        // hide the UI if you hold brightness to show screen better, better UX
+                                        if (isShowing) {
+                                            isShowing = false
+                                            animateLayoutChanges()
+                                        }
 
-                // resets UI
-                player_time_text?.isVisible = false
-                player_progressbar_left_holder?.isVisible = false
-                player_progressbar_right_holder?.isVisible = false
-                currentLastTouchEndTime = System.currentTimeMillis()
-            }
-            MotionEvent.ACTION_MOVE -> {
-                // if current touch is valid
-                if (startTouch != null && isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                    // action is unassigned and can therefore be assigned
-                    if (currentTouchAction == null) {
-                        val diffFromStart = startTouch - currentTouch
-
-                        if (swipeVerticalEnabled) {
-                            if (abs(diffFromStart.y * 100 / screenHeight) > MINIMUM_VERTICAL_SWIPE) {
-                                // left = Brightness, right = Volume, but the UI is reversed to show the UI better
-                                currentTouchAction = if (startTouch.x < screenWidth / 2) {
-                                    // hide the UI if you hold brightness to show screen better, better UX
-                                    if (isShowing) {
-                                        isShowing = false
-                                        animateLayoutChanges()
-                                    }
-
-                                    TouchAction.Brightness
-                                } else {
-                                    TouchAction.Volume
-                                }
-                            }
-                        }
-                        if (swipeHorizontalEnabled) {
-                            if (abs(diffFromStart.x * 100 / screenHeight) > MINIMUM_HORIZONTAL_SWIPE) {
-                                currentTouchAction = TouchAction.Time
-                            }
-                        }
-                    }
-
-                    // display action
-                    val lastTouch = currentTouchLast
-                    if (lastTouch != null) {
-                        val diffFromLast = lastTouch - currentTouch
-                        val verticalAddition =
-                            diffFromLast.y * VERTICAL_MULTIPLIER / screenHeight.toFloat()
-
-                        // update UI
-                        player_time_text?.isVisible = false
-                        player_progressbar_left_holder?.isVisible = false
-                        player_progressbar_right_holder?.isVisible = false
-
-                        when (currentTouchAction) {
-                            TouchAction.Time -> {
-                                // this simply updates UI as the seek logic happens on release
-                                // startTime is rounded to make the UI sync in a nice way
-                                val startTime =
-                                    currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
-                                if (startTime != null) {
-                                    calculateNewTime(
-                                        startTime,
-                                        startTouch,
-                                        currentTouch
-                                    )?.let { newMs ->
-                                        val skipMs = newMs - startTime
-                                        player_time_text?.text =
-                                            "${convertTimeToString(newMs / 1000)} [${
-                                                (if (abs(skipMs) < 1000) "" else (if (skipMs > 0) "+" else "-"))
-                                            }${convertTimeToString(abs(skipMs / 1000))}]"
-                                        player_time_text?.isVisible = true
+                                        TouchAction.Brightness
+                                    } else {
+                                        TouchAction.Volume
                                     }
                                 }
                             }
-                            TouchAction.Brightness -> {
-                                player_progressbar_right_holder?.isVisible = true
-                                val lastRequested = currentRequestedBrightness
-                                currentRequestedBrightness =
-                                    min(
-                                        1.0f,
-                                        max(currentRequestedBrightness + verticalAddition, 0.0f)
-                                    )
-
-                                // this is to not spam request it, just in case it fucks over someone
-                                if (lastRequested != currentRequestedBrightness)
-                                    setBrightness(currentRequestedBrightness)
-
-                                // max is set high to make it smooth
-                                player_progressbar_right?.max = 100_000
-                                player_progressbar_right?.progress =
-                                    max(2_000, (currentRequestedBrightness * 100_000f).toInt())
-
-                                player_progressbar_right_icon?.setImageResource(
-                                    brightnessIcons[min( // clamp the value just in case
-                                        brightnessIcons.size - 1,
-                                        max(
-                                            0,
-                                            round(currentRequestedBrightness * (brightnessIcons.size - 1)).toInt()
-                                        )
-                                    )]
-                                )
+                            if (swipeHorizontalEnabled) {
+                                if (abs(diffFromStart.x * 100 / screenHeight) > MINIMUM_HORIZONTAL_SWIPE) {
+                                    currentTouchAction = TouchAction.Time
+                                }
                             }
-                            TouchAction.Volume -> {
-                                (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
-                                    player_progressbar_left_holder?.isVisible = true
-                                    val maxVolume =
-                                        audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-                                    val currentVolume =
-                                        audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                        }
 
-                                    // clamps volume and adds swipe
-                                    currentRequestedVolume =
+                        // display action
+                        val lastTouch = currentTouchLast
+                        if (lastTouch != null) {
+                            val diffFromLast = lastTouch - currentTouch
+                            val verticalAddition =
+                                diffFromLast.y * VERTICAL_MULTIPLIER / screenHeight.toFloat()
+
+                            // update UI
+                            playerTimeText.isVisible = false
+                            playerProgressbarLeftHolder.isVisible = false
+                            playerProgressbarRightHolder.isVisible = false
+
+                            when (currentTouchAction) {
+                                TouchAction.Time -> {
+                                    // this simply updates UI as the seek logic happens on release
+                                    // startTime is rounded to make the UI sync in a nice way
+                                    val startTime =
+                                        currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
+                                    if (startTime != null) {
+                                        calculateNewTime(
+                                            startTime,
+                                            startTouch,
+                                            currentTouch
+                                        )?.let { newMs ->
+                                            val skipMs = newMs - startTime
+                                            playerTimeText.apply {
+                                                text =
+                                                    "${convertTimeToString(newMs / 1000)} [${
+                                                        (if (abs(skipMs) < 1000) "" else (if (skipMs > 0) "+" else "-"))
+                                                    }${convertTimeToString(abs(skipMs / 1000))}]"
+                                                isVisible = true
+                                            }
+                                        }
+                                    }
+                                }
+
+                                TouchAction.Brightness -> {
+                                    playerProgressbarRightHolder.isVisible = true
+                                    val lastRequested = currentRequestedBrightness
+                                    currentRequestedBrightness =
                                         min(
                                             1.0f,
-                                            max(currentRequestedVolume + verticalAddition, 0.0f)
+                                            max(currentRequestedBrightness + verticalAddition, 0.0f)
                                         )
 
-                                    // max is set high to make it smooth
-                                    player_progressbar_left?.max = 100_000
-                                    player_progressbar_left?.progress =
-                                        max(2_000, (currentRequestedVolume * 100_000f).toInt())
+                                    // this is to not spam request it, just in case it fucks over someone
+                                    if (lastRequested != currentRequestedBrightness)
+                                        setBrightness(currentRequestedBrightness)
 
-                                    player_progressbar_left_icon?.setImageResource(
-                                        volumeIcons[min( // clamp the value just in case
-                                            volumeIcons.size - 1,
+                                    // max is set high to make it smooth
+                                    playerProgressbarRight.max = 100_000
+                                    playerProgressbarRight.progress =
+                                        max(2_000, (currentRequestedBrightness * 100_000f).toInt())
+
+                                    playerProgressbarRightIcon.setImageResource(
+                                        brightnessIcons[min( // clamp the value just in case
+                                            brightnessIcons.size - 1,
                                             max(
                                                 0,
-                                                round(currentRequestedVolume * (volumeIcons.size - 1)).toInt()
+                                                round(currentRequestedBrightness * (brightnessIcons.size - 1)).toInt()
                                             )
                                         )]
                                     )
+                                }
 
-                                    // this is used instead of set volume because old devices does not support it
-                                    val desiredVolume =
-                                        round(currentRequestedVolume * maxVolume).toInt()
-                                    if (desiredVolume != currentVolume) {
-                                        val newVolumeAdjusted =
-                                            if (desiredVolume < currentVolume) AudioManager.ADJUST_LOWER else AudioManager.ADJUST_RAISE
+                                TouchAction.Volume -> {
+                                    (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
+                                        playerProgressbarLeftHolder.isVisible = true
+                                        val maxVolume =
+                                            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+                                        val currentVolume =
+                                            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
 
-                                        audioManager.adjustStreamVolume(
-                                            AudioManager.STREAM_MUSIC,
-                                            newVolumeAdjusted,
-                                            0
+                                        // clamps volume and adds swipe
+                                        currentRequestedVolume =
+                                            min(
+                                                1.0f,
+                                                max(currentRequestedVolume + verticalAddition, 0.0f)
+                                            )
+
+                                        // max is set high to make it smooth
+                                        playerProgressbarLeft.max = 100_000
+                                        playerProgressbarLeft.progress =
+                                            max(2_000, (currentRequestedVolume * 100_000f).toInt())
+
+                                        playerProgressbarLeftIcon.setImageResource(
+                                            volumeIcons[min( // clamp the value just in case
+                                                volumeIcons.size - 1,
+                                                max(
+                                                    0,
+                                                    round(currentRequestedVolume * (volumeIcons.size - 1)).toInt()
+                                                )
+                                            )]
                                         )
+
+                                        // this is used instead of set volume because old devices does not support it
+                                        val desiredVolume =
+                                            round(currentRequestedVolume * maxVolume).toInt()
+                                        if (desiredVolume != currentVolume) {
+                                            val newVolumeAdjusted =
+                                                if (desiredVolume < currentVolume) AudioManager.ADJUST_LOWER else AudioManager.ADJUST_RAISE
+
+                                            audioManager.adjustStreamVolume(
+                                                AudioManager.STREAM_MUSIC,
+                                                newVolumeAdjusted,
+                                                0
+                                            )
+                                        }
                                     }
                                 }
+
+                                else -> Unit
                             }
-                            else -> Unit
                         }
                     }
                 }
@@ -1055,26 +1082,29 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                                     return true
                                 }
                             }
+
                             KeyEvent.KEYCODE_DPAD_UP -> {
                                 if (!isShowing) {
                                     onClickChange()
                                     return true
                                 }
                             }
+
                             KeyEvent.KEYCODE_DPAD_LEFT -> {
                                 if (!isShowing && !isLocked) {
                                     player.seekTime(-androidTVInterfaceOffSeekTime)
                                     return true
-                                } else if (player_pause_play?.isFocused == true) {
+                                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
                                     player.seekTime(-androidTVInterfaceOnSeekTime)
                                     return true
                                 }
                             }
+
                             KeyEvent.KEYCODE_DPAD_RIGHT -> {
                                 if (!isShowing && !isLocked) {
                                     player.seekTime(androidTVInterfaceOffSeekTime)
                                     return true
-                                } else if (player_pause_play?.isFocused == true) {
+                                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
                                     player.seekTime(androidTVInterfaceOnSeekTime)
                                     return true
                                 }
@@ -1117,11 +1147,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         isShowing = false
 
         // if nothing has loaded these buttons should not be visible
-        player_skip_episode?.isVisible = false
-        player_tracks_btt?.isVisible = false
-        player_skip_op?.isVisible = false
-        shadow_overlay?.isVisible = false
-
+        playerBinding?.apply {
+            playerSkipEpisode.isVisible = false
+            playerTracksBtt.isVisible = false
+            playerSkipOp.isVisible = false
+            shadowOverlay.isVisible = false
+        }
         updateLockUI()
         updateUIVisibility()
         animateLayoutChanges()
@@ -1150,50 +1181,65 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 PlayerEventType.Lock -> {
                     toggleLock()
                 }
+
                 PlayerEventType.NextEpisode -> {
                     player.handleEvent(CSPlayerEvent.NextEpisode)
                 }
+
                 PlayerEventType.Pause -> {
                     player.handleEvent(CSPlayerEvent.Pause)
                 }
+
                 PlayerEventType.PlayPauseToggle -> {
                     player.handleEvent(CSPlayerEvent.PlayPauseToggle)
                 }
+
                 PlayerEventType.Play -> {
                     player.handleEvent(CSPlayerEvent.Play)
                 }
+
                 PlayerEventType.SkipCurrentChapter -> {
                     player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
                 }
+
                 PlayerEventType.Resize -> {
                     nextResize()
                 }
+
                 PlayerEventType.PrevEpisode -> {
                     player.handleEvent(CSPlayerEvent.PrevEpisode)
                 }
+
                 PlayerEventType.SeekForward -> {
                     player.handleEvent(CSPlayerEvent.SeekForward)
                 }
+
                 PlayerEventType.ShowSpeed -> {
                     showSpeedDialog()
                 }
+
                 PlayerEventType.SeekBack -> {
                     player.handleEvent(CSPlayerEvent.SeekBack)
                 }
+
                 PlayerEventType.ToggleMute -> {
                     player.handleEvent(CSPlayerEvent.ToggleMute)
                 }
+
                 PlayerEventType.ToggleHide -> {
                     onClickChange()
                 }
+
                 PlayerEventType.ShowMirrors -> {
                     showMirrorsDialogue()
                 }
+
                 PlayerEventType.SearchSubtitlesOnline -> {
                     if (subsProvidersIsActive) {
                         openOnlineSubPicker(view.context, null) {}
                     }
                 }
+
                 PlayerEventType.SkipOp -> {
                     skipOp()
                 }
@@ -1288,93 +1334,97 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 // useSystemBrightness =
                 //    settingsManager.getBoolean(ctx.getString(R.string.use_system_brightness_key), false)
             }
-
-            player_speed_btt?.isVisible = playBackSpeedEnabled
-            player_resize_btt?.isVisible = playerResizeEnabled
+            playerBinding?.apply {
+                playerSpeedBtt.isVisible = playBackSpeedEnabled
+                playerResizeBtt.isVisible = playerResizeEnabled
+            }
         } catch (e: Exception) {
             logError(e)
         }
-
-        player_pause_play?.setOnClickListener {
-            autoHide()
-            player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-        }
-
-        skip_chapter_button?.setOnClickListener {
-            player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
-        }
-
-        // init clicks
-        player_resize_btt?.setOnClickListener {
-            autoHide()
-            nextResize()
-        }
-
-        player_speed_btt?.setOnClickListener {
-            autoHide()
-            showSpeedDialog()
-        }
-
-        player_skip_op?.setOnClickListener {
-            autoHide()
-            skipOp()
-        }
-
-        player_skip_episode?.setOnClickListener {
-            autoHide()
-            player.handleEvent(CSPlayerEvent.NextEpisode)
-        }
-
-        player_lock?.setOnClickListener {
-            autoHide()
-            toggleLock()
-        }
-
-        player_subtitle_offset_btt?.setOnClickListener {
-            showSubtitleOffsetDialog()
-        }
-
-        exo_rew?.setOnClickListener {
-            autoHide()
-            rewind()
-        }
-
-        exo_ffwd?.setOnClickListener {
-            autoHide()
-            fastForward()
-        }
-
-        player_go_back?.setOnClickListener {
-            activity?.popCurrentPage()
-        }
-
-        player_sources_btt?.setOnClickListener {
-            showMirrorsDialogue()
-        }
-
-        player_tracks_btt?.setOnClickListener {
-            showTracksDialogue()
-        }
-
-        // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
-        player_holder?.setOnTouchListener { callView, event ->
-            return@setOnTouchListener handleMotionEvent(callView, event)
-        }
-
-        exo_progress?.setOnTouchListener { _, event ->
-            // this makes the bar not disappear when sliding
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    currentTapIndex++
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    currentTapIndex++
-                }
-                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_BUTTON_RELEASE -> {
-                    autoHide()
-                }
+        playerBinding?.apply {
+            playerPausePlay.setOnClickListener {
+                autoHide()
+                player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+            }
+
+            skipChapterButton.setOnClickListener {
+                player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+            }
+
+            // init clicks
+            playerResizeBtt.setOnClickListener {
+                autoHide()
+                nextResize()
+            }
+
+            playerSpeedBtt.setOnClickListener {
+                autoHide()
+                showSpeedDialog()
+            }
+
+            playerSkipOp.setOnClickListener {
+                autoHide()
+                skipOp()
+            }
+
+            playerSkipEpisode.setOnClickListener {
+                autoHide()
+                player.handleEvent(CSPlayerEvent.NextEpisode)
+            }
+
+            playerLock.setOnClickListener {
+                autoHide()
+                toggleLock()
+            }
+
+            playerSubtitleOffsetBtt.setOnClickListener {
+                showSubtitleOffsetDialog()
+            }
+
+            exoRew.setOnClickListener {
+                autoHide()
+                rewind()
+            }
+
+            exoFfwd.setOnClickListener {
+                autoHide()
+                fastForward()
+            }
+
+            playerGoBack.setOnClickListener {
+                activity?.popCurrentPage()
+            }
+
+            playerSourcesBtt.setOnClickListener {
+                showMirrorsDialogue()
+            }
+
+            playerTracksBtt.setOnClickListener {
+                showTracksDialogue()
+            }
+
+            // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
+            playerHolder.setOnTouchListener { callView, event ->
+                return@setOnTouchListener handleMotionEvent(callView, event)
+            }
+
+            exoProgress.setOnTouchListener { _, event ->
+                // this makes the bar not disappear when sliding
+                when (event.action) {
+                    MotionEvent.ACTION_DOWN -> {
+                        currentTapIndex++
+                    }
+
+                    MotionEvent.ACTION_MOVE -> {
+                        currentTapIndex++
+                    }
+
+                    MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_BUTTON_RELEASE -> {
+                        autoHide()
+                    }
+                }
+                return@setOnTouchListener false
             }
-            return@setOnTouchListener false
         }
         // init UI
         try {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index fdb19d7a..c280af59 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
@@ -25,6 +25,11 @@ import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.databinding.DialogOnlineSubtitlesBinding
+import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
+import com.lagradost.cloudstream3.databinding.PlayerSelectSourceAndSubsBinding
+import com.lagradost.cloudstream3.databinding.PlayerSelectTracksBinding
 import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subtitleProviders
@@ -33,8 +38,6 @@ import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForced
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
-import com.lagradost.cloudstream3.ui.player.source_priority.SourcePriority
-import com.lagradost.cloudstream3.ui.player.source_priority.SourcePriorityDialog
 import com.lagradost.cloudstream3.ui.result.*
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1
@@ -49,18 +52,8 @@ import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.dialog_online_subtitles.*
-import kotlinx.android.synthetic.main.dialog_online_subtitles.apply_btt
-import kotlinx.android.synthetic.main.dialog_online_subtitles.cancel_btt
-import kotlinx.android.synthetic.main.fragment_player.*
-import kotlinx.android.synthetic.main.player_custom_layout.*
-import kotlinx.android.synthetic.main.player_select_source_and_subs.*
-import kotlinx.android.synthetic.main.player_select_source_and_subs.subtitles_click_settings
-import kotlinx.android.synthetic.main.player_select_tracks.*
 import kotlinx.coroutines.Job
 import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 import kotlin.math.abs
 
 class GeneratorPlayer : FullScreenPlayer() {
@@ -98,12 +91,14 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
 
+    private var binding: FragmentPlayerBinding? = null
+
     private fun startLoading() {
         player.release()
         currentSelectedSubtitles = null
         isActive = false
-        overlay_loading_skip_button?.isVisible = false
-        player_loading_overlay?.isVisible = true
+        binding?.overlayLoadingSkipButton?.isVisible = false
+        binding?.playerLoadingOverlay?.isVisible = true
     }
 
     private fun setSubtitles(sub: SubtitleData?): Boolean {
@@ -118,7 +113,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     override fun onTracksInfoChanged() {
         val tracks = player.getVideoTracks()
-        player_tracks_btt?.isVisible =
+        playerBinding?.playerTracksBtt?.isVisible =
             tracks.allVideoTracks.size > 1 || tracks.allAudioTracks.size > 1
         // Only set the preferred language if it is available.
         // Otherwise it may give some users audio track init failed!
@@ -158,12 +153,12 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (link == null) return
 
         // manage UI
-        player_loading_overlay?.isVisible = false
+        binding?.playerLoadingOverlay?.isVisible = false
         uiReset()
         currentSelectedLink = link
         currentMeta = viewModel.getMeta()
         nextMeta = viewModel.getNextMeta()
-        setEpisodes(viewModel.getAllMeta() ?: emptyList())
+        //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         isActive = true
         setPlayerDimen(null)
         setTitle()
@@ -209,7 +204,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             closestQuality(linkData?.quality)
         )
         val sourcePriority =
-            QualityDataHelper.getSourcePriority(qualityProfile, linkData?.name)
+            QualityDataHelper.getSourcePriority(qualityProfile, linkData?.source)
 
         // negative because we want to sort highest quality first
         return qualityPriority + sourcePriority
@@ -257,7 +252,9 @@ class GeneratorPlayer : FullScreenPlayer() {
         val isSingleProvider = subsProviders.size == 1
 
         val dialog = Dialog(context, R.style.AlertDialogCustomBlack)
-        dialog.setContentView(R.layout.dialog_online_subtitles)
+        val binding =
+            DialogOnlineSubtitlesBinding.inflate(LayoutInflater.from(context), null, false)
+        dialog.setContentView(binding.root)
 
         var currentSubtitles: List<AbstractSubtitleEntities.SubtitleEntity> = emptyList()
         var currentSubtitle: AbstractSubtitleEntities.SubtitleEntity? = null
@@ -295,6 +292,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     imageViewEnd.setImageDrawable(drawableEnd)
                 }
 
+                @SuppressLint("SetTextI18n")
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
                     val view = convertView ?: LayoutInflater.from(context).inflate(layout, null)
 
@@ -318,16 +316,16 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
         dialog.show()
-        dialog.cancel_btt.setOnClickListener {
+        binding.cancelBtt.setOnClickListener {
             dialog.dismissSafe()
         }
 
-        dialog.subtitle_adapter.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-        dialog.subtitle_adapter.adapter = arrayAdapter
+        binding.subtitleAdapter.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+        binding.subtitleAdapter.adapter = arrayAdapter
         val adapter =
-            dialog.subtitle_adapter.adapter as? ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>
+            binding.subtitleAdapter.adapter as? ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>
 
-        dialog.subtitle_adapter.setOnItemClickListener { _, _, position, _ ->
+        binding.subtitleAdapter.setOnItemClickListener { _, _, position, _ ->
             currentSubtitle = currentSubtitles.getOrNull(position) ?: return@setOnItemClickListener
         }
 
@@ -343,16 +341,16 @@ class GeneratorPlayer : FullScreenPlayer() {
         val currentTempMeta = getMetaData()
         // bruh idk why it is not correct
         val color = ColorStateList.valueOf(context.colorFromAttribute(R.attr.colorAccent))
-        dialog.search_loading_bar.progressTintList = color
-        dialog.search_loading_bar.indeterminateTintList = color
+        binding.searchLoadingBar.progressTintList = color
+        binding.searchLoadingBar.indeterminateTintList = color
 
         observeNullable(viewModel.currentSubtitleYear) {
             // When year is changed search again
-            dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
-            dialog.year_btt.text = it?.toString() ?: txt(R.string.none).asString(context)
+            binding.subtitlesSearch.setQuery(binding.subtitlesSearch.query, true)
+            binding.yearBtt.text = it?.toString() ?: txt(R.string.none).asString(context)
         }
 
-        dialog.year_btt?.setOnClickListener {
+        binding.yearBtt.setOnClickListener {
             val none = txt(R.string.none).asString(context)
             val currentYear = Calendar.getInstance().get(Calendar.YEAR)
             val earliestYear = 1900
@@ -380,10 +378,10 @@ class GeneratorPlayer : FullScreenPlayer() {
             )
         }
 
-        dialog.subtitles_search.setOnQueryTextListener(object :
+        binding.subtitlesSearch.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
-                dialog.search_loading_bar?.show()
+                binding.searchLoadingBar.show()
                 ioSafe {
                     val search =
                         AbstractSubtitleEntities.SubtitleSearch(
@@ -415,7 +413,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     // ugly ik
                     activity?.runOnUiThread {
                         setSubtitlesList(items)
-                        dialog.search_loading_bar?.hide()
+                        binding.searchLoadingBar.hide()
                     }
                 }
 
@@ -427,7 +425,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         })
 
-        dialog.search_filter.setOnClickListener { view ->
+        binding.searchFilter.setOnClickListener { view ->
             val lang639_1 = languages.map { it.ISO_639_1 }
             activity?.showDialog(languages.map { it.languageName },
                 lang639_1.indexOf(currentLanguageTwoLetters),
@@ -436,11 +434,11 @@ class GeneratorPlayer : FullScreenPlayer() {
                 true,
                 { }) { index ->
                 currentLanguageTwoLetters = lang639_1[index]
-                dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
+                binding.subtitlesSearch.setQuery(binding.subtitlesSearch.query, true)
             }
         }
 
-        dialog.apply_btt.setOnClickListener {
+        binding.applyBtt.setOnClickListener {
             currentSubtitle?.let { currentSubtitle ->
                 providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
                     ioSafe {
@@ -466,7 +464,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         dialog.show()
-        dialog.subtitles_search.setQuery(currentTempMeta.name, true)
+        binding.subtitlesSearch.setQuery(currentTempMeta.name, true)
         //TODO: Set year text from currently loaded movie on Player
         //dialog.subtitles_search_year?.setText(currentTempMeta.year)
     }
@@ -509,7 +507,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         selectSourceDialog?.dismissSafe()
 
         showToast(
-            activity,
             String.format(ctx.getString(R.string.player_loaded_subtitles), subtitleData.name),
             Toast.LENGTH_LONG
         )
@@ -558,13 +555,15 @@ class GeneratorPlayer : FullScreenPlayer() {
                 val currentSubtitles = sortSubs(currentSubs)
 
                 val sourceDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
-                sourceDialog.setContentView(R.layout.player_select_source_and_subs)
+                val binding =
+                    PlayerSelectSourceAndSubsBinding.inflate(LayoutInflater.from(ctx), null, false)
+                sourceDialog.setContentView(binding.root)
 
                 selectSourceDialog = sourceDialog
 
                 sourceDialog.show()
-                val providerList = sourceDialog.sort_providers
-                val subtitleList = sourceDialog.sort_subtitles
+                val providerList = binding.sortProviders
+                val subtitleList = binding.sortSubtitles
 
                 val loadFromFileFooter: TextView =
                     layoutInflater.inflate(R.layout.sort_bottom_footer_add_choice, null) as TextView
@@ -672,12 +671,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }
                 }
 
-                sourceDialog.cancel_btt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     sourceDialog.dismissSafe(activity)
                 }
 
                 fun setProfileName(profile: Int) {
-                    sourceDialog.source_settings_btt.setText(
+                    binding.sourceSettingsBtt.setText(
                         QualityDataHelper.getProfileName(
                             profile
                         )
@@ -685,7 +684,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
                 setProfileName(currentQualityProfile)
 
-                sourceDialog.profiles_click_settings.setOnClickListener {
+                binding.profilesClickSettings.setOnClickListener {
                     val activity = activity ?: return@setOnClickListener
                     QualityProfileDialog(
                         activity,
@@ -699,7 +698,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }.show()
                 }
 
-                sourceDialog.subtitles_encoding_format?.apply {
+                binding.subtitlesEncodingFormat.apply {
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
                     val prefNames = ctx.resources.getStringArray(R.array.subtitles_encoding_list)
@@ -712,7 +711,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     text = prefNames[if (index == -1) 0 else index]
                 }
 
-                sourceDialog.subtitles_click_settings?.setOnClickListener {
+                binding.subtitlesClickSettings.setOnClickListener {
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
                     val prefNames = ctx.resources.getStringArray(R.array.subtitles_encoding_list)
@@ -741,7 +740,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }
                 }
 
-                sourceDialog.apply_btt?.setOnClickListener {
+                binding.applyBtt.setOnClickListener {
                     var init = false
                     if (sourceIndex != startSource) {
                         init = true
@@ -781,18 +780,19 @@ class GeneratorPlayer : FullScreenPlayer() {
                     it.height?.times(-1)
                 }
                 val currentAudioTracks = tracks.allAudioTracks
-
+                val binding: PlayerSelectTracksBinding =
+                    PlayerSelectTracksBinding.inflate(LayoutInflater.from(ctx), null, false)
                 val trackDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
-                trackDialog.setContentView(R.layout.player_select_tracks)
+                trackDialog.setContentView(binding.root)
                 trackDialog.show()
 
 //                selectTracksDialog = tracksDialog
 
-                val videosList = trackDialog.video_tracks_list
-                val audioList = trackDialog.auto_tracks_list
+                val videosList = binding.videoTracksList
+                val audioList = binding.autoTracksList
 
-                trackDialog.video_tracks_holder.isVisible = currentVideoTracks.size > 1
-                trackDialog.audio_tracks_holder.isVisible = currentAudioTracks.size > 1
+                binding.videoTracksHolder.isVisible = currentVideoTracks.size > 1
+                binding.audioTracksHolder.isVisible = currentAudioTracks.size > 1
 
                 fun dismiss() {
                     if (isPlaying) {
@@ -857,11 +857,11 @@ class GeneratorPlayer : FullScreenPlayer() {
                     audioList.setItemChecked(which, true)
                 }
 
-                trackDialog.cancel_btt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     trackDialog.dismissSafe(activity)
                 }
 
-                trackDialog.apply_btt?.setOnClickListener {
+                binding.applyBtt.setOnClickListener {
                     val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
                         currentTrack?.language, currentTrack?.id
@@ -889,7 +889,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     private fun noLinksFound() {
-        showToast(activity, R.string.no_links_found_toast, Toast.LENGTH_SHORT)
+        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
         activity?.popCurrentPage()
     }
 
@@ -1030,8 +1030,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                 if (meta.tvType.isAnimeOp()) isOpVisible = percentage < SKIP_OP_VIDEO_PERCENTAGE
             }
         }
-        player_skip_op?.isVisible = isOpVisible
-        player_skip_episode?.isVisible = !isOpVisible && viewModel.hasNextEpisode() == true
+
+        playerBinding?.playerSkipOp?.isVisible = isOpVisible
+        playerBinding?.playerSkipEpisode?.isVisible =
+            !isOpVisible && viewModel.hasNextEpisode() == true
 
         if (percentage >= PRELOAD_NEXT_EPISODE_PERCENTAGE) {
             viewModel.preLoadNextLinks()
@@ -1168,7 +1170,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         //Hide title, if set in setting
         if (limitTitle < 0) {
-            player_video_title?.visibility = View.GONE
+            playerBinding?.playerVideoTitle?.visibility = View.GONE
         } else {
             //Truncate video title if it exceeds limit
             val differenceInLength = playerVideoTitle.length - limitTitle
@@ -1179,8 +1181,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
         val isFiller: Boolean? = (currentMeta as? ResultEpisode)?.isFiller
 
-        player_episode_filler_holder?.isVisible = isFiller ?: false
-        player_video_title?.text = playerVideoTitle
+        playerBinding?.playerEpisodeFillerHolder?.isVisible = isFiller ?: false
+        playerBinding?.playerVideoTitle?.text = playerVideoTitle
     }
 
     @SuppressLint("SetTextI18n")
@@ -1201,8 +1203,10 @@ class GeneratorPlayer : FullScreenPlayer() {
             3 -> "$source - $extra"
             else -> ""
         }
-        player_video_title_rez?.text = title
-        player_video_title_rez?.isVisible = title.isNotBlank()
+        playerBinding?.playerVideoTitleRez?.apply {
+            text = title
+            isVisible = title.isNotBlank()
+        }
     }
 
     override fun playerDimensionsLoaded(widthHeight: Pair<Int, Int>) {
@@ -1230,7 +1234,14 @@ class GeneratorPlayer : FullScreenPlayer() {
         unwrapBundle(savedInstanceState)
         unwrapBundle(arguments)
 
-        return super.onCreateView(inflater, container, savedInstanceState)
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        binding = FragmentPlayerBinding.bind(root)
+        return root
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     var timestampShowState = false
@@ -1243,7 +1254,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         skipIndex++
         println("displayTimeStamp = $show")
         timestampShowState = show
-        skip_chapter_button?.apply {
+        playerBinding?.skipChapterButton?.apply {
             val showWidth = 170.toPx
             val noShowWidth = 10.toPx
             //if((show && width == showWidth) || (!show && width == noShowWidth)) {
@@ -1263,7 +1274,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 from, to
             ).apply {
                 addListener(onEnd = {
-                    if (!show) skip_chapter_button?.isVisible = false
+                    if (!show) playerBinding?.skipChapterButton?.isVisible = false
                 })
                 addUpdateListener { valueAnimator ->
                     val value = valueAnimator.animatedValue as Int
@@ -1283,10 +1294,11 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     override fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
         if (timestamp != null) {
-            skip_chapter_button.setText(timestamp.uiText)
+            println("timestamp: $timestamp")
+            playerBinding?.skipChapterButton?.setText(timestamp.uiText)
             displayTimeStamp(true)
             val currentIndex = skipIndex
-            skip_chapter_button?.handler?.postDelayed({
+            playerBinding?.skipChapterButton?.handler?.postDelayed({
                 if (skipIndex == currentIndex)
                     displayTimeStamp(false)
             }, 6000)
@@ -1329,11 +1341,11 @@ class GeneratorPlayer : FullScreenPlayer() {
             viewModel.loadLinks()
         }
 
-        overlay_loading_skip_button?.setOnClickListener {
+        binding?.overlayLoadingSkipButton?.setOnClickListener {
             startPlayer()
         }
 
-        player_loading_go_back?.setOnClickListener {
+        binding?.playerLoadingGoBack?.setOnClickListener {
             player.release()
             activity?.popCurrentPage()
         }
@@ -1357,7 +1369,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 is Resource.Failure -> {
-                    showToast(activity, it.errorString, Toast.LENGTH_LONG)
+                    showToast(it.errorString, Toast.LENGTH_LONG)
                     startPlayer()
                 }
             }
@@ -1366,8 +1378,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         observe(viewModel.currentLinks) {
             currentLinks = it
             val turnVisible = it.isNotEmpty()
-            val wasGone = overlay_loading_skip_button?.isGone == true
-            overlay_loading_skip_button?.isVisible = turnVisible
+            val wasGone = binding?.overlayLoadingSkipButton?.isGone == true
+            binding?.overlayLoadingSkipButton?.isVisible = turnVisible
 
             normalSafeApiCall {
                 if (currentLinks.any { link ->
@@ -1380,7 +1392,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
             if (turnVisible && wasGone) {
-                overlay_loading_skip_button?.requestFocus()
+                binding?.overlayLoadingSkipButton?.requestFocus()
             }
         }
 
@@ -1410,4 +1422,4 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerEpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerEpisodeAdapter.kt
deleted file mode 100644
index cfe27a30..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerEpisodeAdapter.kt
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.lagradost.cloudstream3.ui.player
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.widget.ContentLoadingProgressBar
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.ui.result.getDisplayPosition
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import com.lagradost.cloudstream3.utils.AppUtils.html
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.player_episodes_large.view.episode_holder_large
-import kotlinx.android.synthetic.main.player_episodes_large.view.episode_progress
-import kotlinx.android.synthetic.main.player_episodes_small.view.episode_holder
-import kotlinx.android.synthetic.main.result_episode_large.view.*
-
-
-data class PlayerEpisodeClickEvent(val action: Int, val data: Any)
-
-class PlayerEpisodeAdapter(
-    private val items: MutableList<Any> = mutableListOf(),
-    private val clickCallback: (PlayerEpisodeClickEvent) -> Unit,
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return PlayerEpisodeCardViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.player_episodes, parent, false),
-            clickCallback,
-        )
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        println("HOLDER $holder $position")
-
-        when (holder) {
-            is PlayerEpisodeCardViewHolder -> {
-                holder.bind(items[position])
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return items.size
-    }
-
-    fun updateList(newList: List<Any>) {
-        println("Updated list $newList")
-        val diffResult = DiffUtil.calculateDiff(EpisodeDiffCallback(this.items, newList))
-        items.clear()
-        items.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    class PlayerEpisodeCardViewHolder
-    constructor(
-        itemView: View,
-        private val clickCallback: (PlayerEpisodeClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView) {
-        @SuppressLint("SetTextI18n")
-        fun bind(card: Any) {
-            if (card is ResultEpisode) {
-                val (parentView, otherView) = if (card.poster == null) {
-                    itemView.episode_holder to itemView.episode_holder_large
-                } else {
-                    itemView.episode_holder_large to itemView.episode_holder
-                }
-
-                val episodeText: TextView? = parentView.episode_text
-                val episodeFiller: MaterialButton? = parentView.episode_filler
-                val episodeRating: TextView? = parentView.episode_rating
-                val episodeDescript: TextView? = parentView.episode_descript
-                val episodeProgress: ContentLoadingProgressBar? = parentView.episode_progress
-                val episodePoster: ImageView? = parentView.episode_poster
-
-                parentView.isVisible = true
-                otherView.isVisible = false
-
-
-                episodeText?.apply {
-                    val name =
-                        if (card.name == null) "${context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
-
-                    text = name
-                    isSelected = true
-                }
-
-                episodeFiller?.isVisible = card.isFiller == true
-
-                val displayPos = card.getDisplayPosition()
-                episodeProgress?.max = (card.duration / 1000).toInt()
-                episodeProgress?.progress = (displayPos / 1000).toInt()
-                episodeProgress?.isVisible =  displayPos > 0L
-                episodePoster?.isVisible = episodePoster?.setImage(card.poster) == true
-
-                if (card.rating != null) {
-                    episodeRating?.text = episodeRating?.context?.getString(R.string.rated_format)
-                        ?.format(card.rating.toFloat() / 10f)
-                } else {
-                    episodeRating?.text = ""
-                }
-
-                episodeRating?.isGone = episodeRating?.text.isNullOrBlank()
-
-                episodeDescript?.apply {
-                    text = card.description.html()
-                    isGone = text.isNullOrBlank()
-                    //setOnClickListener {
-                    //    clickCallback.invoke(PlayerEpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
-                    //}
-                }
-
-                parentView.setOnClickListener {
-                    clickCallback.invoke(PlayerEpisodeClickEvent(0, card))
-                }
-
-                if (isTrueTvSettings()) {
-                    parentView.isFocusable = true
-                    parentView.isFocusableInTouchMode = true
-                    parentView.touchscreenBlocksFocus = false
-                }
-            }
-        }
-    }
-}
-
-class EpisodeDiffCallback(
-    private val oldList: List<Any>,
-    private val newList: List<Any>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        val a = oldList[oldItemPosition]
-        val b = newList[newItemPosition]
-        return if (a is ResultEpisode && b is ResultEpisode) {
-            a.id == b.id
-        } else {
-            a == b
-        }
-    }
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt
index 8e0ce67c..fb60ccce 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt
@@ -1,14 +1,10 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerPrioritizeItemBinding
 import com.lagradost.cloudstream3.utils.AppUtils
-import kotlinx.android.synthetic.main.player_prioritize_item.view.*
 
 data class SourcePriority<T>(
     val data: T,
@@ -20,7 +16,8 @@ class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
     AppUtils.DiffAdapter<SourcePriority<T>>(items) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return PriorityViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.player_prioritize_item, parent, false)
+            PlayerPrioritizeItemBinding.inflate(LayoutInflater.from(parent.context),parent,false),
+            //LayoutInflater.from(parent.context).inflate(R.layout.player_prioritize_item, parent, false)
         )
     }
 
@@ -31,27 +28,27 @@ class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
     }
 
     class PriorityViewHolder(
-        itemView: View,
-    ) : RecyclerView.ViewHolder(itemView) {
+        val binding: PlayerPrioritizeItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
         fun <T> bind(item: SourcePriority<T>) {
-            val plusButton: ImageView = itemView.add_button
+           /* val plusButton: ImageView = itemView.add_button
             val subtractButton: ImageView = itemView.subtract_button
             val priorityText: TextView = itemView.priority_text
-            val priorityNumber: TextView = itemView.priority_number
-            priorityText.text = item.name
+            val priorityNumber: TextView = itemView.priority_number*/
+            binding.priorityText.text = item.name
 
             fun updatePriority() {
-                priorityNumber.text = item.priority.toString()
+                binding.priorityNumber.text = item.priority.toString()
             }
 
             updatePriority()
-            plusButton.setOnClickListener {
+            binding.addButton.setOnClickListener {
                 // If someone clicks til the integer limit then they deserve to crash.
                 item.priority++
                 updatePriority()
             }
 
-            subtractButton.setOnClickListener {
+            binding.subtractButton.setOnClickListener {
                 item.priority--
                 updatePriority()
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt
index ff84c1f5..8153d7a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt
@@ -8,19 +8,13 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerQualityProfileItemBinding
 import com.lagradost.cloudstream3.ui.result.UiImage
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.card_view
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.outline
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.profile_image_background
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.profile_text
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.text_is_mobile_data
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.text_is_wifi
 
 class ProfilesAdapter(
     override val items: MutableList<QualityDataHelper.QualityProfile>,
@@ -34,8 +28,9 @@ class ProfilesAdapter(
         }) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ProfilesViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.player_quality_profile_item, parent, false)
+            PlayerQualityProfileItemBinding.inflate(LayoutInflater.from(parent.context),parent,false)
+            //LayoutInflater.from(parent.context)
+            //    .inflate(R.layout.player_quality_profile_item, parent, false)
         )
     }
 
@@ -52,8 +47,8 @@ class ProfilesAdapter(
     }
 
     inner class ProfilesViewHolder(
-        itemView: View,
-    ) : RecyclerView.ViewHolder(itemView) {
+        val binding: PlayerQualityProfileItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
         private val art = listOf(
             R.drawable.profile_bg_teal,
             R.drawable.profile_bg_blue,
@@ -65,12 +60,12 @@ class ProfilesAdapter(
         )
 
         fun bind(item: QualityDataHelper.QualityProfile, index: Int) {
-            val priorityText: TextView = itemView.profile_text
-            val profileBg: ImageView = itemView.profile_image_background
-            val wifiText: TextView = itemView.text_is_wifi
-            val dataText: TextView = itemView.text_is_mobile_data
-            val outline: View = itemView.outline
-            val cardView: View = itemView.card_view
+            val priorityText: TextView = binding.profileText
+            val profileBg: ImageView = binding.profileImageBackground
+            val wifiText: TextView = binding.textIsWifi
+            val dataText: TextView = binding.textIsMobileData
+            val outline: View = binding.outline
+            val cardView: View = binding.cardView
 
             priorityText.text = item.name.asString(itemView.context)
             dataText.isVisible = item.type == QualityDataHelper.QualityProfileType.Data
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
index 28a6365f..e3629158 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
@@ -1,20 +1,16 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.app.Dialog
-import android.view.View
-import android.widget.TextView
 import androidx.annotation.StyleRes
-import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerQualityProfileDialogBinding
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfileName
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfiles
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import kotlinx.android.synthetic.main.player_quality_profile_dialog.*
 
 class QualityProfileDialog(
     val activity: FragmentActivity,
@@ -24,83 +20,86 @@ class QualityProfileDialog(
     private val profileSelectionCallback: (QualityDataHelper.QualityProfile) -> Unit
 ) : Dialog(activity, themeRes) {
     override fun show() {
-        setContentView(R.layout.player_quality_profile_dialog)
-        val profilesRecyclerView: RecyclerView = profiles_recyclerview
+
+        val binding = PlayerQualityProfileDialogBinding.inflate(this.layoutInflater, null, false)
+
+        setContentView(binding.root)//R.layout.player_quality_profile_dialog)
+        /*val profilesRecyclerView: RecyclerView = profiles_recyclerview
         val useBtt: View = use_btt
         val editBtt: View = edit_btt
         val cancelBtt: View = cancel_btt
         val defaultBtt: View = set_default_btt
         val currentProfileText: TextView = currently_selected_profile_text
-        val selectedItemActionsHolder: View = selected_item_holder
-
-        fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
-            return (profilesRecyclerView.adapter as? ProfilesAdapter)?.getCurrentProfile()
-        }
-
-        fun refreshProfiles() {
-            currentProfileText.text = getProfileName(usedProfile).asString(context)
-            (profilesRecyclerView.adapter as? ProfilesAdapter)?.updateList(getProfiles())
-        }
-
-        profilesRecyclerView.adapter = ProfilesAdapter(
-            mutableListOf(),
-            usedProfile,
-        ) { oldIndex: Int?, newIndex: Int ->
-            profilesRecyclerView.adapter?.notifyItemChanged(newIndex)
-            selectedItemActionsHolder.alpha = 1f
-            if (oldIndex != null) {
-                profilesRecyclerView.adapter?.notifyItemChanged(oldIndex)
+        val selectedItemActionsHolder: View = selected_item_holder*/
+        binding.apply {
+            fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
+                return (profilesRecyclerview.adapter as? ProfilesAdapter)?.getCurrentProfile()
             }
-        }
 
-        refreshProfiles()
-
-        editBtt.setOnClickListener {
-            getCurrentProfile()?.let { profile ->
-                SourcePriorityDialog(context, themeRes, links, profile) {
-                    refreshProfiles()
-                }.show()
+            fun refreshProfiles() {
+                currentlySelectedProfileText.text = getProfileName(usedProfile).asString(context)
+                (profilesRecyclerview.adapter as? ProfilesAdapter)?.updateList(getProfiles())
+            }
+
+            profilesRecyclerview.adapter = ProfilesAdapter(
+                mutableListOf(),
+                usedProfile,
+            ) { oldIndex: Int?, newIndex: Int ->
+                profilesRecyclerview.adapter?.notifyItemChanged(newIndex)
+                selectedItemHolder.alpha = 1f
+                if (oldIndex != null) {
+                    profilesRecyclerview.adapter?.notifyItemChanged(oldIndex)
+                }
+            }
+
+            refreshProfiles()
+
+            editBtt.setOnClickListener {
+                getCurrentProfile()?.let { profile ->
+                    SourcePriorityDialog(context, themeRes, links, profile) {
+                        refreshProfiles()
+                    }.show()
+                }
             }
-        }
 
 
-        defaultBtt.setOnClickListener {
-            val currentProfile = getCurrentProfile() ?: return@setOnClickListener
-            val choices = QualityDataHelper.QualityProfileType.values()
-                .filter { it != QualityDataHelper.QualityProfileType.None }
-            val choiceNames = choices.map { txt(it.stringRes).asString(context) }
+            setDefaultBtt.setOnClickListener {
+                val currentProfile = getCurrentProfile() ?: return@setOnClickListener
+                val choices = QualityDataHelper.QualityProfileType.values()
+                    .filter { it != QualityDataHelper.QualityProfileType.None }
+                val choiceNames = choices.map { txt(it.stringRes).asString(context) }
 
-            activity.showBottomDialog(
-                choiceNames,
-                choices.indexOf(currentProfile.type),
-                txt(R.string.set_default).asString(context),
-                false,
-                {},
-                { index ->
-                    val pickedChoice = choices.getOrNull(index) ?: return@showBottomDialog
-                    // Remove previous picks
-                    if (pickedChoice.unique) {
-                        getProfiles().filter { it.type == pickedChoice }.forEach {
-                            QualityDataHelper.setQualityProfileType(it.id, null)
+                activity.showBottomDialog(
+                    choiceNames,
+                    choices.indexOf(currentProfile.type),
+                    txt(R.string.set_default).asString(context),
+                    false,
+                    {},
+                    { index ->
+                        val pickedChoice = choices.getOrNull(index) ?: return@showBottomDialog
+                        // Remove previous picks
+                        if (pickedChoice.unique) {
+                            getProfiles().filter { it.type == pickedChoice }.forEach {
+                                QualityDataHelper.setQualityProfileType(it.id, null)
+                            }
                         }
-                    }
 
-                    QualityDataHelper.setQualityProfileType(currentProfile.id, pickedChoice)
-                    refreshProfiles()
-                })
-        }
+                        QualityDataHelper.setQualityProfileType(currentProfile.id, pickedChoice)
+                        refreshProfiles()
+                    })
+            }
 
-        cancelBtt.setOnClickListener {
-            this.dismissSafe()
-        }
+            cancelBtt.setOnClickListener {
+                this@QualityProfileDialog.dismissSafe()
+            }
 
-        useBtt.setOnClickListener {
-            getCurrentProfile()?.let {
-                profileSelectionCallback.invoke(it)
-                this.dismissSafe()
+            useBtt.setOnClickListener {
+                getCurrentProfile()?.let {
+                    profileSelectionCallback.invoke(it)
+                    this@QualityProfileDialog.dismissSafe()
+                }
             }
         }
-
         super.show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
index efc1f1b8..1b59882e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
@@ -2,24 +2,18 @@ package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.app.Dialog
 import android.content.Context
-import android.view.View
-import android.widget.EditText
-import android.widget.TextView
+import android.view.LayoutInflater
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
-import androidx.work.impl.constraints.controllers.ConstraintController
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerSelectSourcePriorityBinding
 import com.lagradost.cloudstream3.ui.result.txt
-import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import kotlinx.android.synthetic.main.player_select_source_priority.*
 
 class SourcePriorityDialog(
-    ctx: Context,
+    val ctx: Context,
     @StyleRes themeRes: Int,
     val links: List<ExtractorLink>,
     private val profile: QualityDataHelper.QualityProfile,
@@ -30,13 +24,14 @@ class SourcePriorityDialog(
     private val updatedCallback: () -> Unit
 ) : Dialog(ctx, themeRes) {
     override fun show() {
-        setContentView(R.layout.player_select_source_priority)
-        val sourcesRecyclerView: RecyclerView = sort_sources
-        val qualitiesRecyclerView: RecyclerView = sort_qualities
-        val profileText: EditText = profile_text_editable
-        val saveBtt: View = save_btt
-        val exitBtt: View = close_btt
-        val helpBtt: View = help_btt
+        val binding = PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
+        setContentView(binding.root)
+        val sourcesRecyclerView = binding.sortSources
+        val qualitiesRecyclerView = binding.sortQualities
+        val profileText = binding.profileTextEditable
+        val saveBtt = binding.saveBtt
+        val exitBtt = binding.closeBtt
+        val helpBtt = binding.helpBtt
 
         profileText.setText(QualityDataHelper.getProfileName(profile.id).asString(context))
         profileText.hint = txt(R.string.profile_number, profile.id).asString(context)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index ba57d2de..89a09ae2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -19,8 +19,10 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.QuickSearchBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -37,7 +39,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.quick_search.*
 import java.util.concurrent.locks.ReentrantLock
 
 class QuickSearchFragment : Fragment() {
@@ -45,6 +46,13 @@ class QuickSearchFragment : Fragment() {
         const val AUTOSEARCH_KEY = "autosearch"
         const val PROVIDER_KEY = "providers"
 
+        fun pushSearch(
+            autoSearch: String? = null,
+            providers: Array<String>? = null
+        ) {
+            pushSearch(activity, autoSearch, providers)
+        }
+
         fun pushSearch(
             activity: Activity?,
             autoSearch: String? = null,
@@ -72,6 +80,8 @@ class QuickSearchFragment : Fragment() {
 
     private var providers: Set<String>? = null
     private lateinit var searchViewModel: SearchViewModel
+    var binding: QuickSearchBinding? = null
+
 
     private var bottomSheetDialog: BottomSheetDialog? = null
 
@@ -79,13 +89,21 @@ class QuickSearchFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         activity?.window?.setSoftInputMode(
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         searchViewModel = ViewModelProvider(this)[SearchViewModel::class.java]
         bottomSheetDialog?.ownShow()
-        return inflater.inflate(R.layout.quick_search, container, false)
+        val localBinding = QuickSearchBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.quick_search, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onDestroy() {
@@ -111,7 +129,7 @@ class QuickSearchFragment : Fragment() {
         activity?.getSpanCount()?.let {
             HomeFragment.currentSpan = it
         }
-        quick_search_autofit_results.spanCount = HomeFragment.currentSpan
+        binding?.quickSearchAutofitResults?.spanCount = HomeFragment.currentSpan
         HomeFragment.currentSpan = HomeFragment.currentSpan
         HomeFragment.configEvent.invoke(HomeFragment.currentSpan)
     }
@@ -123,7 +141,7 @@ class QuickSearchFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(quick_search_root)
+        fixPaddingStatusbar(binding?.quickSearchRoot)
         fixGrid()
 
         arguments?.getStringArray(PROVIDER_KEY)?.let {
@@ -136,23 +154,25 @@ class QuickSearchFragment : Fragment() {
         } else false
 
         if (isSingleProvider) {
-            quick_search_autofit_results.adapter = activity?.let {
-                SearchAdapter(
+            binding?.quickSearchAutofitResults?.apply {
+                adapter = SearchAdapter(
                     ArrayList(),
-                    quick_search_autofit_results,
+                    this,
                 ) { callback ->
-                    SearchHelper.handleSearchClickCallback(activity, callback)
+                    SearchHelper.handleSearchClickCallback(callback)
                 }
             }
+
             try {
-                quick_search?.queryHint = getString(R.string.search_hint_site).format(providers?.first())
+                binding?.quickSearch?.queryHint =
+                    getString(R.string.search_hint_site).format(providers?.first())
             } catch (e: Exception) {
                 logError(e)
             }
         } else {
-            quick_search_master_recycler?.adapter =
+            binding?.quickSearchMasterRecycler?.adapter =
                 ParentItemAdapter(mutableListOf(), { callback ->
-                    SearchHelper.handleSearchClickCallback(activity, callback)
+                    SearchHelper.handleSearchClickCallback(callback)
                     //when (callback.action) {
                     //SEARCH_ACTION_LOAD -> {
                     //    clickCallback?.invoke(callback)
@@ -164,18 +184,17 @@ class QuickSearchFragment : Fragment() {
                         bottomSheetDialog = null
                     })
                 })
-            quick_search_master_recycler?.layoutManager = GridLayoutManager(context, 1)
+            binding?.quickSearchMasterRecycler?.layoutManager = GridLayoutManager(context, 1)
         }
-
-        quick_search_autofit_results?.isVisible = isSingleProvider
-        quick_search_master_recycler?.isGone = isSingleProvider
+        binding?.quickSearchAutofitResults?.isVisible = isSingleProvider
+        binding?.quickSearchMasterRecycler?.isGone = isSingleProvider
 
         val listLock = ReentrantLock()
         observe(searchViewModel.currentSearch) { list ->
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-                (quick_search_master_recycler?.adapter as ParentItemAdapter?)?.apply {
+                (binding?.quickSearchMasterRecycler?.adapter as ParentItemAdapter?)?.apply {
                     updateList(list.map { ongoing ->
                         val ongoingList = HomePageList(
                             ongoing.apiName,
@@ -192,19 +211,18 @@ class QuickSearchFragment : Fragment() {
         }
 
         val searchExitIcon =
-            quick_search?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
+            binding?.quickSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
 
         //val searchMagIcon =
-        //    quick_search?.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
+        //    binding.quickSearch.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
 
         //searchMagIcon?.scaleX = 0.65f
         //searchMagIcon?.scaleY = 0.65f
 
-
-        quick_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding?.quickSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 if (search(context, query, false))
-                    UIHelper.hideKeyboard(quick_search)
+                    UIHelper.hideKeyboard(binding?.quickSearch)
                 return true
             }
 
@@ -214,27 +232,28 @@ class QuickSearchFragment : Fragment() {
                 return true
             }
         })
-
-        quick_search_loading_bar.alpha = 0f
+        binding?.quickSearchLoadingBar?.alpha = 0f
         observe(searchViewModel.searchResponse) {
             when (it) {
                 is Resource.Success -> {
                     it.value.let { data ->
-                        (quick_search_autofit_results?.adapter as? SearchAdapter)?.updateList(
+                        (binding?.quickSearchAutofitResults?.adapter as? SearchAdapter)?.updateList(
                             context?.filterSearchResultByFilmQuality(data) ?: data
                         )
                     }
                     searchExitIcon?.alpha = 1f
-                    quick_search_loading_bar?.alpha = 0f
+                    binding?.quickSearchLoadingBar?.alpha = 0f
                 }
+
                 is Resource.Failure -> {
                     // Toast.makeText(activity, "Server error", Toast.LENGTH_LONG).show()
                     searchExitIcon?.alpha = 1f
-                    quick_search_loading_bar?.alpha = 0f
+                    binding?.quickSearchLoadingBar?.alpha = 0f
                 }
+
                 is Resource.Loading -> {
                     searchExitIcon?.alpha = 0f
-                    quick_search_loading_bar?.alpha = 1f
+                    binding?.quickSearchLoadingBar?.alpha = 1f
                 }
             }
         }
@@ -246,13 +265,12 @@ class QuickSearchFragment : Fragment() {
         //        UIHelper.showInputMethod(view.findFocus())
         //    }
         //}
-
-        quick_search_back.setOnClickListener {
+        binding?.quickSearchBack?.setOnClickListener {
             activity?.popCurrentPage()
         }
 
         arguments?.getString(AUTOSEARCH_KEY)?.let {
-            quick_search?.setQuery(it, true)
+            binding?.quickSearch?.setQuery(it, true)
             arguments?.remove(AUTOSEARCH_KEY)
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
index 92cecc37..531cb5d2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
@@ -3,18 +3,16 @@ package com.lagradost.cloudstream3.ui.result
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.CastItemBinding
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.cast_item.view.*
 
-class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class ActorAdaptor(private val focusCallback : (View?) -> Unit = {}) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     data class ActorMetaData(
         var isInverted: Boolean,
         val actor: ActorData,
@@ -24,7 +22,7 @@ class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.cast_item, parent, false),
+            CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false), focusCallback
         )
     }
 
@@ -68,15 +66,10 @@ class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: CastItemBinding,
+        private val focusCallback : (View?) -> Unit = {}
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        private val actorImage: ImageView = itemView.actor_image
-        private val actorName: TextView = itemView.actor_name
-        private val actorExtra: TextView = itemView.actor_extra
-        private val voiceActorImage: ImageView = itemView.voice_actor_image
-        private val voiceActorImageHolder: View = itemView.voice_actor_image_holder
-        private val voiceActorName: TextView = itemView.voice_actor_name
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(actor: ActorData, isInverted: Boolean, position: Int, callback: (Int) -> Unit) {
             val (mainImg, vaImage) = if (!isInverted || actor.voiceActor?.image.isNullOrBlank()) {
@@ -85,43 +78,53 @@ class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                 Pair(actor.voiceActor?.image, actor.actor.image)
             }
 
+            itemView.setOnFocusChangeListener { v, hasFocus ->
+                if(hasFocus) {
+                    focusCallback(v)
+                }
+            }
+
             itemView.setOnClickListener {
                 callback(position)
             }
 
-            actorImage.setImage(mainImg)
+            binding.apply {
+                actorImage.setImage(mainImg)
 
-            actorName.text = actor.actor.name
-            actor.role?.let {
-                actorExtra.context?.getString(
-                    when (it) {
-                        ActorRole.Main -> {
-                            R.string.actor_main
-                        }
-                        ActorRole.Supporting -> {
-                            R.string.actor_supporting
-                        }
-                        ActorRole.Background -> {
-                            R.string.actor_background
+                actorName.text = actor.actor.name
+                actor.role?.let {
+                    actorExtra.context?.getString(
+                        when (it) {
+                            ActorRole.Main -> {
+                                R.string.actor_main
+                            }
+
+                            ActorRole.Supporting -> {
+                                R.string.actor_supporting
+                            }
+
+                            ActorRole.Background -> {
+                                R.string.actor_background
+                            }
                         }
+                    )?.let { text ->
+                        actorExtra.isVisible = true
+                        actorExtra.text = text
                     }
-                )?.let { text ->
+                } ?: actor.roleString?.let {
                     actorExtra.isVisible = true
-                    actorExtra.text = text
+                    actorExtra.text = it
+                } ?: run {
+                    actorExtra.isVisible = false
                 }
-            } ?: actor.roleString?.let {
-                actorExtra.isVisible = true
-                actorExtra.text = it
-            } ?: run {
-                actorExtra.isVisible = false
-            }
 
-            if (actor.voiceActor == null) {
-                voiceActorImageHolder.isVisible = false
-                voiceActorName.isVisible = false
-            } else {
-                voiceActorName.text = actor.voiceActor.name
-                voiceActorImageHolder.isVisible = voiceActorImage.setImage(vaImage)
+                if (actor.voiceActor == null) {
+                    voiceActorImageHolder.isVisible = false
+                    voiceActorName.isVisible = false
+                } else {
+                    voiceActorName.text = actor.voiceActor.name
+                    voiceActorImageHolder.isVisible = voiceActorImage.setImage(vaImage)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 0932b001..6b63e623 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -3,34 +3,24 @@ package com.lagradost.cloudstream3.ui.result
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.core.widget.ContentLoadingProgressBar
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ResultEpisodeBinding
+import com.lagradost.cloudstream3.databinding.ResultEpisodeLargeBinding
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
-import com.lagradost.cloudstream3.ui.download.DownloadButtonViewHolder
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
-import com.lagradost.cloudstream3.ui.download.EasyDownloadButton
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.result_episode.view.*
-import kotlinx.android.synthetic.main.result_episode.view.episode_text
-import kotlinx.android.synthetic.main.result_episode_large.view.*
-import kotlinx.android.synthetic.main.result_episode_large.view.episode_filler
-import kotlinx.android.synthetic.main.result_episode_large.view.episode_progress
-import kotlinx.android.synthetic.main.result_episode_large.view.result_episode_download
-import kotlinx.android.synthetic.main.result_episode_large.view.result_episode_progress_downloaded
 import java.util.*
 
 const val ACTION_PLAY_EPISODE_IN_PLAYER = 1
@@ -59,7 +49,8 @@ const val ACTION_PLAY_EPISODE_IN_WEB_VIDEO = 16
 const val ACTION_PLAY_EPISODE_IN_MPV = 17
 
 const val ACTION_MARK_AS_WATCHED = 18
-
+const val TV_EP_SIZE_LARGE = 400
+const val TV_EP_SIZE_SMALL = 300
 data class EpisodeClickEvent(val action: Int, val data: ResultEpisode)
 
 class EpisodeAdapter(
@@ -88,49 +79,10 @@ class EpisodeAdapter(
 
     var cardList: MutableList<ResultEpisode> = mutableListOf()
 
-    private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
-    private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
-        return Collections.unmodifiableSet(mBoundViewHolders)
-    }
-
-    fun killAdapter() {
-        getAllBoundViewHolders()?.forEach { view ->
-            view?.downloadButton?.dispose()
-        }
-    }
-
     override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
         if (holder.itemView.hasFocus()) {
             holder.itemView.clearFocus()
         }
-        //(holder.itemView as? FrameLayout?)?.descendantFocusability =
-        //    ViewGroup.FOCUS_BLOCK_DESCENDANTS
-
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-        }
-    }
-
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-            mBoundViewHolders.remove(holder)
-            //(holder.itemView as? FrameLayout?)?.descendantFocusability =
-            //    ViewGroup.FOCUS_BLOCK_DESCENDANTS
-        }
-    }
-
-    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            //println("onViewAttachedToWindow = ${holder.absoluteAdapterPosition}")
-            //holder.itemView.post {
-            //    if (holder.itemView.isAttachedToWindow)
-            //        (holder.itemView as? FrameLayout?)?.descendantFocusability =
-            //            ViewGroup.FOCUS_AFTER_DESCENDANTS
-            //}
-
-            holder.reattachDownloadButton()
-        }
     }
 
     fun updateList(newList: List<ResultEpisode>) {
@@ -144,27 +96,62 @@ class EpisodeAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    var layout = R.layout.result_episode_both
+    private fun getItem(position: Int): ResultEpisode {
+        return cardList[position]
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val item = getItem(position)
+        return if (item.poster.isNullOrBlank()) 0 else 1
+    }
+
+
+    // private val layout = R.layout.result_episode_both
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         /*val layout = if (cardList.filter { it.poster != null }.size >= cardList.size / 2)
             R.layout.result_episode_large
         else R.layout.result_episode*/
 
-        return EpisodeCardViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(layout, parent, false),
-            hasDownloadSupport,
-            clickCallback,
-            downloadClickCallback
-        )
+        return when (viewType) {
+            0 -> {
+                EpisodeCardViewHolderSmall(
+                    ResultEpisodeBinding.inflate(
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
+                    ),
+                    hasDownloadSupport,
+                    clickCallback,
+                    downloadClickCallback
+                )
+            }
+
+            1 -> {
+                EpisodeCardViewHolderLarge(
+                    ResultEpisodeLargeBinding.inflate(
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
+                    ),
+                    hasDownloadSupport,
+                    clickCallback,
+                    downloadClickCallback
+                )
+            }
+
+            else -> throw NotImplementedError()
+        }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is EpisodeCardViewHolder -> {
-                holder.bind(cardList[position])
-                mBoundViewHolders.add(holder)
+            is EpisodeCardViewHolderLarge -> {
+                holder.bind(getItem(position))
+            }
+
+            is EpisodeCardViewHolderSmall -> {
+                holder.bind(getItem(position))
             }
         }
     }
@@ -173,94 +160,108 @@ class EpisodeAdapter(
         return cardList.size
     }
 
-    class EpisodeCardViewHolder
+    class EpisodeCardViewHolderLarge
     constructor(
-        itemView: View,
+        val binding: ResultEpisodeLargeBinding,
         private val hasDownloadSupport: Boolean,
         private val clickCallback: (EpisodeClickEvent) -> Unit,
         private val downloadClickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView), DownloadButtonViewHolder {
-        override var downloadButton = EasyDownloadButton()
-
-        var episodeDownloadBar: ContentLoadingProgressBar? = null
-        var episodeDownloadImage: ImageView? = null
+    ) : RecyclerView.ViewHolder(binding.root) {
         var localCard: ResultEpisode? = null
 
         @SuppressLint("SetTextI18n")
         fun bind(card: ResultEpisode) {
             localCard = card
 
+            val setWidth =
+                if (isTvSettings()) TV_EP_SIZE_LARGE.toPx else ViewGroup.LayoutParams.MATCH_PARENT
+
+            binding.episodeLinHolder.layoutParams.width = setWidth
+            binding.episodeHolderLarge.layoutParams.width = setWidth
+            binding.episodeHolder.layoutParams.width = setWidth
+
             val isTrueTv = isTrueTvSettings()
 
-            val (parentView, otherView) = if (card.poster == null) {
-                itemView.episode_holder to itemView.episode_holder_large
-            } else {
-                itemView.episode_holder_large to itemView.episode_holder
-            }
-            parentView.isVisible = true
-            otherView.isVisible = false
+            binding.apply {
+                downloadButton.isVisible = hasDownloadSupport
+                downloadButton.setDefaultClickListener(
+                    VideoDownloadHelper.DownloadEpisodeCached(
+                        card.name,
+                        card.poster,
+                        card.episode,
+                        card.season,
+                        card.id,
+                        card.parentId,
+                        card.rating,
+                        card.description,
+                        System.currentTimeMillis(),
+                    ), null
+                ) {
+                    when (it.action) {
+                        DOWNLOAD_ACTION_DOWNLOAD -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
+                        }
 
-            val episodeText: TextView = parentView.episode_text
-            val episodeFiller: MaterialButton? = parentView.episode_filler
-            val episodeRating: TextView? = parentView.episode_rating
-            val episodeDescript: TextView? = parentView.episode_descript
-            val episodeProgress: ContentLoadingProgressBar? = parentView.episode_progress
-            val episodePoster: ImageView? = parentView.episode_poster
+                        DOWNLOAD_ACTION_LONG_CLICK -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, card))
+                        }
 
-            episodeDownloadBar =
-                parentView.result_episode_progress_downloaded
-            episodeDownloadImage = parentView.result_episode_download
-
-            val name =
-                if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
-            episodeFiller?.isVisible = card.isFiller == true
-            episodeText.text =
-                name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
-            episodeText.isSelected = true // is needed for text repeating
-
-            if (card.videoWatchState == VideoWatchState.Watched) {
-                // This cannot be done in getDisplayPosition() as when you have not watched something
-                // the duration and position is 0
-                episodeProgress?.max = 1
-                episodeProgress?.progress = 1
-                episodeProgress?.isVisible = true
-            } else {
-                val displayPos = card.getDisplayPosition()
-                episodeProgress?.max = (card.duration / 1000).toInt()
-                episodeProgress?.progress = (displayPos / 1000).toInt()
-                episodeProgress?.isVisible = displayPos > 0L
-            }
-
-            episodePoster?.isVisible = episodePoster?.setImage(card.poster) == true
-
-            if (card.rating != null) {
-                episodeRating?.text = episodeRating?.context?.getString(R.string.rated_format)
-                    ?.format(card.rating.toFloat() / 10f)
-            } else {
-                episodeRating?.text = ""
-            }
-
-            episodeRating?.isGone = episodeRating?.text.isNullOrBlank()
-
-            episodeDescript?.apply {
-                text = card.description.html()
-                isGone = text.isNullOrBlank()
-                setOnClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
-                }
-            }
-
-            if (!isTrueTv) {
-                episodePoster?.setOnClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                        else -> {
+                            downloadClickCallback.invoke(it)
+                        }
+                    }
                 }
 
-                episodePoster?.setOnLongClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_TOAST, card))
-                    return@setOnLongClickListener true
+                val name =
+                    if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
+                episodeFiller.isVisible = card.isFiller == true
+                episodeText.text =
+                    name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
+                episodeText.isSelected = true // is needed for text repeating
+
+                if (card.videoWatchState == VideoWatchState.Watched) {
+                    // This cannot be done in getDisplayPosition() as when you have not watched something
+                    // the duration and position is 0
+                    episodeProgress.max = 1
+                    episodeProgress.progress = 1
+                    episodeProgress.isVisible = true
+                } else {
+                    val displayPos = card.getDisplayPosition()
+                    episodeProgress.max = (card.duration / 1000).toInt()
+                    episodeProgress.progress = (displayPos / 1000).toInt()
+                    episodeProgress.isVisible = displayPos > 0L
+                }
+
+                episodePoster.isVisible = episodePoster.setImage(card.poster) == true
+
+                if (card.rating != null) {
+                    episodeRating.text = episodeRating.context?.getString(R.string.rated_format)
+                        ?.format(card.rating.toFloat() / 10f)
+                } else {
+                    episodeRating.text = ""
+                }
+
+                episodeRating.isGone = episodeRating.text.isNullOrBlank()
+
+                episodeDescript.apply {
+                    text = card.description.html()
+                    isGone = text.isNullOrBlank()
+                    setOnClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
+                    }
+                }
+
+                if (!isTrueTv) {
+                    episodePoster.setOnClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                    }
+
+                    episodePoster.setOnLongClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_TOAST, card))
+                        return@setOnLongClickListener true
+                    }
                 }
             }
-
             itemView.setOnClickListener {
                 clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
             }
@@ -276,29 +277,30 @@ class EpisodeAdapter(
                 return@setOnLongClickListener true
             }
 
-            episodeDownloadImage?.isVisible = hasDownloadSupport
-            episodeDownloadBar?.isVisible = hasDownloadSupport
-            reattachDownloadButton()
+            //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
+            //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
         }
+    }
 
-        override fun reattachDownloadButton() {
-            downloadButton.dispose()
-            val card = localCard
-            if (hasDownloadSupport && card != null) {
-                if (episodeDownloadBar == null ||
-                    episodeDownloadImage == null
-                ) return
-                val downloadInfo = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
-                    itemView.context,
-                    card.id
-                )
+    class EpisodeCardViewHolderSmall
+    constructor(
+        val binding: ResultEpisodeBinding,
+        private val hasDownloadSupport: Boolean,
+        private val clickCallback: (EpisodeClickEvent) -> Unit,
+        private val downloadClickCallback: (DownloadClickEvent) -> Unit,
+    ) : RecyclerView.ViewHolder(binding.root) {
+        @SuppressLint("SetTextI18n")
+        fun bind(card: ResultEpisode) {
+            val isTrueTv = isTrueTvSettings()
 
-                downloadButton.setUpButton(
-                    downloadInfo?.fileLength,
-                    downloadInfo?.totalBytes,
-                    episodeDownloadBar ?: return,
-                    episodeDownloadImage ?: return,
-                    null,
+            binding.episodeHolder.layoutParams.apply {
+                width =
+                    if (isTvSettings()) TV_EP_SIZE_SMALL.toPx else ViewGroup.LayoutParams.MATCH_PARENT
+            }
+
+            binding.apply {
+                downloadButton.isVisible = hasDownloadSupport
+                downloadButton.setDefaultClickListener(
                     VideoDownloadHelper.DownloadEpisodeCached(
                         card.name,
                         card.poster,
@@ -309,14 +311,60 @@ class EpisodeAdapter(
                         card.rating,
                         card.description,
                         System.currentTimeMillis(),
-                    )
+                    ), null
                 ) {
-                    if (it.action == DOWNLOAD_ACTION_DOWNLOAD) {
-                        clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
-                    } else {
-                        downloadClickCallback.invoke(it)
+                    when (it.action) {
+                        DOWNLOAD_ACTION_DOWNLOAD -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
+                        }
+
+                        DOWNLOAD_ACTION_LONG_CLICK -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, card))
+                        }
+
+                        else -> {
+                            downloadClickCallback.invoke(it)
+                        }
                     }
                 }
+
+                val name =
+                    if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
+                episodeFiller.isVisible = card.isFiller == true
+                episodeText.text =
+                    name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
+                episodeText.isSelected = true // is needed for text repeating
+
+                if (card.videoWatchState == VideoWatchState.Watched) {
+                    // This cannot be done in getDisplayPosition() as when you have not watched something
+                    // the duration and position is 0
+                    episodeProgress.max = 1
+                    episodeProgress.progress = 1
+                    episodeProgress.isVisible = true
+                } else {
+                    val displayPos = card.getDisplayPosition()
+                    episodeProgress.max = (card.duration / 1000).toInt()
+                    episodeProgress.progress = (displayPos / 1000).toInt()
+                    episodeProgress.isVisible = displayPos > 0L
+                }
+
+                itemView.setOnClickListener {
+                    clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                }
+
+                if (isTrueTv) {
+                    itemView.isFocusable = true
+                    itemView.isFocusableInTouchMode = true
+                    //itemView.touchscreenBlocksFocus = false
+                }
+
+                itemView.setOnLongClickListener {
+                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
+                    return@setOnLongClickListener true
+                }
+
+                //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
+                //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
index ebd6a658..ca2934ef 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
@@ -1,11 +1,10 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 
 /*
@@ -24,7 +23,6 @@ const val IMAGE_CLICK = 0
 const val IMAGE_LONG_CLICK = 1
 
 class ImageAdapter(
-    val layout: Int,
     val clickCallback: ((Int) -> Unit)? = null,
     val nextFocusUp: Int? = null,
     val nextFocusDown: Int? = null,
@@ -34,7 +32,9 @@ class ImageAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ImageViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false)
+            //result_mini_image
+            ResultMiniImageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+           // LayoutInflater.from(parent.context).inflate(layout, parent, false)
         )
     }
 
@@ -66,15 +66,15 @@ class ImageAdapter(
     }
 
     class ImageViewHolder
-    constructor(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+    constructor(val binding: ResultMiniImageBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         fun bind(
             img: Int,
             clickCallback: ((Int) -> Unit)?,
             nextFocusUp: Int?,
             nextFocusDown: Int?,
         ) {
-            (itemView as? ImageView?)?.apply {
+            binding.root.apply {
                 setImageResource(img)
                 if (nextFocusDown != null) {
                     this.nextFocusDownId = nextFocusDown
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
index affbcbb4..26cb7900 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,9 +8,10 @@ import com.lagradost.cloudstream3.mvvm.logError
 
 fun RecyclerView?.setLinearListLayout(isHorizontal: Boolean = true) {
     if (this == null) return
+
     this.layoutManager =
         this.context?.let { LinearListLayout(it).apply { if (isHorizontal) setHorizontal() else setVertical() } }
-            ?: this.layoutManager
+    //    ?: this.layoutManager
 }
 
 open class LinearListLayout(context: Context?) :
@@ -66,7 +67,12 @@ open class LinearListLayout(context: Context?) :
                 (focused.parent as? RecyclerView)?.focusSearch(direction)
                 return null
             }
-            if (direction == View.FOCUS_RIGHT) 1 else -1
+            var ret = if (direction == View.FOCUS_RIGHT) 1 else -1
+            // only flip on horizontal layout
+            if (this.isLayoutRTL) {
+                ret = -ret
+            }
+            ret
         } else {
             if (direction == View.FOCUS_RIGHT || direction == View.FOCUS_LEFT) return null
             if (direction == View.FOCUS_DOWN) 1 else -1
@@ -76,6 +82,13 @@ open class LinearListLayout(context: Context?) :
             getPosition(getCorrectParent(focused))?.let { position ->
                 val lookfor = dir + position
                 //clamp(dir + position, 0, recyclerView.adapter?.itemCount ?: return null)
+
+                // refocus on the same view if going out of bounds, note that we only do it
+                // for out of bounds one way as we may override the start where item == -1
+                if (lookfor >= itemCount) {
+                    return getViewFromPos(itemCount - 1) ?: focused
+                }
+
                 getViewFromPos(lookfor) ?: run {
                     scrollToPosition(lookfor)
                     null
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 5a3e28b4..7617bc11 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -1,112 +1,18 @@
 package com.lagradost.cloudstream3.ui.result
 
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.content.Intent.*
-import android.content.res.ColorStateList
-import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.text.Editable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AbsListView
-import android.widget.ArrayAdapter
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.widget.doOnTextChanged
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.RecyclerView
-import com.discord.panels.OverlappingPanelsLayout
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
-import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
-import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.mvvm.*
-import com.lagradost.cloudstream3.services.SubscriptionWorkManager
-import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
-import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
-import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
-import com.lagradost.cloudstream3.ui.download.EasyDownloadButton
-import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
-import com.lagradost.cloudstream3.utils.AppUtils.html
-import com.lagradost.cloudstream3.utils.AppUtils.loadCache
-import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
-import com.lagradost.cloudstream3.utils.Coroutines.ioWorkSafe
-import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getVideoWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_result.result_cast_items
-import kotlinx.android.synthetic.main.fragment_result.result_cast_text
-import kotlinx.android.synthetic.main.fragment_result.result_coming_soon
-import kotlinx.android.synthetic.main.fragment_result.result_data_holder
-import kotlinx.android.synthetic.main.fragment_result.result_description
-import kotlinx.android.synthetic.main.fragment_result.result_download_movie
-import kotlinx.android.synthetic.main.fragment_result.result_episode_loading
-import kotlinx.android.synthetic.main.fragment_result.result_episodes
-import kotlinx.android.synthetic.main.fragment_result.result_error_text
-import kotlinx.android.synthetic.main.fragment_result.result_finish_loading
-import kotlinx.android.synthetic.main.fragment_result.result_info
-import kotlinx.android.synthetic.main.fragment_result.result_loading
-import kotlinx.android.synthetic.main.fragment_result.result_loading_error
-import kotlinx.android.synthetic.main.fragment_result.result_meta_duration
-import kotlinx.android.synthetic.main.fragment_result.result_meta_rating
-import kotlinx.android.synthetic.main.fragment_result.result_meta_site
-import kotlinx.android.synthetic.main.fragment_result.result_meta_type
-import kotlinx.android.synthetic.main.fragment_result.result_meta_year
-import kotlinx.android.synthetic.main.fragment_result.result_movie_download_icon
-import kotlinx.android.synthetic.main.fragment_result.result_movie_download_text
-import kotlinx.android.synthetic.main.fragment_result.result_movie_download_text_precentage
-import kotlinx.android.synthetic.main.fragment_result.result_movie_progress_downloaded
-import kotlinx.android.synthetic.main.fragment_result.result_movie_progress_downloaded_holder
-import kotlinx.android.synthetic.main.fragment_result.result_next_airing
-import kotlinx.android.synthetic.main.fragment_result.result_next_airing_time
-import kotlinx.android.synthetic.main.fragment_result.result_no_episodes
-import kotlinx.android.synthetic.main.fragment_result.result_play_movie
-import kotlinx.android.synthetic.main.fragment_result.result_poster
-import kotlinx.android.synthetic.main.fragment_result.result_poster_holder
-import kotlinx.android.synthetic.main.fragment_result.result_reload_connection_open_in_browser
-import kotlinx.android.synthetic.main.fragment_result.result_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_result.result_resume_parent
-import kotlinx.android.synthetic.main.fragment_result.result_resume_progress_holder
-import kotlinx.android.synthetic.main.fragment_result.result_resume_series_progress
-import kotlinx.android.synthetic.main.fragment_result.result_resume_series_progress_text
-import kotlinx.android.synthetic.main.fragment_result.result_resume_series_title
-import kotlinx.android.synthetic.main.fragment_result.result_tag
-import kotlinx.android.synthetic.main.fragment_result.result_tag_holder
-import kotlinx.android.synthetic.main.fragment_result.result_title
-import kotlinx.android.synthetic.main.fragment_result.result_vpn
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
-import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.result_sync.*
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
+import com.lagradost.cloudstream3.utils.Event
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -206,286 +112,113 @@ fun ResultEpisode.getWatchProgress(): Float {
     return (getDisplayPosition() / 1000).toFloat() / (duration / 1000).toFloat()
 }
 
-open class ResultFragment : ResultTrailerPlayer() {
-    companion object {
-        const val URL_BUNDLE = "url"
-        const val API_NAME_BUNDLE = "apiName"
-        const val SEASON_BUNDLE = "season"
-        const val EPISODE_BUNDLE = "episode"
-        const val START_ACTION_BUNDLE = "startAction"
-        const val START_VALUE_BUNDLE = "startValue"
-        const val RESTART_BUNDLE = "restart"
+object ResultFragment {
+    private const val URL_BUNDLE = "url"
+    private const val API_NAME_BUNDLE = "apiName"
+    private const val SEASON_BUNDLE = "season"
+    private const val EPISODE_BUNDLE = "episode"
+    private const val START_ACTION_BUNDLE = "startAction"
+    private const val START_VALUE_BUNDLE = "startValue"
+    private const val RESTART_BUNDLE = "restart"
 
-        fun newInstance(
-            card: SearchResponse, startAction: Int = 0, startValue: Int? = null
-        ): Bundle {
-            return Bundle().apply {
-                putString(URL_BUNDLE, card.url)
-                putString(API_NAME_BUNDLE, card.apiName)
-                if (card is DataStoreHelper.ResumeWatchingResult) {
-                    if (card.season != null)
-                        putInt(SEASON_BUNDLE, card.season)
-                    if (card.episode != null)
-                        putInt(EPISODE_BUNDLE, card.episode)
-                }
-                putInt(START_ACTION_BUNDLE, startAction)
-                if (startValue != null)
-                    putInt(START_VALUE_BUNDLE, startValue)
-
-
-                putBoolean(RESTART_BUNDLE, true)
+    fun newInstance(
+        card: SearchResponse, startAction: Int = 0, startValue: Int? = null
+    ): Bundle {
+        return Bundle().apply {
+            putString(URL_BUNDLE, card.url)
+            putString(API_NAME_BUNDLE, card.apiName)
+            if (card is DataStoreHelper.ResumeWatchingResult) {
+                if (card.season != null)
+                    putInt(SEASON_BUNDLE, card.season)
+                if (card.episode != null)
+                    putInt(EPISODE_BUNDLE, card.episode)
             }
-        }
-
-        fun newInstance(
-            url: String,
-            apiName: String,
-            startAction: Int = 0,
-            startValue: Int = 0
-        ): Bundle {
-            return Bundle().apply {
-                putString(URL_BUNDLE, url)
-                putString(API_NAME_BUNDLE, apiName)
-                putInt(START_ACTION_BUNDLE, startAction)
+            putInt(START_ACTION_BUNDLE, startAction)
+            if (startValue != null)
                 putInt(START_VALUE_BUNDLE, startValue)
-                putBoolean(RESTART_BUNDLE, true)
-            }
-        }
 
-        fun updateUI() {
-            updateUIListener?.invoke()
-        }
 
-        private var updateUIListener: (() -> Unit)? = null
-    }
-
-    open fun setTrailers(trailers: List<ExtractorLink>?) {}
-
-    protected lateinit var viewModel: ResultViewModel2 //by activityViewModels()
-    protected lateinit var syncModel: SyncViewModel
-    protected open val resultLayout = R.layout.fragment_result_swipe
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        viewModel =
-            ViewModelProvider(this)[ResultViewModel2::class.java]
-        syncModel =
-            ViewModelProvider(this)[SyncViewModel::class.java]
-
-        return inflater.inflate(resultLayout, container, false)
-    }
-
-    private var downloadButton: EasyDownloadButton? = null
-    override fun onDestroyView() {
-        updateUIListener = null
-        (result_episodes?.adapter as? EpisodeAdapter)?.killAdapter()
-        downloadButton?.dispose()
-
-        super.onDestroyView()
-    }
-
-    override fun onResume() {
-        afterPluginsLoadedEvent += ::reloadViewModel
-        super.onResume()
-        activity?.let {
-            it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.primaryBlackBackground)
+            putBoolean(RESTART_BUNDLE, true)
         }
     }
 
-    override fun onDestroy() {
-        afterPluginsLoadedEvent -= ::reloadViewModel
-        super.onDestroy()
-    }
-
-    /// 0 = LOADING, 1 = ERROR LOADING, 2 = LOADED
-    private fun updateVisStatus(state: Int) {
-        when (state) {
-            0 -> {
-                result_bookmark_fab?.isGone = true
-                result_loading?.isVisible = true
-                result_finish_loading?.isVisible = false
-                result_loading_error?.isVisible = false
-            }
-            1 -> {
-                result_bookmark_fab?.isGone = true
-                result_loading?.isVisible = false
-                result_finish_loading?.isVisible = false
-                result_loading_error?.isVisible = true
-                result_reload_connection_open_in_browser?.isVisible = true
-            }
-            2 -> {
-                result_bookmark_fab?.isGone = isTrueTvSettings()
-                result_bookmark_fab?.extend()
-                //if (result_bookmark_button?.context?.isTrueTvSettings() == true) {
-                //    when {
-                //        result_play_movie?.isVisible == true -> {
-                //            result_play_movie?.requestFocus()
-                //        }
-                //        result_resume_series_button?.isVisible == true -> {
-                //            result_resume_series_button?.requestFocus()
-                //        }
-                //        else -> {
-                //            result_bookmark_button?.requestFocus()
-                //        }
-                //    }
-                //}
-
-                result_loading?.isVisible = false
-                result_finish_loading?.isVisible = true
-                result_loading_error?.isVisible = false
-            }
+    fun newInstance(
+        url: String,
+        apiName: String,
+        startAction: Int = 0,
+        startValue: Int = 0
+    ): Bundle {
+        return Bundle().apply {
+            putString(URL_BUNDLE, url)
+            putString(API_NAME_BUNDLE, apiName)
+            putInt(START_ACTION_BUNDLE, startAction)
+            putInt(START_VALUE_BUNDLE, startValue)
+            putBoolean(RESTART_BUNDLE, true)
         }
     }
 
-    open fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
-
+    fun updateUI(id: Int? = null) {
+       // updateUIListener?.invoke()
+        updateUIEvent.invoke(id)
     }
+    val updateUIEvent = Event<Int?>()
 
-    private fun updateUI() {
-        syncModel.updateUserData()
-        viewModel.reloadEpisodes()
-    }
+    //private var updateUIListener: (() -> Unit)? = null
 
-    open fun updateMovie(data: ResourceSome<Pair<UiText, ResultEpisode>>) {
-        when (data) {
-            is ResourceSome.Success -> {
-                data.value.let { (text, ep) ->
-                    result_play_movie.setText(text)
-                    result_play_movie?.setOnClickListener {
-                        viewModel.handleAction(
-                            activity,
-                            EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
-                        )
-                    }
-                    result_play_movie?.setOnLongClickListener {
-                        viewModel.handleAction(
-                            activity,
-                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
-                        )
-                        return@setOnLongClickListener true
-                    }
 
-                    main {
-                        val file =
-                            ioWorkSafe {
-                                context?.let {
-                                    VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
-                                        it,
-                                        ep.id
-                                    )
-                                }
-                            }
+    //protected open val resultLayout = R.layout.fragment_result_swipe
 
-                        downloadButton?.dispose()
-                        downloadButton = EasyDownloadButton()
-                        downloadButton?.setUpMoreButton(
-                            file?.fileLength,
-                            file?.totalBytes,
-                            result_movie_progress_downloaded ?: return@main,
-                            result_movie_download_icon ?: return@main,
-                            result_movie_download_text ?: return@main,
-                            result_movie_download_text_precentage ?: return@main,
-                            result_download_movie ?: return@main,
-                            true,
-                            VideoDownloadHelper.DownloadEpisodeCached(
-                                ep.name,
-                                ep.poster,
-                                0,
-                                null,
-                                ep.id,
-                                ep.id,
-                                null,
-                                null,
-                                System.currentTimeMillis(),
-                            )
-                        ) { click ->
-                            when (click.action) {
-                                DOWNLOAD_ACTION_DOWNLOAD -> {
-                                    viewModel.handleAction(
-                                        activity,
-                                        EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
-                                    )
-                                }
-                                else -> handleDownloadClick(activity, click)
-                            }
-                        }
-                        result_movie_progress_downloaded_holder?.isVisible = true
-                    }
-                }
-            }
-            else -> {
-                result_movie_progress_downloaded_holder?.isVisible = false
-                result_play_movie?.isVisible = false
-            }
-        }
-    }
+    /* override var layout = R.layout.fragment_result_swipe
 
-    open fun updateEpisodes(episodes: ResourceSome<List<ResultEpisode>>) {
-        when (episodes) {
-            is ResourceSome.None -> {
-                result_episode_loading?.isVisible = false
-                result_episodes?.isVisible = false
-            }
-            is ResourceSome.Loading -> {
-                result_episode_loading?.isVisible = true
-                result_episodes?.isVisible = false
-            }
-            is ResourceSome.Success -> {
-                result_episodes?.isVisible = true
-                result_episode_loading?.isVisible = false
+     override fun onCreateView(
+         inflater: LayoutInflater,
+         container: ViewGroup?,
+         savedInstanceState: Bundle?,
+     ): View? {
 
-                /*
-                 * Okay so what is this fuckery?
-                 * Basically Android TV will crash if you request a new focus while
-                 * the adapter gets updated.
-                 *
-                 * This means that if you load thumbnails and request a next focus at the same time
-                 * the app will crash without any way to catch it!
-                 *
-                 * How to bypass this?
-                 * This code basically steals the focus for 500ms and puts it in an inescapable view
-                 * then lets out the focus by requesting focus to result_episodes
-                 */
+         return super.onCreateView(inflater, container, savedInstanceState)
+         //return inflater.inflate(resultLayout, container, false)
+     }
 
-                // Do not use this.isTv, that is the player
-                val isTv = isTvSettings()
-                val hasEpisodes =
-                    !(result_episodes?.adapter as? EpisodeAdapter?)?.cardList.isNullOrEmpty()
+     override fun onDestroyView() {
+         updateUIListener = null
+         super.onDestroyView()
+     }
 
-                if (isTv && hasEpisodes) {
-                    // Make it impossible to focus anywhere else!
-                    temporary_no_focus?.isFocusable = true
-                    temporary_no_focus?.requestFocus()
-                }
+     override fun onResume() {
+         afterPluginsLoadedEvent += ::reloadViewModel
+         super.onResume()
+         activity?.let {
+             it.window?.navigationBarColor =
+                 it.colorFromAttribute(R.attr.primaryBlackBackground)
+         }
+     }
 
-                (result_episodes?.adapter as? EpisodeAdapter)?.updateList(episodes.value)
+     override fun onDestroy() {
+         afterPluginsLoadedEvent -= ::reloadViewModel
+         super.onDestroy()
+     }
 
-                if (isTv && hasEpisodes) main {
-                    delay(500)
-                    temporary_no_focus?.isFocusable = false
-                    // This might make some people sad as it changes the focus when leaving an episode :(
-                    result_episodes?.requestFocus()
-                }
-            }
-        }
-    }
+
+     private fun updateUI() {
+         syncModel.updateUserData()
+         viewModel.reloadEpisodes()
+     }*/
 
     data class StoredData(
-        val url: String?,
+        val url: String,
         val apiName: String,
         val showFillers: Boolean,
         val dubStatus: DubStatus,
         val start: AutoResume?,
-        val playerAction: Int
+        val playerAction: Int,
+        val restart : Boolean,
     )
 
-    private fun getStoredData(context: Context): StoredData? {
+    fun Fragment.getStoredData(): StoredData? {
+        val context = this.context ?: this.activity ?: return null
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-        val url = arguments?.getString(URL_BUNDLE)
+        val url = arguments?.getString(URL_BUNDLE) ?: return null
         val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return null
         val showFillers =
             settingsManager.getBoolean(context.getString(R.string.show_fillers_key), false)
@@ -496,6 +229,11 @@ open class ResultFragment : ResultTrailerPlayer() {
 
         val playerAction = getPlayerAction(context)
 
+        val restart = arguments?.getBoolean(RESTART_BUNDLE) ?: false
+        if (restart) {
+            arguments?.putBoolean(RESTART_BUNDLE, false)
+        }
+
         val start = startAction?.let { action ->
             val startValue = arguments?.getInt(START_VALUE_BUNDLE)
             val resumeEpisode = arguments?.getInt(EPISODE_BUNDLE)
@@ -510,10 +248,10 @@ open class ResultFragment : ResultTrailerPlayer() {
                 season = resumeSeason
             )
         }
-        return StoredData(url, apiName, showFillers, dubStatus, start, playerAction)
+        return StoredData(url, apiName, showFillers, dubStatus, start, playerAction, restart)
     }
 
-    private fun reloadViewModel(forceReload: Boolean) {
+    /*private fun reloadViewModel(forceReload: Boolean) {
         if (!viewModel.hasLoaded() || forceReload) {
             val storedData = getStoredData(activity ?: context ?: return) ?: return
 
@@ -532,26 +270,6 @@ open class ResultFragment : ResultTrailerPlayer() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        result_cast_items?.layoutManager = object : LinearListLayout(view.context) {
-            override fun onRequestChildFocus(
-                parent: RecyclerView,
-                state: RecyclerView.State,
-                child: View,
-                focused: View?
-            ): Boolean {
-                // Make the cast always focus the first visible item when focused
-                // from somewhere else. Otherwise it jumps to the last item.
-                return if (parent.focusedChild == null) {
-                    scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
-                    true
-                } else {
-                    super.onRequestChildFocus(parent, state, child, focused)
-                }
-            }
-        }.apply {
-            this.orientation = RecyclerView.HORIZONTAL
-        }
-        result_cast_items?.adapter = ActorAdaptor()
 
         updateUIListener = ::updateUI
 
@@ -565,7 +283,6 @@ open class ResultFragment : ResultTrailerPlayer() {
         context?.updateHasTrailers()
         activity?.loadCache()
 
-        activity?.fixPaddingStatusbar(result_top_bar)
         //activity?.fixPaddingStatusbar(result_barstatus)
 
         /* val backParameter = result_back.layoutParams as FrameLayout.LayoutParams
@@ -582,533 +299,13 @@ open class ResultFragment : ResultTrailerPlayer() {
         val storedData = (activity ?: context)?.let {
             getStoredData(it)
         }
-        syncModel.addFromUrl(storedData?.url)
-
-        val api = getApiFromNameNull(storedData?.apiName)
-
-        result_episodes?.adapter =
-            EpisodeAdapter(
-                api?.hasDownloadSupport == true,
-                { episodeClick ->
-                    viewModel.handleAction(activity, episodeClick)
-                },
-                { downloadClickEvent ->
-                    handleDownloadClick(activity, downloadClickEvent)
-                }
-            )
-
-
-        observe(viewModel.episodeSynopsis) { description ->
-            view.context?.let { ctx ->
-                val builder: AlertDialog.Builder =
-                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                builder.setMessage(description.html())
-                    .setTitle(R.string.synopsis)
-                    .setOnDismissListener {
-                        viewModel.releaseEpisodeSynopsis()
-                    }
-                    .show()
-            }
-        }
-
-        observe(viewModel.watchStatus) { watchType ->
-            result_bookmark_button?.text = getString(watchType.stringRes)
-            result_bookmark_fab?.text = getString(watchType.stringRes)
-
-            if (watchType == WatchType.NONE) {
-                result_bookmark_fab?.context?.colorFromAttribute(R.attr.white)
-            } else {
-                result_bookmark_fab?.context?.colorFromAttribute(R.attr.colorPrimary)
-            }?.let {
-                val colorState = ColorStateList.valueOf(it)
-                result_bookmark_fab?.iconTint = colorState
-                result_bookmark_fab?.setTextColor(colorState)
-            }
-
-            result_bookmark_fab?.setOnClickListener { fab ->
-                activity?.showBottomDialog(
-                    WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
-                    watchType.ordinal,
-                    fab.context.getString(R.string.action_add_to_bookmarks),
-                    showApply = false,
-                    {}) {
-                    viewModel.updateWatchStatus(WatchType.values()[it])
-                }
-            }
-
-            result_bookmark_button?.setOnClickListener { fab ->
-                activity?.showBottomDialog(
-                    WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
-                    watchType.ordinal,
-                    fab.context.getString(R.string.action_add_to_bookmarks),
-                    showApply = false,
-                    {}) {
-                    viewModel.updateWatchStatus(WatchType.values()[it])
-                }
-            }
-        }
 
         // This is to band-aid FireTV navigation
         val isTv = isTvSettings()
         result_season_button?.isFocusableInTouchMode = isTv
         result_episode_select?.isFocusableInTouchMode = isTv
         result_dub_select?.isFocusableInTouchMode = isTv
-
-        context?.let { ctx ->
-            val arrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
-            /*
-            -1 -> None
-            0 -> Watching
-            1 -> Completed
-            2 -> OnHold
-            3 -> Dropped
-            4 -> PlanToWatch
-            5 -> ReWatching
-            */
-            val items = listOf(
-                R.string.none,
-                R.string.type_watching,
-                R.string.type_completed,
-                R.string.type_on_hold,
-                R.string.type_dropped,
-                R.string.type_plan_to_watch,
-                R.string.type_re_watching
-            ).map { ctx.getString(it) }
-            arrayAdapter.addAll(items)
-            result_sync_check?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-            result_sync_check?.adapter = arrayAdapter
-            UIHelper.setListViewHeightBasedOnItems(result_sync_check)
-
-            result_sync_check?.setOnItemClickListener { _, _, which, _ ->
-                syncModel.setStatus(which - 1)
-            }
-
-            result_sync_rating?.addOnChangeListener { _, value, _ ->
-                syncModel.setScore(value.toInt())
-            }
-
-            result_sync_add_episode?.setOnClickListener {
-                syncModel.setEpisodesDelta(1)
-            }
-
-            result_sync_sub_episode?.setOnClickListener {
-                syncModel.setEpisodesDelta(-1)
-            }
-
-            result_sync_current_episodes?.doOnTextChanged { text, _, before, count ->
-                if (count == before) return@doOnTextChanged
-                text?.toString()?.toIntOrNull()?.let { ep ->
-                    syncModel.setEpisodes(ep)
-                }
-            }
-        }
-
-        observe(syncModel.synced) { list ->
-            result_sync_names?.text =
-                list.filter { it.isSynced && it.hasAccount }.joinToString { it.name }
-
-            val newList = list.filter { it.isSynced && it.hasAccount }
-
-            result_mini_sync?.isVisible = newList.isNotEmpty()
-            (result_mini_sync?.adapter as? ImageAdapter)?.updateList(newList.mapNotNull { it.icon })
-        }
-
-        var currentSyncProgress = 0
-
-        fun setSyncMaxEpisodes(totalEpisodes: Int?) {
-            result_sync_episodes?.max = (totalEpisodes ?: 0) * 1000
-
-            normalSafeApiCall {
-                val ctx = result_sync_max_episodes?.context
-                result_sync_max_episodes?.text =
-                    totalEpisodes?.let { episodes ->
-                        ctx?.getString(R.string.sync_total_episodes_some)?.format(episodes)
-                    } ?: run {
-                        ctx?.getString(R.string.sync_total_episodes_none)
-                    }
-            }
-        }
-
-        observe(syncModel.metadata) { meta ->
-            when (meta) {
-                is Resource.Success -> {
-                    val d = meta.value
-                    result_sync_episodes?.progress = currentSyncProgress * 1000
-                    setSyncMaxEpisodes(d.totalEpisodes)
-
-                    viewModel.setMeta(d, syncModel.getSyncs())
-                }
-                is Resource.Loading -> {
-                    result_sync_max_episodes?.text =
-                        result_sync_max_episodes?.context?.getString(R.string.sync_total_episodes_none)
-                }
-                else -> {}
-            }
-        }
-
-        observe(syncModel.userData) { status ->
-            var closed = false
-            when (status) {
-                is Resource.Failure -> {
-                    result_sync_loading_shimmer?.stopShimmer()
-                    result_sync_loading_shimmer?.isVisible = false
-                    result_sync_holder?.isVisible = false
-                    closed = true
-                }
-                is Resource.Loading -> {
-                    result_sync_loading_shimmer?.startShimmer()
-                    result_sync_loading_shimmer?.isVisible = true
-                    result_sync_holder?.isVisible = false
-                }
-                is Resource.Success -> {
-                    result_sync_loading_shimmer?.stopShimmer()
-                    result_sync_loading_shimmer?.isVisible = false
-                    result_sync_holder?.isVisible = true
-
-                    val d = status.value
-                    result_sync_rating?.value = d.score?.toFloat() ?: 0.0f
-                    result_sync_check?.setItemChecked(d.status + 1, true)
-                    val watchedEpisodes = d.watchedEpisodes ?: 0
-                    currentSyncProgress = watchedEpisodes
-
-                    d.maxEpisodes?.let {
-                        // don't directly call it because we don't want to override metadata observe
-                        setSyncMaxEpisodes(it)
-                    }
-
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        result_sync_episodes?.setProgress(watchedEpisodes * 1000, true)
-                    } else {
-                        result_sync_episodes?.progress = watchedEpisodes * 1000
-                    }
-                    result_sync_current_episodes?.text =
-                        Editable.Factory.getInstance()?.newEditable(watchedEpisodes.toString())
-                    normalSafeApiCall { // format might fail
-                        context?.getString(R.string.sync_score_format)?.format(d.score ?: 0)?.let {
-                            result_sync_score_text?.text = it
-                        }
-                    }
-                }
-                null -> {
-                    closed = false
-                }
-            }
-            result_overlapping_panels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
-        }
-
-        observe(viewModel.resumeWatching) { resume ->
-            when (resume) {
-                is Some.Success -> {
-                    result_resume_parent?.isVisible = true
-                    val value = resume.value
-                    value.progress?.let { progress ->
-                        result_resume_series_title?.apply {
-                            isVisible = !value.isMovie
-                            text =
-                                if (value.isMovie) null else activity?.getNameFull(
-                                    value.result.name,
-                                    value.result.episode,
-                                    value.result.season
-                                )
-                        }
-                        result_resume_series_progress_text.setText(progress.progressLeft)
-                        result_resume_series_progress?.apply {
-                            isVisible = true
-                            this.max = progress.maxProgress
-                            this.progress = progress.progress
-                        }
-                        result_resume_progress_holder?.isVisible = true
-                    } ?: run {
-                        result_resume_progress_holder?.isVisible = false
-                        result_resume_series_progress?.isVisible = false
-                        result_resume_series_title?.isVisible = false
-                        result_resume_series_progress_text?.isVisible = false
-                    }
-
-                    result_resume_series_button?.isVisible = !value.isMovie
-                    result_resume_series_button_play?.isVisible = !value.isMovie
-
-                    val click = View.OnClickListener {
-                        viewModel.handleAction(
-                            activity,
-                            EpisodeClickEvent(
-                                storedData?.playerAction ?: ACTION_PLAY_EPISODE_IN_PLAYER,
-                                value.result
-                            )
-                        )
-                    }
-
-                    result_resume_series_button?.setOnClickListener(click)
-                    result_resume_series_button_play?.setOnClickListener(click)
-                }
-                is Some.None -> {
-                    result_resume_parent?.isVisible = false
-                }
-            }
-        }
-
-        observe(viewModel.episodes) { episodes ->
-            updateEpisodes(episodes)
-        }
-
-        result_cast_items?.setOnFocusChangeListener { _, hasFocus ->
-            // Always escape focus
-            if (hasFocus) result_bookmark_button?.requestFocus()
-        }
-
-        result_sync_set_score?.setOnClickListener {
-            syncModel.publishUserData()
-        }
-
-        observe(viewModel.trailers) { trailers ->
-            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
-        }
-
-        observe(viewModel.recommendations) { recommendations ->
-            setRecommendations(recommendations, null)
-        }
-
-        observe(viewModel.movie) { data ->
-            updateMovie(data)
-        }
-
-        observe(viewModel.page) { data ->
-            if (data == null) return@observe
-            when (data) {
-                is Resource.Success -> {
-                    val d = data.value
-
-                    updateVisStatus(2)
-
-                    result_vpn.setText(d.vpnText)
-                    result_info.setText(d.metaText)
-                    result_no_episodes.setText(d.noEpisodesFoundText)
-                    result_title.setText(d.titleText)
-                    result_meta_site.setText(d.apiName)
-                    result_meta_type.setText(d.typeText)
-                    result_meta_year.setText(d.yearText)
-                    result_meta_duration.setText(d.durationText)
-                    result_meta_rating.setText(d.ratingText)
-                    result_cast_text.setText(d.actorsText)
-                    result_next_airing.setText(d.nextAiringEpisode)
-                    result_next_airing_time.setText(d.nextAiringDate)
-                    result_poster.setImage(d.posterImage)
-                    result_poster_background.setImage(d.posterBackgroundImage)
-                    //result_trailer_thumbnail.setImage(d.posterBackgroundImage, fadeIn = false)
-
-                    if (d.posterImage != null && !isTrueTvSettings())
-                        result_poster_holder?.setOnClickListener {
-                            try {
-                                context?.let { ctx ->
-                                    runBlocking {
-                                        val sourceBuilder = AlertDialog.Builder(ctx)
-                                        sourceBuilder.setView(R.layout.result_poster)
-
-                                        val sourceDialog = sourceBuilder.create()
-                                        sourceDialog.show()
-
-                                        sourceDialog.findViewById<ImageView?>(R.id.imgPoster)
-                                            ?.apply {
-                                                setImage(d.posterImage)
-                                                setOnClickListener {
-                                                    sourceDialog.dismissSafe()
-                                                }
-                                            }
-                                    }
-                                }
-                            } catch (e: Exception) {
-                                logError(e)
-                            }
-                        }
-
-
-                    result_cast_items?.isVisible = d.actors != null
-                    (result_cast_items?.adapter as? ActorAdaptor)?.apply {
-                        updateList(d.actors ?: emptyList())
-                    }
-
-                    observeNullable(viewModel.subscribeStatus) { isSubscribed ->
-                        result_subscribe?.isVisible = isSubscribed != null
-                        if (isSubscribed == null) return@observeNullable
-
-                        val drawable = if (isSubscribed) {
-                            R.drawable.ic_baseline_notifications_active_24
-                        } else {
-                            R.drawable.baseline_notifications_none_24
-                        }
-
-                        result_subscribe?.setImageResource(drawable)
-                    }
-
-                    result_subscribe?.setOnClickListener {
-                        val isSubscribed =
-                            viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
-
-                        val message = if (isSubscribed) {
-                            // Kinda icky to have this here, but it works.
-                            SubscriptionWorkManager.enqueuePeriodicWork(context)
-                            R.string.subscription_new
-                        } else {
-                            R.string.subscription_deleted
-                        }
-
-                        val name = (viewModel.page.value as? Resource.Success)?.value?.title
-                            ?: txt(R.string.no_data).asStringNull(context) ?: ""
-                        showToast(activity, txt(message, name), Toast.LENGTH_SHORT)
-                    }
-
-                    result_open_in_browser?.isVisible = d.url.startsWith("http")
-                    result_open_in_browser?.setOnClickListener {
-                        val i = Intent(ACTION_VIEW)
-                        i.data = Uri.parse(d.url)
-                        try {
-                            startActivity(i)
-                        } catch (e: Exception) {
-                            logError(e)
-                        }
-                    }
-
-                    result_search?.setOnClickListener {
-                        QuickSearchFragment.pushSearch(activity, d.title)
-                    }
-
-                    result_share?.setOnClickListener {
-                        try {
-                            val i = Intent(ACTION_SEND)
-                            i.type = "text/plain"
-                            i.putExtra(EXTRA_SUBJECT, d.title)
-                            i.putExtra(EXTRA_TEXT, d.url)
-                            startActivity(createChooser(i, d.title))
-                        } catch (e: Exception) {
-                            logError(e)
-                        }
-                    }
-
-                    if (syncModel.addSyncs(d.syncData)) {
-                        syncModel.updateMetaAndUser()
-                        syncModel.updateSynced()
-                    } else {
-                        syncModel.addFromUrl(d.url)
-                    }
-
-                    result_description.setTextHtml(d.plotText)
-                    if (this !is ResultFragmentTv) // dont want this clickable on tv layout
-                        result_description?.setOnClickListener { view ->
-                            view.context?.let { ctx ->
-                                val builder: AlertDialog.Builder =
-                                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                                builder.setMessage(d.plotText.asString(ctx).html())
-                                    .setTitle(d.plotHeaderText.asString(ctx))
-                                    .show()
-                            }
-                        }
-
-
-                    d.comingSoon.let { soon ->
-                        result_coming_soon?.isVisible = soon
-                        result_data_holder?.isGone = soon
-                    }
-
-                    val tags = d.tags
-                    result_tag_holder?.isVisible = tags.isNotEmpty()
-                    result_tag?.apply {
-                        removeAllViews()
-                        tags.forEach { tag ->
-                            val chip = Chip(context)
-                            val chipDrawable = ChipDrawable.createFromAttributes(
-                                context,
-                                null,
-                                0,
-                                R.style.ChipFilled
-                            )
-                            chip.setChipDrawable(chipDrawable)
-                            chip.text = tag
-                            chip.isChecked = false
-                            chip.isCheckable = false
-                            chip.isFocusable = false
-                            chip.isClickable = false
-                            chip.setTextColor(context.colorFromAttribute(R.attr.textColor))
-                            addView(chip)
-                        }
-                    }
-                    // if (tags.isNotEmpty()) {
-                    //result_tag_holder?.visibility = VISIBLE
-                    //val isOnTv = isTrueTvSettings()
-
-
-                    /*for ((index, tag) in tags.withIndex()) {
-                            val viewBtt = layoutInflater.inflate(R.layout.result_tag, null)
-                            val btt = viewBtt.findViewById<MaterialButton>(R.id.result_tag_card)
-                            btt.text = tag
-                            btt.isFocusable = !isOnTv
-                            btt.isClickable = !isOnTv
-                            result_tag?.addView(viewBtt, index)
-                        }*/
-                    //}
-                }
-                is Resource.Failure -> {
-                    result_error_text.text = storedData?.url?.plus("\n") + data.errorString
-                    updateVisStatus(1)
-                }
-                is Resource.Loading -> {
-                    updateVisStatus(0)
-                }
-            }
-        }
-
-        context?.let { ctx ->
-
-            //result_bookmark_button?.isVisible = ctx.isTvSettings()
-
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
-
-
-            Kitsu.isEnabled =
-                settingsManager.getBoolean(ctx.getString(R.string.show_kitsu_posters_key), true)
-
             if (storedData?.url != null) {
-                result_reload_connectionerror.setOnClickListener {
-                    viewModel.load(
-                        activity,
-                        storedData.url,
-                        storedData.apiName,
-                        storedData.showFillers,
-                        storedData.dubStatus,
-                        storedData.start
-                    )
-                }
-
-                result_reload_connection_open_in_browser?.setOnClickListener {
-                    val i = Intent(ACTION_VIEW)
-                    i.data = Uri.parse(storedData.url)
-                    try {
-                        startActivity(i)
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
-                }
-
-                result_open_in_browser?.isVisible = storedData.url.startsWith("http")
-                result_open_in_browser?.setOnClickListener {
-                    val i = Intent(ACTION_VIEW)
-                    i.data = Uri.parse(storedData.url)
-                    try {
-                        startActivity(i)
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
-                }
-
-                // bloats the navigation on tv
-                if (!isTrueTvSettings()) {
-                    result_meta_site?.setOnClickListener {
-                        it.context?.openBrowser(storedData.url)
-                    }
-                    result_meta_site?.isFocusable = true
-                } else {
-                    result_meta_site?.isFocusable = false
-                }
-
                 if (restart || !viewModel.hasLoaded()) {
                     //viewModel.clear()
                     viewModel.load(
@@ -1121,6 +318,5 @@ open class ResultFragment : ResultTrailerPlayer() {
                     )
                 }
             }
-        }
-    }
+    }*/
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 2f232995..e1514d63 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -1,56 +1,121 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.annotation.SuppressLint
 import android.app.Dialog
+import android.content.Intent
+import android.content.res.ColorStateList
 import android.graphics.Rect
+import android.os.Build
 import android.os.Bundle
+import android.text.Editable
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.DecelerateInterpolator
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.RecyclerView
 import com.discord.panels.OverlappingPanelsLayout
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.CastState
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
-import com.lagradost.cloudstream3.mvvm.Some
+import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.FragmentResultBinding
+import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
+import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
+import com.lagradost.cloudstream3.databinding.ResultSyncBinding
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.services.SubscriptionWorkManager
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
+import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
+import com.lagradost.cloudstream3.ui.player.FullScreenPlayer
+import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
+import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
+import com.lagradost.cloudstream3.utils.AppUtils.isLtr
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
+import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
+import com.lagradost.cloudstream3.utils.UIHelper
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_result.result_cast_items
-import kotlinx.android.synthetic.main.fragment_result.result_episodes_text
-import kotlinx.android.synthetic.main.fragment_result.result_resume_parent
-import kotlinx.android.synthetic.main.fragment_result.result_scroll
-import kotlinx.android.synthetic.main.fragment_result.result_smallscreen_holder
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
-import kotlinx.android.synthetic.main.fragment_result_swipe.result_back
-import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.fragment_trailer.*
-import kotlinx.android.synthetic.main.result_recommendations.*
-import kotlinx.android.synthetic.main.result_recommendations.result_recommendations
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 
-class ResultFragmentPhone : ResultFragment() {
+open class ResultFragmentPhone : FullScreenPlayer(),
+    PanelsChildGestureRegionObserver.GestureRegionsListener {
+    protected lateinit var viewModel: ResultViewModel2
+    protected lateinit var syncModel: SyncViewModel
+
+    protected var binding: FragmentResultSwipeBinding? = null
+    protected var resultBinding: FragmentResultBinding? = null
+    protected var recommendationBinding: ResultRecommendationsBinding? = null
+    protected var syncBinding: ResultSyncBinding? = null
+
+    override var layout = R.layout.fragment_result_swipe
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        viewModel =
+            ViewModelProvider(this)[ResultViewModel2::class.java]
+        syncModel =
+            ViewModelProvider(this)[SyncViewModel::class.java]
+        updateUIEvent += ::updateUI
+
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        FragmentResultSwipeBinding.bind(root).let { bind ->
+            resultBinding =
+                bind.fragmentResult//FragmentResultBinding.bind(binding.root.findViewById(R.id.fragment_result))
+            recommendationBinding = bind.resultRecommendations
+            syncBinding = bind.resultSync
+            binding = bind
+        }
+
+        return root
+    }
+
     var currentTrailers: List<ExtractorLink> = emptyList()
     var currentTrailerIndex = 0
 
@@ -96,19 +161,30 @@ class ResultFragmentPhone : ResultFragment() {
         //result_trailer_thumbnail?.setImageBitmap(result_poster_background?.drawable?.toBitmap())
 
 
-        result_trailer_loading?.isVisible = isSuccess
+        // result_trailer_loading?.isVisible = isSuccess
         val turnVis = !isSuccess && !isFullScreenPlayer
-        result_smallscreen_holder?.isVisible = turnVis
-        result_poster_background_holder?.apply {
-            val fadeIn: Animation = AlphaAnimation(alpha, if (turnVis) 1.0f else 0.0f).apply {
-                interpolator = DecelerateInterpolator()
-                duration = 200
-                fillAfter = true
+        resultBinding?.apply {
+            resultSmallscreenHolder.isVisible = turnVis
+            resultPosterBackgroundHolder.apply {
+                val fadeIn: Animation = AlphaAnimation(alpha, if (turnVis) 1.0f else 0.0f).apply {
+                    interpolator = DecelerateInterpolator()
+                    duration = 200
+                    fillAfter = true
+                }
+                clearAnimation()
+                startAnimation(fadeIn)
             }
-            clearAnimation()
-            startAnimation(fadeIn)
+
+            // We don't want the trailer to be focusable if it's not visible
+            resultSmallscreenHolder.descendantFocusability = if (isSuccess) {
+                ViewGroup.FOCUS_AFTER_DESCENDANTS
+            } else {
+                ViewGroup.FOCUS_BLOCK_DESCENDANTS
+            }
+            binding?.resultFullscreenHolder?.isVisible = !isSuccess && isFullScreenPlayer
         }
 
+
         //player_view?.apply {
         //alpha = 0.0f
         //ObjectAnimator.ofFloat(player_view, "alpha", 1f).apply {
@@ -124,16 +200,10 @@ class ResultFragmentPhone : ResultFragment() {
         //startAnimation(fadeIn)
         // }
 
-        // We don't want the trailer to be focusable if it's not visible
-        result_smallscreen_holder?.descendantFocusability = if (isSuccess) {
-            ViewGroup.FOCUS_AFTER_DESCENDANTS
-        } else {
-            ViewGroup.FOCUS_BLOCK_DESCENDANTS
-        }
-        result_fullscreen_holder?.isVisible = !isSuccess && isFullScreenPlayer
+
     }
 
-    override fun setTrailers(trailers: List<ExtractorLink>?) {
+    private fun setTrailers(trailers: List<ExtractorLink>?) {
         context?.updateHasTrailers()
         if (!LoadResponse.isTrailersEnabled) return
         currentTrailers = trailers?.sortedBy { -it.quality } ?: emptyList()
@@ -144,12 +214,16 @@ class ResultFragmentPhone : ResultFragment() {
         //somehow this still leaks and I dont know why????
         // todo look at https://github.com/discord/OverlappingPanels/blob/70b4a7cf43c6771873b1e091029d332896d41a1a/sample_app/src/main/java/com/discord/sampleapp/MainActivity.kt
         PanelsChildGestureRegionObserver.Provider.get().let { obs ->
-            result_cast_items?.let {
+            resultBinding?.resultCastItems?.let {
                 obs.unregister(it)
             }
             obs.removeGestureRegionsUpdateListener(this)
         }
-
+        updateUIEvent -= ::updateUI
+        binding = null
+        resultBinding = null
+        syncBinding = null
+        recommendationBinding = null
         super.onDestroyView()
     }
 
@@ -168,38 +242,239 @@ class ResultFragmentPhone : ResultFragment() {
 
     var selectSeason: String? = null
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return
+    private fun setUrl(url: String?) {
+        if (url == null) {
+            binding?.resultOpenInBrowser?.isVisible = false
+            return
+        }
 
+        val valid = url.startsWith("http")
+
+        binding?.resultOpenInBrowser?.apply {
+            isVisible = valid
+            setOnClickListener {
+                context?.openBrowser(url)
+            }
+        }
+
+        resultBinding?.resultReloadConnectionOpenInBrowser?.setOnClickListener {
+            view?.context?.openBrowser(url)
+        }
+
+        resultBinding?.resultMetaSite?.setOnClickListener {
+            view?.context?.openBrowser(url)
+        }
+    }
+
+    private fun reloadViewModel(forceReload: Boolean) {
+        if (!viewModel.hasLoaded() || forceReload) {
+            val storedData = getStoredData() ?: return
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+        }
+    }
+
+    override fun onResume() {
+        afterPluginsLoadedEvent += ::reloadViewModel
+        activity?.let {
+            it.window?.navigationBarColor =
+                it.colorFromAttribute(R.attr.primaryBlackBackground)
+        }
+        super.onResume()
+    }
+
+    override fun onStop() {
+        afterPluginsLoadedEvent -= ::reloadViewModel
+        super.onStop()
+    }
+
+    private fun updateUI(id : Int?) {
+        syncModel.updateUserData()
+        viewModel.reloadEpisodes()
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        player_open_source?.setOnClickListener {
-            currentTrailers.getOrNull(currentTrailerIndex)?.let {
-                context?.openBrowser(it.url)
-            }
-        }
-        result_overlapping_panels?.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
-        result_overlapping_panels?.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
+        // ===== setup =====
+        UIHelper.fixPaddingStatusbar(binding?.resultTopBar)
+        val storedData = getStoredData() ?: return
+        activity?.window?.decorView?.clearFocus()
+        activity?.loadCache()
+        context?.updateHasTrailers()
+        hideKeyboard()
+        if (storedData.restart || !viewModel.hasLoaded())
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
 
-        result_recommendations?.spanCount = 3
-        result_recommendations?.adapter =
-            SearchAdapter(
-                ArrayList(),
-                result_recommendations,
-            ) { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
-            }
+        setUrl(storedData.url)
+        syncModel.addFromUrl(storedData.url)
+        val api = APIHolder.getApiFromNameNull(storedData.apiName)
         PanelsChildGestureRegionObserver.Provider.get().addGestureRegionsUpdateListener(this)
+        // ===== ===== =====
 
-        result_cast_items?.let {
-            PanelsChildGestureRegionObserver.Provider.get().register(it)
+        resultBinding?.apply {
+            resultReloadConnectionerror.setOnClickListener {
+                viewModel.load(
+                    activity,
+                    storedData.url,
+                    storedData.apiName,
+                    storedData.showFillers,
+                    storedData.dubStatus,
+                    storedData.start
+                )
+            }
+
+            resultCastItems.layoutManager = object : LinearListLayout(view.context) {
+                override fun onRequestChildFocus(
+                    parent: RecyclerView,
+                    state: RecyclerView.State,
+                    child: View,
+                    focused: View?
+                ): Boolean {
+                    // Make the cast always focus the first visible item when focused
+                    // from somewhere else. Otherwise it jumps to the last item.
+                    return if (parent.focusedChild == null) {
+                        scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
+                        true
+                    } else {
+                        super.onRequestChildFocus(parent, state, child, focused)
+                    }
+                }
+            }.apply {
+                this.orientation = RecyclerView.HORIZONTAL
+            }
+            resultCastItems.adapter = ActorAdaptor()
+
+            resultEpisodes.adapter =
+                EpisodeAdapter(
+                    api?.hasDownloadSupport == true,
+                    { episodeClick ->
+                        viewModel.handleAction(episodeClick)
+                    },
+                    { downloadClickEvent ->
+                        DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
+                    }
+                )
+            resultCastItems.let {
+                PanelsChildGestureRegionObserver.Provider.get().register(it)
+            }
+            resultScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                val dy = scrollY - oldScrollY
+                if (dy > 0) { //check for scroll down
+                    binding?.resultBookmarkFab?.shrink()
+                } else if (dy < -5) {
+                    binding?.resultBookmarkFab?.extend()
+                }
+                if (!isFullScreenPlayer && player.getIsPlaying()) {
+                    if (scrollY > (resultBinding?.fragmentTrailer?.playerBackground?.height
+                            ?: scrollY)
+                    ) {
+                        player.handleEvent(CSPlayerEvent.Pause)
+                    }
+                }
+            })
         }
 
+        binding?.apply {
+            resultOverlappingPanels.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
+            resultOverlappingPanels.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
+            resultBack.setOnClickListener {
+                activity?.popCurrentPage()
+            }
 
-        result_back?.setOnClickListener {
-            activity?.popCurrentPage()
+
+            resultMiniSync.adapter = ImageAdapter(
+                nextFocusDown = R.id.result_sync_set_score,
+                clickCallback = { action ->
+                    if (action == IMAGE_CLICK || action == IMAGE_LONG_CLICK) {
+                        if (binding?.resultOverlappingPanels?.getSelectedPanel()?.ordinal == 1) {
+                            binding?.resultOverlappingPanels?.openStartPanel()
+                        } else {
+                            binding?.resultOverlappingPanels?.closePanels()
+                        }
+                    }
+                })
+            resultSubscribe.setOnClickListener {
+                val isSubscribed =
+                    viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
+
+                val message = if (isSubscribed) {
+                    // Kinda icky to have this here, but it works.
+                    SubscriptionWorkManager.enqueuePeriodicWork(context)
+                    R.string.subscription_new
+                } else {
+                    R.string.subscription_deleted
+                }
+
+                val name = (viewModel.page.value as? Resource.Success)?.value?.title
+                    ?: txt(R.string.no_data).asStringNull(context) ?: ""
+                CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
+            }
+            mediaRouteButton.apply {
+                val chromecastSupport = api?.hasChromecastSupport == true
+                alpha = if (chromecastSupport) 1f else 0.3f
+                if (!chromecastSupport) {
+                    setOnClickListener {
+                        CommonActivity.showToast(
+                            R.string.no_chromecast_support_toast,
+                            Toast.LENGTH_LONG
+                        )
+                    }
+                }
+                activity?.let { act ->
+                    if (act.isCastApiAvailable()) {
+                        try {
+                            CastButtonFactory.setUpMediaRouteButton(act, this)
+                            val castContext = CastContext.getSharedInstance(act.applicationContext)
+                            isGone = castContext.castState == CastState.NO_DEVICES_AVAILABLE
+                            // this shit leaks for some reason
+                            //castContext.addCastStateListener { state ->
+                            //    media_route_button?.isGone = state == CastState.NO_DEVICES_AVAILABLE
+                            //}
+                        } catch (e: Exception) {
+                            logError(e)
+                        }
+                    }
+                }
+            }
         }
 
+        playerBinding?.apply {
+            playerOpenSource.setOnClickListener {
+                currentTrailers.getOrNull(currentTrailerIndex)?.let {
+                    context?.openBrowser(it.url)
+                }
+            }
+        }
+
+        recommendationBinding?.apply {
+            resultRecommendationsList.apply {
+                spanCount = 3
+                adapter =
+                    SearchAdapter(
+                        ArrayList(),
+                        this,
+                    ) { callback ->
+                        SearchHelper.handleSearchClickCallback(callback)
+                    }
+            }
+        }
+
+
         /*
         result_bookmark_button?.setOnClickListener {
             it.popupMenuNoIcons(
@@ -211,169 +486,501 @@ class ResultFragmentPhone : ResultFragment() {
             }
         }*/
 
-        result_mini_sync?.adapter = ImageAdapter(
-            R.layout.result_mini_image,
-            nextFocusDown = R.id.result_sync_set_score,
-            clickCallback = { action ->
-                if (action == IMAGE_CLICK || action == IMAGE_LONG_CLICK) {
-                    if (result_overlapping_panels?.getSelectedPanel()?.ordinal == 1) {
-                        result_overlapping_panels?.openStartPanel()
-                    } else {
-                        result_overlapping_panels?.closePanels()
+        observeNullable(viewModel.resumeWatching) { resume ->
+            resultBinding?.apply {
+                if (resume == null) {
+                    resultResumeParent.isVisible = false
+                    return@observeNullable
+                }
+                resultResumeParent.isVisible = true
+                resume.progress?.let { progress ->
+                    resultResumeSeriesTitle.apply {
+                        isVisible = !resume.isMovie
+                        text =
+                            if (resume.isMovie) null else context?.getNameFull(
+                                resume.result.name,
+                                resume.result.episode,
+                                resume.result.season
+                            )
                     }
+
+                    resultResumeSeriesProgressText.setText(progress.progressLeft)
+                    resultResumeSeriesProgress.apply {
+                        isVisible = true
+                        this.max = progress.maxProgress
+                        this.progress = progress.progress
+                    }
+                    resultResumeProgressHolder.isVisible = true
+                } ?: run {
+                    resultResumeProgressHolder.isVisible = false
+                    resultResumeSeriesProgress.isVisible = false
+                    resultResumeSeriesTitle.isVisible = false
+                    resultResumeSeriesProgressText.isVisible = false
                 }
-            })
 
-
-        result_scroll?.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-            val dy = scrollY - oldScrollY
-            if (dy > 0) { //check for scroll down
-                result_bookmark_fab?.shrink()
-            } else if (dy < -5) {
-                result_bookmark_fab?.extend()
-            }
-            if (!isFullScreenPlayer && player.getIsPlaying()) {
-                if (scrollY > (player_background?.height ?: scrollY)) {
-                    player.handleEvent(CSPlayerEvent.Pause)
-                }
-            }
-            //result_poster_blur_holder?.translationY = -scrollY.toFloat()
-        })
-        val api = APIHolder.getApiFromNameNull(apiName)
-
-        if (media_route_button != null) {
-            val chromecastSupport = api?.hasChromecastSupport == true
-            media_route_button?.alpha = if (chromecastSupport) 1f else 0.3f
-            if (!chromecastSupport) {
-                media_route_button?.setOnClickListener {
-                    CommonActivity.showToast(
-                        activity,
-                        R.string.no_chromecast_support_toast,
-                        Toast.LENGTH_LONG
+                resultResumeSeriesButton.isVisible = !resume.isMovie
+                resultResumeSeriesButton.setOnClickListener {
+                    viewModel.handleAction(
+                        EpisodeClickEvent(
+                            storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER,
+                            resume.result
+                        )
                     )
                 }
             }
-            activity?.let { act ->
-                if (act.isCastApiAvailable()) {
-                    try {
-                        CastButtonFactory.setUpMediaRouteButton(act, media_route_button)
-                        val castContext = CastContext.getSharedInstance(act.applicationContext)
-                        media_route_button?.isGone =
-                            castContext.castState == CastState.NO_DEVICES_AVAILABLE
-                        // this shit leaks for some reason
-                        //castContext.addCastStateListener { state ->
-                        //    media_route_button?.isGone = state == CastState.NO_DEVICES_AVAILABLE
-                        //}
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
+        }
+
+        observeNullable(viewModel.subscribeStatus) { isSubscribed ->
+            binding?.resultSubscribe?.isVisible = isSubscribed != null
+            if (isSubscribed == null) return@observeNullable
+
+            val drawable = if (isSubscribed) {
+                R.drawable.ic_baseline_notifications_active_24
+            } else {
+                R.drawable.baseline_notifications_none_24
+            }
+
+            binding?.resultSubscribe?.setImageResource(drawable)
+        }
+
+        observe(viewModel.trailers) { trailers ->
+            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
+        }
+
+        observeNullable(viewModel.episodes) { episodes ->
+            resultBinding?.apply {
+                // no failure?
+                resultEpisodeLoading.isVisible = episodes is Resource.Loading
+                resultEpisodes.isVisible = episodes is Resource.Success
+                if (episodes is Resource.Success) {
+                    (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value)
                 }
             }
         }
 
-        observe(viewModel.episodesCountText) { count ->
-            result_episodes_text.setText(count)
-        }
+        observeNullable(viewModel.movie) { data ->
+            resultBinding?.apply {
+                resultPlayMovie.isVisible = data is Resource.Success
+                downloadButton.isVisible =
+                    data is Resource.Success && viewModel.currentRepo?.api?.hasDownloadSupport == true
 
-        observe(viewModel.selectPopup) { popup ->
-            when (popup) {
-                is Some.Success -> {
-                    popupDialog?.dismissSafe(activity)
-
-                    popupDialog = activity?.let { act ->
-                        val pop = popup.value
-                        val options = pop.getOptions(act)
-                        val title = pop.getTitle(act)
-
-                        act.showBottomDialogInstant(
-                            options, title, {
-                                popupDialog = null
-                                pop.callback(null)
-                            }, {
-                                popupDialog = null
-                                pop.callback(it)
-                            }
+                (data as? Resource.Success)?.value?.let { (text, ep) ->
+                    resultPlayMovie.setText(text)
+                    resultPlayMovie.setOnClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
                         )
                     }
-                }
-                is Some.None -> {
-                    popupDialog?.dismissSafe(activity)
-                    popupDialog = null
-                }
-            }
-        }
-
-        observe(viewModel.loadedLinks) { load ->
-            when (load) {
-                is Some.Success -> {
-                    if (loadingDialog?.isShowing != true) {
-                        loadingDialog?.dismissSafe(activity)
-                        loadingDialog = null
+                    resultPlayMovie.setOnLongClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
+                        )
+                        return@setOnLongClickListener true
                     }
-                    loadingDialog = loadingDialog ?: context?.let { ctx ->
-                        val builder =
-                            BottomSheetDialog(ctx)
-                        builder.setContentView(R.layout.bottom_loading)
-                        builder.setOnDismissListener {
-                            loadingDialog = null
-                            viewModel.cancelLinks()
+                    downloadButton.setDefaultClickListener(
+                        VideoDownloadHelper.DownloadEpisodeCached(
+                            ep.name,
+                            ep.poster,
+                            0,
+                            null,
+                            ep.id,
+                            ep.id,
+                            null,
+                            null,
+                            System.currentTimeMillis(),
+                        ),
+                        null
+                    ) { click ->
+                        when (click.action) {
+                            DOWNLOAD_ACTION_DOWNLOAD -> {
+                                viewModel.handleAction(
+                                    EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
+                                )
+                            }
+                            DOWNLOAD_ACTION_LONG_CLICK -> {
+                                viewModel.handleAction(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, ep))
+                            }
+
+                            else -> DownloadButtonSetup.handleDownloadClick(click)
                         }
-                        //builder.setOnCancelListener {
-                        //    it?.dismiss()
-                        //}
-                        builder.setCanceledOnTouchOutside(true)
-                        builder.show()
-                        builder
                     }
                 }
-                is Some.None -> {
-                    loadingDialog?.dismissSafe(activity)
-                    loadingDialog = null
-                }
             }
         }
 
-        observe(viewModel.selectedSeason) { text ->
-            result_season_button.setText(text)
+        observe(viewModel.page) { data ->
+            if (data == null) return@observe
+            resultBinding?.apply {
+                (data as? Resource.Success)?.value?.let { d ->
+                    resultVpn.setText(d.vpnText)
+                    resultInfo.setText(d.metaText)
+                    resultNoEpisodes.setText(d.noEpisodesFoundText)
+                    resultTitle.setText(d.titleText)
+                    resultMetaSite.setText(d.apiName)
+                    resultMetaType.setText(d.typeText)
+                    resultMetaYear.setText(d.yearText)
+                    resultMetaDuration.setText(d.durationText)
+                    resultMetaRating.setText(d.ratingText)
+                    resultCastText.setText(d.actorsText)
+                    resultNextAiring.setText(d.nextAiringEpisode)
+                    resultNextAiringTime.setText(d.nextAiringDate)
+                    resultPoster.setImage(d.posterImage)
+                    resultPosterBackground.setImage(d.posterBackgroundImage)
+                    resultDescription.setTextHtml(d.plotText)
+                    resultDescription.setOnClickListener { view ->
+                        // todo bottom view?
+                        view.context?.let { ctx ->
+                            val builder: AlertDialog.Builder =
+                                AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                            builder.setMessage(d.plotText.asString(ctx).html())
+                                .setTitle(d.plotHeaderText.asString(ctx))
+                                .show()
+                        }
+                    }
 
-            selectSeason =
-                (if (text is Some.Success) text.value else null)?.asStringNull(result_season_button?.context)
-            // If the season button is visible the result season button will be next focus down
-            if (result_season_button?.isVisible == true)
-                if (result_resume_parent?.isVisible == true)
-                    setFocusUpAndDown(result_resume_series_button, result_season_button)
-            //else
-            //    setFocusUpAndDown(result_bookmark_button, result_season_button)
+                    populateChips(resultTag, d.tags)
+
+                    resultComingSoon.isVisible = d.comingSoon
+                    resultDataHolder.isGone = d.comingSoon
+
+                    resultCastItems.isGone = d.actors.isNullOrEmpty()
+                    (resultCastItems.adapter as? ActorAdaptor)?.updateList(d.actors ?: emptyList())
+
+                    if (syncModel.addSyncs(d.syncData)) {
+                        syncModel.updateMetaAndUser()
+                        syncModel.updateSynced()
+                    } else {
+                        syncModel.addFromUrl(d.url)
+                    }
+
+                    binding?.apply {
+                        resultSearch.setOnClickListener {
+                            QuickSearchFragment.pushSearch(activity, d.title)
+                        }
+
+                        resultShare.setOnClickListener {
+                            try {
+                                val i = Intent(Intent.ACTION_SEND)
+                                i.type = "text/plain"
+                                i.putExtra(Intent.EXTRA_SUBJECT, d.title)
+                                i.putExtra(Intent.EXTRA_TEXT, d.url)
+                                startActivity(Intent.createChooser(i, d.title))
+                            } catch (e: Exception) {
+                                logError(e)
+                            }
+                        }
+
+                        setUrl(d.url)
+                        resultBookmarkFab.apply {
+                            isVisible = true
+                            extend()
+                        }
+                    }
+                }
+
+                (data as? Resource.Failure)?.let { data ->
+                    resultErrorText.text = storedData.url.plus("\n") + data.errorString
+                }
+
+                binding?.resultBookmarkFab?.isVisible = data is Resource.Success
+                resultFinishLoading.isVisible = data is Resource.Success
+
+                resultLoading.isVisible = data is Resource.Loading
+
+                resultLoadingError.isVisible = data is Resource.Failure
+                resultErrorText.isVisible = data is Resource.Failure
+                resultReloadConnectionOpenInBrowser.isVisible = data is Resource.Failure
+            }
         }
 
-        observe(viewModel.selectedDubStatus) { status ->
-            result_dub_select?.setText(status)
-
-            if (result_dub_select?.isVisible == true)
-                if (result_season_button?.isVisible != true && result_episode_select?.isVisible != true) {
-                    if (result_resume_parent?.isVisible == true)
-                        setFocusUpAndDown(result_resume_series_button, result_dub_select)
-                    //else
-                    //    setFocusUpAndDown(result_bookmark_button, result_dub_select)
-                }
+        observeNullable(viewModel.episodesCountText) { count ->
+            resultBinding?.resultEpisodesText.setText(count)
         }
-        observe(viewModel.selectedRange) { range ->
-            result_episode_select.setText(range)
 
-            // If Season button is invisible then the bookmark button next focus is episode select
-            if (result_episode_select?.isVisible == true)
-                if (result_season_button?.isVisible != true) {
-                    if (result_resume_parent?.isVisible == true)
-                        setFocusUpAndDown(result_resume_series_button, result_episode_select)
-                    //else
-                    //    setFocusUpAndDown(result_bookmark_button, result_episode_select)
+        observeNullable(viewModel.selectPopup) { popup ->
+            if (popup == null) {
+                popupDialog?.dismissSafe(activity)
+                popupDialog = null
+                return@observeNullable
+            }
+            popupDialog?.dismissSafe(activity)
+
+            popupDialog = activity?.let { act ->
+                val options = popup.getOptions(act)
+                val title = popup.getTitle(act)
+
+                act.showBottomDialogInstant(
+                    options, title, {
+                        popupDialog = null
+                        popup.callback(null)
+                    }, {
+                        popupDialog = null
+                        popup.callback(it)
+                    }
+                )
+            }
+        }
+
+        observe(syncModel.synced) { list ->
+            syncBinding?.resultSyncNames?.text =
+                list.filter { it.isSynced && it.hasAccount }.joinToString { it.name }
+
+            val newList = list.filter { it.isSynced && it.hasAccount }
+
+            binding?.resultMiniSync?.isVisible = newList.isNotEmpty()
+            (binding?.resultMiniSync?.adapter as? ImageAdapter)?.updateList(newList.mapNotNull { it.icon })
+        }
+
+
+        var currentSyncProgress = 0
+        fun setSyncMaxEpisodes(totalEpisodes: Int?) {
+            syncBinding?.resultSyncEpisodes?.max = (totalEpisodes ?: 0) * 1000
+
+            normalSafeApiCall {
+                val ctx = syncBinding?.resultSyncEpisodes?.context
+                syncBinding?.resultSyncMaxEpisodes?.text =
+                    totalEpisodes?.let { episodes ->
+                        ctx?.getString(R.string.sync_total_episodes_some)?.format(episodes)
+                    } ?: run {
+                        ctx?.getString(R.string.sync_total_episodes_none)
+                    }
+            }
+        }
+        observe(syncModel.metadata) { meta ->
+            when (meta) {
+                is Resource.Success -> {
+                    val d = meta.value
+                    syncBinding?.resultSyncEpisodes?.progress = currentSyncProgress * 1000
+                    setSyncMaxEpisodes(d.totalEpisodes)
+
+                    viewModel.setMeta(d, syncModel.getSyncs())
                 }
+
+                is Resource.Loading -> {
+                    syncBinding?.resultSyncMaxEpisodes?.text =
+                        syncBinding?.resultSyncMaxEpisodes?.context?.getString(R.string.sync_total_episodes_none)
+                }
+
+                else -> {}
+            }
+        }
+
+
+        observe(syncModel.userData) { status ->
+            var closed = false
+            syncBinding?.apply {
+                when (status) {
+                    is Resource.Failure -> {
+                        resultSyncLoadingShimmer.stopShimmer()
+                        resultSyncLoadingShimmer.isVisible = false
+                        resultSyncHolder.isVisible = false
+                        closed = true
+                    }
+
+                    is Resource.Loading -> {
+                        resultSyncLoadingShimmer.startShimmer()
+                        resultSyncLoadingShimmer.isVisible = true
+                        resultSyncHolder.isVisible = false
+                    }
+
+                    is Resource.Success -> {
+                        resultSyncLoadingShimmer.stopShimmer()
+                        resultSyncLoadingShimmer.isVisible = false
+                        resultSyncHolder.isVisible = true
+
+                        val d = status.value
+                        resultSyncRating.value = d.score?.toFloat() ?: 0.0f
+                        resultSyncCheck.setItemChecked(d.status + 1, true)
+                        val watchedEpisodes = d.watchedEpisodes ?: 0
+                        currentSyncProgress = watchedEpisodes
+
+                        d.maxEpisodes?.let {
+                            // don't directly call it because we don't want to override metadata observe
+                            setSyncMaxEpisodes(it)
+                        }
+
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            resultSyncEpisodes.setProgress(watchedEpisodes * 1000, true)
+                        } else {
+                            resultSyncEpisodes.progress = watchedEpisodes * 1000
+                        }
+                        resultSyncCurrentEpisodes.text =
+                            Editable.Factory.getInstance()?.newEditable(watchedEpisodes.toString())
+                        normalSafeApiCall { // format might fail
+                            context?.getString(R.string.sync_score_format)?.format(d.score ?: 0)
+                                ?.let {
+                                    resultSyncScoreText.text = it
+                                }
+                        }
+                    }
+
+                    null -> {
+                        closed = false
+                    }
+                }
+            }
+            binding?.resultOverlappingPanels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+        }
+        observe(viewModel.recommendations) { recommendations ->
+            setRecommendations(recommendations, null)
+        }
+        observe(viewModel.episodeSynopsis) { description ->
+            // TODO bottom dialog
+            view.context?.let { ctx ->
+                val builder: AlertDialog.Builder =
+                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                builder.setMessage(description.html())
+                    .setTitle(R.string.synopsis)
+                    .setOnDismissListener {
+                        viewModel.releaseEpisodeSynopsis()
+                    }
+                    .show()
+            }
+        }
+        context?.let { ctx ->
+            val arrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+            /*
+            -1 -> None
+            0 -> Watching
+            1 -> Completed
+            2 -> OnHold
+            3 -> Dropped
+            4 -> PlanToWatch
+            5 -> ReWatching
+            */
+            val items = listOf(
+                R.string.none,
+                R.string.type_watching,
+                R.string.type_completed,
+                R.string.type_on_hold,
+                R.string.type_dropped,
+                R.string.type_plan_to_watch,
+                R.string.type_re_watching
+            ).map { ctx.getString(it) }
+            arrayAdapter.addAll(items)
+            syncBinding?.apply {
+                resultSyncCheck.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                resultSyncCheck.adapter = arrayAdapter
+                UIHelper.setListViewHeightBasedOnItems(resultSyncCheck)
+
+                resultSyncCheck.setOnItemClickListener { _, _, which, _ ->
+                    syncModel.setStatus(which - 1)
+                }
+
+                resultSyncRating.addOnChangeListener { _, value, _ ->
+                    syncModel.setScore(value.toInt())
+                }
+
+                resultSyncAddEpisode.setOnClickListener {
+                    syncModel.setEpisodesDelta(1)
+                }
+
+                resultSyncSubEpisode.setOnClickListener {
+                    syncModel.setEpisodesDelta(-1)
+                }
+
+                resultSyncCurrentEpisodes.doOnTextChanged { text, _, before, count ->
+                    if (count == before) return@doOnTextChanged
+                    text?.toString()?.toIntOrNull()?.let { ep ->
+                        syncModel.setEpisodes(ep)
+                    }
+                }
+            }
+        }
+
+        syncBinding?.resultSyncSetScore?.setOnClickListener {
+            syncModel.publishUserData()
+        }
+
+        observe(viewModel.watchStatus) { watchType ->
+            binding?.resultBookmarkFab?.apply {
+                if (watchType == WatchType.NONE) {
+                    context?.colorFromAttribute(R.attr.white)
+                } else {
+                    context?.colorFromAttribute(R.attr.colorPrimary)
+                }?.let {
+                    val colorState = ColorStateList.valueOf(it)
+                    iconTint = colorState
+                    setTextColor(colorState)
+                }
+
+                setOnClickListener { fab ->
+                    activity?.showBottomDialog(
+                        WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
+                        watchType.ordinal,
+                        fab.context.getString(R.string.action_add_to_bookmarks),
+                        showApply = false,
+                        {}) {
+                        viewModel.updateWatchStatus(WatchType.values()[it])
+                    }
+                }
+            }
+        }
+
+
+        observeNullable(viewModel.loadedLinks) { load ->
+            if (load == null) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+                return@observeNullable
+            }
+            if (loadingDialog?.isShowing != true) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+            }
+            loadingDialog = loadingDialog ?: context?.let { ctx ->
+                val builder =
+                    BottomSheetDialog(ctx)
+                builder.setContentView(R.layout.bottom_loading)
+                builder.setOnDismissListener {
+                    loadingDialog = null
+                    viewModel.cancelLinks()
+                }
+                //builder.setOnCancelListener {
+                //    it?.dismiss()
+                //}
+                builder.setCanceledOnTouchOutside(true)
+                builder.show()
+                builder
+            }
+        }
+
+        observeNullable(viewModel.selectedSeason) { text ->
+            resultBinding?.apply {
+                resultSeasonButton.setText(text)
+
+                selectSeason =
+                    text?.asStringNull(resultSeasonButton.context)
+                // If the season button is visible the result season button will be next focus down
+                if (resultSeasonButton.isVisible && resultResumeParent.isVisible) {
+                    setFocusUpAndDown(resultResumeSeriesButton, resultSeasonButton)
+                }
+            }
+        }
+
+        observeNullable(viewModel.selectedDubStatus) { status ->
+            resultBinding?.apply {
+                resultDubSelect.setText(status)
+
+                if (resultDubSelect.isVisible && !resultSeasonButton.isVisible && !resultEpisodeSelect.isVisible && resultResumeParent.isVisible) {
+                    setFocusUpAndDown(resultResumeSeriesButton, resultDubSelect)
+                }
+            }
+        }
+        observeNullable(viewModel.selectedRange) { range ->
+            resultBinding?.apply {
+                resultEpisodeSelect.setText(range)
+                // If Season button is invisible then the bookmark button next focus is episode select
+                if (resultEpisodeSelect.isVisible && !resultSeasonButton.isVisible && resultResumeParent.isVisible) {
+                    setFocusUpAndDown(resultResumeSeriesButton, resultEpisodeSelect)
+                }
+            }
         }
 
 //        val preferDub = context?.getApiDubstatusSettings()?.all { it == DubStatus.Dubbed } == true
 
         observe(viewModel.dubSubSelections) { range ->
-            result_dub_select.setOnClickListener { view ->
+            resultBinding?.resultDubSelect?.setOnClickListener { view ->
                 view?.context?.let { ctx ->
                     view.popupMenuNoIconsAndNoStringRes(range
                         .mapNotNull { (text, status) ->
@@ -389,7 +996,7 @@ class ResultFragmentPhone : ResultFragment() {
         }
 
         observe(viewModel.rangeSelections) { range ->
-            result_episode_select?.setOnClickListener { view ->
+            resultBinding?.resultEpisodeSelect?.setOnClickListener { view ->
                 view?.context?.let { ctx ->
                     val names = range
                         .mapNotNull { (text, r) ->
@@ -406,7 +1013,7 @@ class ResultFragmentPhone : ResultFragment() {
         }
 
         observe(viewModel.seasonSelections) { seasonList ->
-            result_season_button?.setOnClickListener { view ->
+            resultBinding?.resultSeasonButton?.setOnClickListener { view ->
 
                 view?.context?.let { ctx ->
                     val names = seasonList
@@ -440,50 +1047,58 @@ class ResultFragmentPhone : ResultFragment() {
     }
 
     override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
-        result_overlapping_panels?.setChildGestureRegions(gestureRegions)
+        binding?.resultOverlappingPanels?.setChildGestureRegions(gestureRegions)
     }
 
-    override fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
+    private fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
         val isInvalid = rec.isNullOrEmpty()
-        result_recommendations?.isGone = isInvalid
-        result_recommendations_btt?.isGone = isInvalid
-        result_recommendations_btt?.setOnClickListener {
-            val nextFocusDown = if (result_overlapping_panels?.getSelectedPanel()?.ordinal == 1) {
-                result_overlapping_panels?.openEndPanel()
-                R.id.result_recommendations
-            } else {
-                result_overlapping_panels?.closePanels()
-                R.id.result_description
-            }
-
-            result_recommendations_btt?.nextFocusDownId = nextFocusDown
-            result_search?.nextFocusDownId = nextFocusDown
-            result_open_in_browser?.nextFocusDownId = nextFocusDown
-            result_share?.nextFocusDownId = nextFocusDown
-        }
-        result_overlapping_panels?.setEndPanelLockState(if (isInvalid) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
-
         val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
-        rec?.map { it.apiName }?.distinct()?.let { apiNames ->
-            // very dirty selection
-            result_recommendations_filter_button?.isVisible = apiNames.size > 1
-            result_recommendations_filter_button?.text = matchAgainst
-            result_recommendations_filter_button?.setOnClickListener { _ ->
-                activity?.showBottomDialog(
-                    apiNames,
-                    apiNames.indexOf(matchAgainst),
-                    getString(R.string.home_change_provider_img_des), false, {}
-                ) {
-                    setRecommendations(rec, apiNames[it])
+
+        recommendationBinding?.apply {
+            root.isGone = isInvalid
+            root.post {
+                rec?.let { list ->
+                    (resultRecommendationsList.adapter as? SearchAdapter)?.updateList(list.filter { it.apiName == matchAgainst })
                 }
             }
-        } ?: run {
-            result_recommendations_filter_button?.isVisible = false
         }
 
-        result_recommendations?.post {
-            rec?.let { list ->
-                (result_recommendations?.adapter as? SearchAdapter)?.updateList(list.filter { it.apiName == matchAgainst })
+        binding?.apply {
+            resultRecommendationsBtt.isGone = isInvalid
+            resultRecommendationsBtt.setOnClickListener {
+                val nextFocusDown = if (resultOverlappingPanels.getSelectedPanel().ordinal == 1) {
+                    resultOverlappingPanels.openEndPanel()
+                    R.id.result_recommendations
+                } else {
+                    resultOverlappingPanels.closePanels()
+                    R.id.result_description
+                }
+                resultBinding?.apply {
+                    resultRecommendationsBtt.nextFocusDownId = nextFocusDown
+                    resultSearch.nextFocusDownId = nextFocusDown
+                    resultOpenInBrowser.nextFocusDownId = nextFocusDown
+                    resultShare.nextFocusDownId = nextFocusDown
+                }
+            }
+            resultOverlappingPanels.setEndPanelLockState(if (isInvalid) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+
+            rec?.map { it.apiName }?.distinct()?.let { apiNames ->
+                // very dirty selection
+                recommendationBinding?.resultRecommendationsFilterButton?.apply {
+                    isVisible = apiNames.size > 1
+                    text = matchAgainst
+                    setOnClickListener { _ ->
+                        activity?.showBottomDialog(
+                            apiNames,
+                            apiNames.indexOf(matchAgainst),
+                            getString(R.string.home_change_provider_img_des), false, {}
+                        ) {
+                            setRecommendations(rec, apiNames[it])
+                        }
+                    }
+                }
+            } ?: run {
+                recommendationBinding?.resultRecommendationsFilterButton?.isVisible = false
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 71ecb0e9..1feb7d88 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -1,33 +1,81 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.animation.Animator
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.widget.NestedScrollView
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
 import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.mvvm.ResourceSome
-import com.lagradost.cloudstream3.mvvm.Some
+import com.lagradost.cloudstream3.databinding.FragmentResultTvBinding
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
 import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
+import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
+import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppUtils.html
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
+import com.lagradost.cloudstream3.utils.AppUtils.loadCache
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
+import com.lagradost.cloudstream3.utils.UIHelper
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.fragment_result_tv.*
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
-class ResultFragmentTv : ResultFragment() {
-    override val resultLayout = R.layout.fragment_result_tv
+class ResultFragmentTv : Fragment() {
+    protected lateinit var viewModel: ResultViewModel2
+    private var binding: FragmentResultTvBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        updateUIEvent -= ::updateUI
+        super.onDestroyView()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        viewModel =
+            ViewModelProvider(this)[ResultViewModel2::class.java]
+        viewModel.EPISODE_RANGE_SIZE = 50
+        updateUIEvent += ::updateUI
+
+        val localBinding = FragmentResultTvBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+    }
+
+    private fun updateUI(id: Int?) {
+        viewModel.reloadEpisodes()
+    }
 
     private var currentRecommendations: List<SearchResponse> = emptyList()
 
@@ -36,12 +84,15 @@ class ResultFragmentTv : ResultFragment() {
             is EpisodeRange -> {
                 viewModel.changeRange(data)
             }
+
             is Int -> {
                 viewModel.changeSeason(data)
             }
+
             is DubStatus -> {
                 viewModel.changeDubStatus(data)
             }
+
             is String -> {
                 setRecommendations(currentRecommendations, data)
             }
@@ -66,172 +117,640 @@ class ResultFragmentTv : ResultFragment() {
     private fun hasNoFocus(): Boolean {
         val focus = activity?.currentFocus
         if (focus == null || !focus.isVisible) return true
-        return focus == this.result_root
+        return focus == binding?.resultRoot
     }
 
-    override fun updateEpisodes(episodes: ResourceSome<List<ResultEpisode>>) {
-        super.updateEpisodes(episodes)
-        if (episodes is ResourceSome.Success && hasNoFocus()) {
-            result_episodes?.requestFocus()
-        }
-    }
-
-    override fun updateMovie(data: ResourceSome<Pair<UiText, ResultEpisode>>) {
-        super.updateMovie(data)
-        if (data is ResourceSome.Success && hasNoFocus()) {
-            result_play_movie?.requestFocus()
-        }
-    }
-
-    override fun setTrailers(trailers: List<ExtractorLink>?) {
-        context?.updateHasTrailers()
-        if (!LoadResponse.isTrailersEnabled) return
-
-        result_play_trailer?.isGone = trailers.isNullOrEmpty()
-        result_play_trailer?.setOnClickListener {
-            if (trailers.isNullOrEmpty()) return@setOnClickListener
-            activity.navigate(
-                R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
-                    ExtractorLinkGenerator(
-                        trailers,
-                        emptyList()
-                    )
-                )
-            )
-        }
-    }
-
-    override fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
+    private fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
         currentRecommendations = rec ?: emptyList()
         val isInvalid = rec.isNullOrEmpty()
-        result_recommendations?.isGone = isInvalid
-        result_recommendations_holder?.isGone = isInvalid
-        val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
-        (result_recommendations?.adapter as? SearchAdapter)?.updateList(rec?.filter { it.apiName == matchAgainst }
-            ?: emptyList())
+        binding?.apply {
+            resultRecommendationsList.isGone = isInvalid
+            resultRecommendationsHolder.isGone = isInvalid
+            val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
+            (resultRecommendationsList.adapter as? SearchAdapter)?.updateList(rec?.filter { it.apiName == matchAgainst }
+                ?: emptyList())
 
-        rec?.map { it.apiName }?.distinct()?.let { apiNames ->
-            // very dirty selection
-            result_recommendations_filter_selection?.isVisible = apiNames.size > 1
-            result_recommendations_filter_selection?.update(apiNames.map { txt(it) to it })
-            result_recommendations_filter_selection?.select(apiNames.indexOf(matchAgainst))
-        } ?: run {
-            result_recommendations_filter_selection?.isVisible = false
+            rec?.map { it.apiName }?.distinct()?.let { apiNames ->
+                // very dirty selection
+                resultRecommendationsFilterSelection.isVisible = apiNames.size > 1
+                resultRecommendationsFilterSelection.update(apiNames.map { txt(it) to it })
+                resultRecommendationsFilterSelection.select(apiNames.indexOf(matchAgainst))
+            } ?: run {
+                resultRecommendationsFilterSelection.isVisible = false
+            }
         }
     }
 
     var loadingDialog: Dialog? = null
     var popupDialog: Dialog? = null
+
+    private fun reloadViewModel(forceReload: Boolean) {
+        if (!viewModel.hasLoaded() || forceReload) {
+            val storedData = getStoredData() ?: return
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+        }
+    }
+
+    override fun onResume() {
+        activity?.let {
+            it.window?.navigationBarColor =
+                it.colorFromAttribute(R.attr.primaryBlackBackground)
+        }
+        afterPluginsLoadedEvent += ::reloadViewModel
+        super.onResume()
+    }
+
+    override fun onStop() {
+        afterPluginsLoadedEvent -= ::reloadViewModel
+        super.onStop()
+    }
+
+    private fun View.fade(turnVisible: Boolean) {
+        if (turnVisible) {
+            isVisible = true
+        }
+
+        this.animate().alpha(if (turnVisible) 1.0f else 0.0f).apply {
+            duration = 200
+            interpolator = DecelerateInterpolator()
+            setListener(object : Animator.AnimatorListener {
+                override fun onAnimationStart(animation: Animator) {
+                }
+
+                override fun onAnimationEnd(animation: Animator) {
+                    this@fade.isVisible = turnVisible
+                }
+
+                override fun onAnimationCancel(animation: Animator) {
+                }
+
+                override fun onAnimationRepeat(animation: Animator) {
+                }
+            })
+        }
+        this.animate().translationX(if (turnVisible) 0f else if(isRtl()) -100.0f else 100f).apply {
+            duration = 200
+            interpolator = DecelerateInterpolator()
+        }
+    }
+
+    private fun toggleEpisodes(show: Boolean) {
+        binding?.apply {
+            episodesShadow.fade(show)
+            episodeHolderTv.fade(show)
+            if(episodesShadow.isRtl()) {
+                episodesShadow.scaleX = -1.0f
+                episodesShadow.scaleY = -1.0f
+            } else {
+                episodesShadow.scaleX = 1.0f
+                episodesShadow.scaleY = 1.0f
+            }
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        result_episodes?.layoutManager =
-                //LinearListLayout(result_episodes ?: return, result_episodes?.context).apply {
-            LinearListLayout(result_episodes?.context).apply {
-                setHorizontal()
+        // ===== setup =====
+        val storedData = getStoredData() ?: return
+        activity?.window?.decorView?.clearFocus()
+        activity?.loadCache()
+        hideKeyboard()
+        if (storedData.restart || !viewModel.hasLoaded())
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+        // ===== ===== =====
+
+        binding?.apply {
+            //episodesShadow.rotationX = 180.0f//if(episodesShadow.isRtl()) 180.0f else 0.0f
+
+            val leftListener: View.OnFocusChangeListener =
+                View.OnFocusChangeListener { _, hasFocus ->
+                    if (!hasFocus) return@OnFocusChangeListener
+                    toggleEpisodes(false)
+                }
+
+            val rightListener: View.OnFocusChangeListener =
+                View.OnFocusChangeListener { _, hasFocus ->
+                    if (!hasFocus) return@OnFocusChangeListener
+                    toggleEpisodes(true)
+                }
+
+            resultPlayMovie.onFocusChangeListener = leftListener
+            resultPlaySeries.onFocusChangeListener = leftListener
+            resultResumeSeries.onFocusChangeListener = leftListener
+            resultPlayTrailer.onFocusChangeListener = leftListener
+            resultEpisodesShow.onFocusChangeListener = rightListener
+            resultDescription.onFocusChangeListener = leftListener
+            resultBookmarkButton.onFocusChangeListener = leftListener
+            resultEpisodesShow.setOnClickListener {
+                // toggle, to make it more touch accessable just in case someone thinks that a
+                // tv layout is better but is using a touch device
+                toggleEpisodes(!episodeHolderTv.isVisible)
+            }
+
+          //  resultEpisodes.onFocusChangeListener = leftListener
+
+            redirectToPlay.setOnFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) return@setOnFocusChangeListener
+                toggleEpisodes(false)
+
+                binding?.apply {
+                    val views = listOf(
+                        resultPlayMovie,
+                        resultPlaySeries,
+                        resultResumeSeries,
+                        resultPlayTrailer,
+                        resultBookmarkButton
+                    )
+                    for (requestView in views) {
+                        if (!requestView.isVisible) continue
+                        if (requestView.requestFocus()) break
+                    }
+                }
+            }
+
+            // parallax on background
+            resultFinishLoading.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                backgroundPosterHolder.translationY = -scrollY.toFloat() * 0.8f
+            })
+
+            redirectToEpisodes.setOnFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) return@setOnFocusChangeListener
+                toggleEpisodes(true)
+                binding?.apply {
+                    val views = listOf(
+                        resultSeasonSelection,
+                        resultRangeSelection,
+                        resultDubSelection,
+                        resultPlayTrailer,
+                        resultEpisodes
+                    )
+                    for (requestView in views) {
+                        if (!requestView.isShown) continue
+                        if (requestView.requestFocus()) break // View.FOCUS_RIGHT
+                    }
+                }
+            }
+
+            resultEpisodes.setLinearListLayout(isHorizontal = false)/*.layoutManager =
+                LinearListLayout(resultEpisodes.context, resultEpisodes.isRtl()).apply {
+                    setVertical()
+                }*/
+
+            resultReloadConnectionerror.setOnClickListener {
+                viewModel.load(
+                    activity,
+                    storedData.url,
+                    storedData.apiName,
+                    storedData.showFillers,
+                    storedData.dubStatus,
+                    storedData.start
+                )
+
+            }
+
+            resultMetaSite.isFocusable = false
+
+            //resultReloadConnectionOpenInBrowser.setOnClickListener {view ->
+            //    view.context?.openBrowser(storedData?.url ?: return@setOnClickListener, fallbackWebview = true)
+            //}
+
+            resultSeasonSelection.setAdapter()
+            resultRangeSelection.setAdapter()
+            resultDubSelection.setAdapter()
+            resultRecommendationsFilterSelection.setAdapter()
+
+            resultCastItems.setOnFocusChangeListener { _, hasFocus ->
+                // Always escape focus
+                if (hasFocus) binding?.resultBookmarkButton?.requestFocus()
+            }
+            //resultBack.setOnClickListener {
+            //    activity?.popCurrentPage()
+            //}
+
+            resultRecommendationsList.spanCount = 8
+            resultRecommendationsList.adapter =
+                SearchAdapter(
+                    ArrayList(),
+                    resultRecommendationsList,
+                ) { callback ->
+                    if(callback.action == SEARCH_ACTION_FOCUSED)
+                        toggleEpisodes(false)
+                    else
+                        SearchHelper.handleSearchClickCallback(callback)
+                }
+
+            resultEpisodes.adapter =
+                EpisodeAdapter(
+                    false,
+                    { episodeClick ->
+                        viewModel.handleAction(episodeClick)
+                    },
+                    { downloadClickEvent ->
+                        DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
+                    }
+                )
+
+            resultCastItems.layoutManager = object : LinearListLayout(view.context) {
+                override fun onRequestChildFocus(
+                    parent: RecyclerView,
+                    state: RecyclerView.State,
+                    child: View,
+                    focused: View?
+                ): Boolean {
+                    // Make the cast always focus the first visible item when focused
+                    // from somewhere else. Otherwise it jumps to the last item.
+                    return if (parent.focusedChild == null) {
+                        scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
+                        true
+                    } else {
+                        super.onRequestChildFocus(parent, state, child, focused)
+                    }
+                }
+            }.apply {
+                this.orientation = RecyclerView.HORIZONTAL
+            }
+            resultCastItems.adapter = ActorAdaptor {
+                toggleEpisodes(false)
             }
-        (result_episodes?.adapter as EpisodeAdapter?)?.apply {
-            layout = R.layout.result_episode_both_tv
         }
-        //result_episodes?.setMaxViewPoolSize(0, Int.MAX_VALUE)
 
-        result_season_selection.setAdapter()
-        result_range_selection.setAdapter()
-        result_dub_selection.setAdapter()
-        result_recommendations_filter_selection.setAdapter()
+        observeNullable(viewModel.resumeWatching) { resume ->
+            binding?.apply {
+                // show progress no matter if series or movie
+                resume?.progress?.let { progress ->
+                    resultResumeSeriesProgressText.setText(progress.progressLeft)
+                    resultResumeSeriesProgress.apply {
+                        isVisible = true
+                        this.max = progress.maxProgress
+                        this.progress = progress.progress
+                    }
+                    resultResumeProgressHolder.isVisible = true
+                } ?: run {
+                    resultResumeProgressHolder.isVisible = false
+                }
 
-        observe(viewModel.selectPopup) { popup ->
-            when (popup) {
-                is Some.Success -> {
-                    popupDialog?.dismissSafe(activity)
+                // if movie then hide both as movie button is
+                // always visible on movies, this is done in movie observe
 
-                    popupDialog = activity?.let { act ->
-                        val pop = popup.value
-                        val options = pop.getOptions(act)
-                        val title = pop.getTitle(act)
+                if (resume?.isMovie == true) {
+                    resultPlaySeries.isVisible = false
+                    resultResumeSeries.isVisible = false
+                    return@observeNullable
+                }
 
-                        act.showBottomDialogInstant(
-                            options, title, {
-                                popupDialog = null
-                                pop.callback(null)
-                            }, {
-                                popupDialog = null
-                                pop.callback(it)
-                            }
+                // if series then
+                // > resultPlaySeries is visible when null
+                // > resultResumeSeries is visible when not null
+                if (resume == null) {
+                    resultPlaySeries.isVisible = true
+                    resultResumeSeries.isVisible = false
+                    return@observeNullable
+                }
+
+                resultPlaySeries.isVisible = false
+                resultResumeSeries.isVisible = true
+
+                if (hasNoFocus()) {
+                    resultResumeSeries.requestFocus()
+                }
+
+                resultResumeSeries.text =
+                    if (resume.isMovie) context?.getString(R.string.play_movie_button) else context?.getNameFull(
+                        null, // resume.result.name, we don't want episode title
+                        resume.result.episode,
+                        resume.result.season
+                    )
+
+                resultResumeSeries.setOnClickListener {
+                    viewModel.handleAction(
+                        EpisodeClickEvent(
+                            storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER,
+                            resume.result
+                        )
+                    )
+                }
+
+                resultResumeSeries.setOnLongClickListener {
+                    viewModel.handleAction(
+                        EpisodeClickEvent(ACTION_SHOW_OPTIONS, resume.result)
+                    )
+                    return@setOnLongClickListener true
+                }
+
+            }
+        }
+
+        observe(viewModel.trailers) { trailersLinks ->
+            context?.updateHasTrailers()
+            if (!LoadResponse.isTrailersEnabled) return@observe
+            val trailers = trailersLinks.flatMap { it.mirros }
+            binding?.resultPlayTrailer?.apply {
+                isGone = trailers.isEmpty()
+                setOnClickListener {
+                    if (trailers.isEmpty()) return@setOnClickListener
+                    activity.navigate(
+                        R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
+                            ExtractorLinkGenerator(
+                                trailers,
+                                emptyList()
+                            )
+                        )
+                    )
+                }
+            }
+        }
+
+        observe(viewModel.watchStatus) { watchType ->
+            binding?.resultBookmarkButton?.apply {
+                setText(watchType.stringRes)
+                setOnClickListener { view ->
+                    activity?.showBottomDialog(
+                        WatchType.values().map { view.context.getString(it.stringRes) }.toList(),
+                        watchType.ordinal,
+                        view.context.getString(R.string.action_add_to_bookmarks),
+                        showApply = false,
+                        {}) {
+                        viewModel.updateWatchStatus(WatchType.values()[it])
+                    }
+                }
+            }
+        }
+
+        observeNullable(viewModel.movie) { data ->
+            binding?.apply {
+                resultPlayMovie.isVisible = data is Resource.Success
+                seriesHolder.isVisible = data == null
+                resultEpisodesShow.isVisible = data == null
+
+                (data as? Resource.Success)?.value?.let { (text, ep) ->
+                    resultPlayMovie.setText(text)
+                    resultPlayMovie.setOnClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
                         )
                     }
-                }
-                is Some.None -> {
-                    popupDialog?.dismissSafe(activity)
-                    popupDialog = null
+                    resultPlayMovie.setOnLongClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
+                        )
+                        return@setOnLongClickListener true
+                    }
+                    if (hasNoFocus()) {
+                        resultPlayMovie.requestFocus()
+                    }
                 }
             }
         }
 
-        observe(viewModel.loadedLinks) { load ->
-            when (load) {
-                is Some.Success -> {
-                    if (loadingDialog?.isShowing != true) {
-                        loadingDialog?.dismissSafe(activity)
-                        loadingDialog = null
+        observeNullable(viewModel.selectPopup) { popup ->
+            if (popup == null) {
+                popupDialog?.dismissSafe(activity)
+                popupDialog = null
+                return@observeNullable
+            }
+
+            popupDialog?.dismissSafe(activity)
+
+            popupDialog = activity?.let { act ->
+                val options = popup.getOptions(act)
+                val title = popup.getTitle(act)
+
+                act.showBottomDialogInstant(
+                    options, title, {
+                        popupDialog = null
+                        popup.callback(null)
+                    }, {
+                        popupDialog = null
+                        popup.callback(it)
                     }
-                    loadingDialog = loadingDialog ?: context?.let { ctx ->
-                        val builder = BottomSheetDialog(ctx)
-                        builder.setContentView(R.layout.bottom_loading)
-                        builder.setOnDismissListener {
-                            loadingDialog = null
-                            viewModel.cancelLinks()
-                        }
-                        //builder.setOnCancelListener {
-                        //    it?.dismiss()
-                        //}
-                        builder.setCanceledOnTouchOutside(true)
-                        builder.show()
-                        builder
-                    }
-                }
-                is Some.None -> {
-                    loadingDialog?.dismissSafe(activity)
+                )
+            }
+        }
+
+        observeNullable(viewModel.loadedLinks) { load ->
+            if (load == null) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+                return@observeNullable
+            }
+            if (loadingDialog?.isShowing != true) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+            }
+            loadingDialog = loadingDialog ?: context?.let { ctx ->
+                val builder = BottomSheetDialog(ctx)
+                builder.setContentView(R.layout.bottom_loading)
+                builder.setOnDismissListener {
                     loadingDialog = null
+                    viewModel.cancelLinks()
                 }
+                //builder.setOnCancelListener {
+                //    it?.dismiss()
+                //}
+                builder.setCanceledOnTouchOutside(true)
+                builder.show()
+                builder
             }
+
         }
 
 
-        observe(viewModel.episodesCountText) { count ->
-            result_episodes_text.setText(count)
+        observeNullable(viewModel.episodesCountText) { count ->
+            binding?.resultEpisodesText.setText(count)
         }
 
         observe(viewModel.selectedRangeIndex) { selected ->
-            result_range_selection.select(selected)
+            binding?.resultRangeSelection.select(selected)
         }
         observe(viewModel.selectedSeasonIndex) { selected ->
-            result_season_selection.select(selected)
+            binding?.resultSeasonSelection.select(selected)
         }
         observe(viewModel.selectedDubStatusIndex) { selected ->
-            result_dub_selection.select(selected)
+            binding?.resultDubSelection.select(selected)
         }
         observe(viewModel.rangeSelections) {
-            result_range_selection.update(it)
+            binding?.resultRangeSelection.update(it)
         }
         observe(viewModel.dubSubSelections) {
-            result_dub_selection.update(it)
+            binding?.resultDubSelection.update(it)
         }
         observe(viewModel.seasonSelections) {
-            result_season_selection.update(it)
+            binding?.resultSeasonSelection.update(it)
         }
-
-        result_back?.setOnClickListener {
-            activity?.popCurrentPage()
+        observe(viewModel.recommendations) { recommendations ->
+            setRecommendations(recommendations, null)
         }
-
-        result_recommendations?.spanCount = 8
-        result_recommendations?.adapter =
-            SearchAdapter(
-                ArrayList(),
-                result_recommendations,
-            ) { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
+        observe(viewModel.episodeSynopsis) { description ->
+            view.context?.let { ctx ->
+                val builder: AlertDialog.Builder =
+                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                builder.setMessage(description.html())
+                    .setTitle(R.string.synopsis)
+                    .setOnDismissListener {
+                        viewModel.releaseEpisodeSynopsis()
+                    }
+                    .show()
             }
+        }
+        observeNullable(viewModel.episodes) { episodes ->
+            binding?.apply {
+                resultEpisodes.isVisible = episodes is Resource.Success
+                //    resultEpisodeLoading.isVisible = episodes is Resource.Loading
+                if (episodes is Resource.Success) {
+                    val first = episodes.value.firstOrNull()
+                    if (first != null) {
+                        resultPlaySeries.text = context?.getNameFull(
+                            null, // resume.result.name, we don't want episode title
+                            first.episode,
+                            first.season
+                        )
+
+                        resultPlaySeries.setOnClickListener {
+                            viewModel.handleAction(
+                                EpisodeClickEvent(
+                                    ACTION_PLAY_EPISODE_IN_PLAYER,
+                                    first
+                                )
+                            )
+                        }
+                        resultPlaySeries.setOnLongClickListener {
+                            viewModel.handleAction(
+                                EpisodeClickEvent(ACTION_SHOW_OPTIONS, first)
+                            )
+                            return@setOnLongClickListener true
+                        }
+                    }
+
+                    /*
+                     * Okay so what is this fuckery?
+                     * Basically Android TV will crash if you request a new focus while
+                     * the adapter gets updated.
+                     *
+                     * This means that if you load thumbnails and request a next focus at the same time
+                     * the app will crash without any way to catch it!
+                     *
+                     * How to bypass this?
+                     * This code basically steals the focus for 500ms and puts it in an inescapable view
+                     * then lets out the focus by requesting focus to result_episodes
+                     */
+
+                    val hasEpisodes =
+                        !(resultEpisodes.adapter as? EpisodeAdapter?)?.cardList.isNullOrEmpty()
+                    /*val focus = activity?.currentFocus
+
+                    if (hasEpisodes) {
+                        // Make it impossible to focus anywhere else!
+                        temporaryNoFocus.isFocusable = true
+                        temporaryNoFocus.requestFocus()
+                    }*/
+
+                    (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value)
+
+                    /* if (hasEpisodes) main {
+
+                         delay(500)
+                         // This might make some people sad as it changes the focus when leaving an episode :(
+                         if(focus?.requestFocus() == true) {
+                             temporaryNoFocus.isFocusable = false
+                             return@main
+                         }
+                         temporaryNoFocus.isFocusable = false
+                         temporaryNoFocus.requestFocus()
+                     }
+
+                     if (hasNoFocus())
+                         binding?.resultEpisodes?.requestFocus()*/
+                }
+            }
+        }
+
+        observeNullable(viewModel.page) { data ->
+            if (data == null) return@observeNullable
+            binding?.apply {
+                when (data) {
+                    is Resource.Success -> {
+                        val d = data.value
+                        resultVpn.setText(d.vpnText)
+                        resultInfo.setText(d.metaText)
+                        resultNoEpisodes.setText(d.noEpisodesFoundText)
+                        resultTitle.setText(d.titleText)
+                        resultMetaSite.setText(d.apiName)
+                        resultMetaType.setText(d.typeText)
+                        resultMetaYear.setText(d.yearText)
+                        resultMetaDuration.setText(d.durationText)
+                        resultMetaRating.setText(d.ratingText)
+                        resultCastText.setText(d.actorsText)
+                        resultNextAiring.setText(d.nextAiringEpisode)
+                        resultNextAiringTime.setText(d.nextAiringDate)
+                        resultPoster.setImage(d.posterImage)
+                        resultDescription.setTextHtml(d.plotText)
+                        resultDescription.setOnClickListener { view ->
+                            view.context?.let { ctx ->
+                                val builder: AlertDialog.Builder =
+                                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                                builder.setMessage(d.plotText.asString(ctx).html())
+                                    .setTitle(d.plotHeaderText.asString(ctx))
+                                    .show()
+                            }
+                        }
+
+                        val error = listOf(
+                            R.drawable.profile_bg_dark_blue,
+                            R.drawable.profile_bg_blue,
+                            R.drawable.profile_bg_orange,
+                            R.drawable.profile_bg_pink,
+                            R.drawable.profile_bg_purple,
+                            R.drawable.profile_bg_red,
+                            R.drawable.profile_bg_teal
+                        ).random()
+                        backgroundPoster.setImage(
+                            d.posterBackgroundImage ?: UiImage.Drawable(error),
+                            radius = 0,
+                            errorImageDrawable = error
+                        )
+
+                        resultComingSoon.isVisible = d.comingSoon
+                        resultDataHolder.isGone = d.comingSoon
+                        UIHelper.populateChips(resultTag, d.tags)
+                        resultCastItems.isGone = d.actors.isNullOrEmpty()
+                        (resultCastItems.adapter as? ActorAdaptor)?.updateList(
+                            d.actors ?: emptyList()
+                        )
+                    }
+
+                    is Resource.Loading -> {
+
+                    }
+
+                    is Resource.Failure -> {
+                        resultErrorText.text =
+                            storedData.url.plus("\n") + data.errorString
+                    }
+                }
+
+                resultFinishLoading.isVisible = data is Resource.Success
+
+                resultLoading.isVisible = data is Resource.Loading
+
+                resultLoadingError.isVisible = data is Resource.Failure
+                //resultReloadConnectionOpenInBrowser.isVisible = data is Resource.Failure
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index bf47209a..1f663e31 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
@@ -10,21 +10,13 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.discord.panels.PanelsChildGestureRegionObserver
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.IOnBackPressed
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_result.result_smallscreen_holder
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
-import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.fragment_trailer.*
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
 
 
-open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreenPlayer(),
-    PanelsChildGestureRegionObserver.GestureRegionsListener, IOnBackPressed {
+open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
 
     override var lockRotation = false
     override var isFullScreenPlayer = false
@@ -60,13 +52,13 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
                 screenHeight
             }
 
-            result_trailer_loading?.isVisible = false
-            result_smallscreen_holder?.isVisible = !isFullScreenPlayer
-            result_fullscreen_holder?.isVisible = isFullScreenPlayer
+            //result_trailer_loading?.isVisible = false
+            resultBinding?.resultSmallscreenHolder?.isVisible = !isFullScreenPlayer
+            binding?.resultFullscreenHolder?.isVisible = isFullScreenPlayer
 
             val to = sw * h / w
 
-            player_background?.apply {
+            resultBinding?.fragmentTrailer?.playerBackground?.apply {
                 isVisible = true
                 layoutParams =
                     FrameLayout.LayoutParams(
@@ -75,16 +67,17 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
                     )
             }
 
-            player_intro_play?.apply {
+            playerBinding?.playerIntroPlay?.apply {
                 layoutParams =
                     FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
-                        result_top_holder?.measuredHeight ?: FrameLayout.LayoutParams.MATCH_PARENT
+                        resultBinding?.resultTopHolder?.measuredHeight
+                            ?: FrameLayout.LayoutParams.MATCH_PARENT
                     )
             }
 
-            if (player_intro_play?.isGone == true) {
-                result_top_holder?.apply {
+            if (playerBinding?.playerIntroPlay?.isGone == true) {
+                resultBinding?.resultTopHolder?.apply {
 
                     val anim = ValueAnimator.ofInt(
                         measuredHeight,
@@ -131,23 +124,30 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
     private fun updateFullscreen(fullscreen: Boolean) {
         isFullScreenPlayer = fullscreen
         lockRotation = fullscreen
-        player_fullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
+
+        playerBinding?.playerFullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
         if (fullscreen) {
             enterFullscreen()
-            result_top_bar?.isVisible = false
-            result_fullscreen_holder?.isVisible = true
-            result_main_holder?.isVisible = false
-            player_background?.let { view ->
-                (view.parent as ViewGroup?)?.removeView(view)
-                result_fullscreen_holder?.addView(view)
+            binding?.apply {
+                resultTopBar.isVisible = false
+                resultFullscreenHolder.isVisible = true
+                resultMainHolder.isVisible = false
             }
-        } else {
-            result_top_bar?.isVisible = true
-            result_fullscreen_holder?.isVisible = false
-            result_main_holder?.isVisible = true
-            player_background?.let { view ->
+
+            resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
                 (view.parent as ViewGroup?)?.removeView(view)
-                result_smallscreen_holder?.addView(view)
+                binding?.resultFullscreenHolder?.addView(view)
+            }
+
+        } else {
+            binding?.apply {
+                resultTopBar.isVisible = true
+                resultFullscreenHolder.isVisible = false
+                resultMainHolder.isVisible = true
+                resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
+                    (view.parent as ViewGroup?)?.removeView(view)
+                    resultBinding?.resultSmallscreenHolder?.addView(view)
+                }
             }
             exitFullscreen()
         }
@@ -157,14 +157,14 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        player_fullscreen?.setOnClickListener {
+        playerBinding?.playerFullscreen?.setOnClickListener {
             updateFullscreen(!isFullScreenPlayer)
         }
         updateFullscreen(isFullScreenPlayer)
         uiReset()
 
-        player_intro_play?.setOnClickListener {
-            player_intro_play?.isGone = true
+        playerBinding?.playerIntroPlay?.setOnClickListener {
+            playerBinding?.playerIntroPlay?.isGone = true
             player.handleEvent(CSPlayerEvent.Play)
             updateUIVisibility()
             fixPlayerSize()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 46a8c9f6..011d133d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -19,6 +19,7 @@ import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.getCastSession
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
@@ -145,15 +146,18 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                         minute
                     )
                 }
+
                 hours > 0 -> txt(
                     R.string.next_episode_time_hour_format,
                     hours,
                     minute
                 )
+
                 minute > 0 -> txt(
                     R.string.next_episode_time_min_format,
                     minute
                 )
+
                 else -> null
             }?.also {
                 nextAiringEpisode = txt(R.string.next_episode_format, airing.episode)
@@ -305,6 +309,7 @@ fun SelectPopup.getOptions(context: Context): List<String> {
         is SelectPopup.SelectArray -> {
             this.options.map { it.first.asString(context) }
         }
+
         is SelectPopup.SelectText -> options.map { it.asString(context) }
     }
 }
@@ -316,7 +321,7 @@ data class ExtractedTrailerData(
 
 class ResultViewModel2 : ViewModel() {
     private var currentResponse: LoadResponse? = null
-
+    var EPISODE_RANGE_SIZE: Int = 20
     fun clear() {
         currentResponse = null
         _page.postValue(null)
@@ -337,7 +342,7 @@ class ResultViewModel2 : ViewModel() {
     private var currentIndex: EpisodeIndexer? = null
     private var currentRange: EpisodeRange? = null
     private var currentShowFillers: Boolean = false
-    private var currentRepo: APIRepository? = null
+    var currentRepo: APIRepository? = null
     private var currentId: Int? = null
     private var fillers: Map<Int, Boolean> = emptyMap()
     private var generator: IGenerator? = null
@@ -352,17 +357,17 @@ class ResultViewModel2 : ViewModel() {
         MutableLiveData(null)
     val page: LiveData<Resource<ResultData>?> = _page
 
-    private val _episodes: MutableLiveData<ResourceSome<List<ResultEpisode>>> =
-        MutableLiveData(ResourceSome.Loading())
-    val episodes: LiveData<ResourceSome<List<ResultEpisode>>> = _episodes
+    private val _episodes: MutableLiveData<Resource<List<ResultEpisode>>?> =
+        MutableLiveData(Resource.Loading())
+    val episodes: LiveData<Resource<List<ResultEpisode>>?> = _episodes
 
-    private val _movie: MutableLiveData<ResourceSome<Pair<UiText, ResultEpisode>>> =
-        MutableLiveData(ResourceSome.None)
-    val movie: LiveData<ResourceSome<Pair<UiText, ResultEpisode>>> = _movie
+    private val _movie: MutableLiveData<Resource<Pair<UiText, ResultEpisode>>?> =
+        MutableLiveData(null)
+    val movie: LiveData<Resource<Pair<UiText, ResultEpisode>>?> = _movie
 
-    private val _episodesCountText: MutableLiveData<Some<UiText>> =
-        MutableLiveData(Some.None)
-    val episodesCountText: LiveData<Some<UiText>> = _episodesCountText
+    private val _episodesCountText: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val episodesCountText: LiveData<UiText?> = _episodesCountText
 
     private val _trailers: MutableLiveData<List<ExtractedTrailerData>> =
         MutableLiveData(mutableListOf())
@@ -384,16 +389,16 @@ class ResultViewModel2 : ViewModel() {
         MutableLiveData(emptyList())
     val recommendations: LiveData<List<SearchResponse>> = _recommendations
 
-    private val _selectedRange: MutableLiveData<Some<UiText>> =
-        MutableLiveData(Some.None)
-    val selectedRange: LiveData<Some<UiText>> = _selectedRange
+    private val _selectedRange: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val selectedRange: LiveData<UiText?> = _selectedRange
 
-    private val _selectedSeason: MutableLiveData<Some<UiText>> =
-        MutableLiveData(Some.None)
-    val selectedSeason: LiveData<Some<UiText>> = _selectedSeason
+    private val _selectedSeason: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val selectedSeason: LiveData<UiText?> = _selectedSeason
 
-    private val _selectedDubStatus: MutableLiveData<Some<UiText>> = MutableLiveData(Some.None)
-    val selectedDubStatus: LiveData<Some<UiText>> = _selectedDubStatus
+    private val _selectedDubStatus: MutableLiveData<UiText?> = MutableLiveData(null)
+    val selectedDubStatus: LiveData<UiText?> = _selectedDubStatus
 
     private val _selectedRangeIndex: MutableLiveData<Int> =
         MutableLiveData(-1)
@@ -406,12 +411,12 @@ class ResultViewModel2 : ViewModel() {
     private val _selectedDubStatusIndex: MutableLiveData<Int> = MutableLiveData(-1)
     val selectedDubStatusIndex: LiveData<Int> = _selectedDubStatusIndex
 
-    private val _loadedLinks: MutableLiveData<Some<LinkProgress>> = MutableLiveData(Some.None)
-    val loadedLinks: LiveData<Some<LinkProgress>> = _loadedLinks
+    private val _loadedLinks: MutableLiveData<LinkProgress?> = MutableLiveData(null)
+    val loadedLinks: LiveData<LinkProgress?> = _loadedLinks
 
-    private val _resumeWatching: MutableLiveData<Some<ResumeWatchingStatus>> =
-        MutableLiveData(Some.None)
-    val resumeWatching: LiveData<Some<ResumeWatchingStatus>> = _resumeWatching
+    private val _resumeWatching: MutableLiveData<ResumeWatchingStatus?> =
+        MutableLiveData(null)
+    val resumeWatching: LiveData<ResumeWatchingStatus?> = _resumeWatching
 
     private val _episodeSynopsis: MutableLiveData<String?> = MutableLiveData(null)
     val episodeSynopsis: LiveData<String?> = _episodeSynopsis
@@ -421,8 +426,8 @@ class ResultViewModel2 : ViewModel() {
 
     companion object {
         const val TAG = "RVM2"
-        private const val EPISODE_RANGE_SIZE = 20
-        private const val EPISODE_RANGE_OVERLOAD = 30
+        //private const val EPISODE_RANGE_SIZE = 20
+        //private const val EPISODE_RANGE_OVERLOAD = 30
 
         private fun List<SeasonData>?.getSeason(season: Int?): SeasonData? {
             if (season == null) return null
@@ -432,6 +437,8 @@ class ResultViewModel2 : ViewModel() {
         fun updateWatchStatus(currentResponse: LoadResponse, status: WatchType) {
             val currentId = currentResponse.getId()
 
+            val currentWatchType = getResultWatchState(currentId)
+
             DataStoreHelper.setResultWatchState(currentId, status.internalId)
             val current = DataStoreHelper.getBookmarkedData(currentId)
             val currentTime = System.currentTimeMillis()
@@ -449,6 +456,9 @@ class ResultViewModel2 : ViewModel() {
                     currentResponse.year
                 )
             )
+            if (currentWatchType != status) {
+                MainActivity.bookmarksUpdatedEvent(true)
+            }
         }
 
         private fun filterName(name: String?): String? {
@@ -467,12 +477,16 @@ class ResultViewModel2 : ViewModel() {
                 )
             )
 
-        private fun getRanges(allEpisodes: Map<EpisodeIndexer, List<ResultEpisode>>): Map<EpisodeIndexer, List<EpisodeRange>> {
+        private fun getRanges(
+            allEpisodes: Map<EpisodeIndexer, List<ResultEpisode>>,
+            EPISODE_RANGE_SIZE: Int
+        ): Map<EpisodeIndexer, List<EpisodeRange>> {
             return allEpisodes.keys.mapNotNull { index ->
                 val episodes =
                     allEpisodes[index] ?: return@mapNotNull null // this should never happened
 
                 // fast case
+                val EPISODE_RANGE_OVERLOAD = EPISODE_RANGE_SIZE + 10
                 if (episodes.size <= EPISODE_RANGE_OVERLOAD) {
                     return@mapNotNull index to listOf(
                         EpisodeRange(
@@ -744,7 +758,6 @@ class ResultViewModel2 : ViewModel() {
                 if (currentLinks.isEmpty()) {
                     main {
                         showToast(
-                            activity,
                             R.string.no_links_found_toast,
                             Toast.LENGTH_SHORT
                         )
@@ -753,7 +766,6 @@ class ResultViewModel2 : ViewModel() {
                 } else {
                     main {
                         showToast(
-                            activity,
                             R.string.download_started,
                             Toast.LENGTH_SHORT
                         )
@@ -800,8 +812,8 @@ class ResultViewModel2 : ViewModel() {
     private val _watchStatus: MutableLiveData<WatchType> = MutableLiveData(WatchType.NONE)
     val watchStatus: LiveData<WatchType> get() = _watchStatus
 
-    private val _selectPopup: MutableLiveData<Some<SelectPopup>> = MutableLiveData(Some.None)
-    val selectPopup: LiveData<Some<SelectPopup>> get() = _selectPopup
+    private val _selectPopup: MutableLiveData<SelectPopup?> = MutableLiveData(null)
+    val selectPopup: LiveData<SelectPopup?> = _selectPopup
 
 
     fun updateWatchStatus(status: WatchType) {
@@ -885,23 +897,22 @@ class ResultViewModel2 : ViewModel() {
     }
 
     fun cancelLinks() {
-        println("called::cancelLinks")
         currentLoadLinkJob?.cancel()
         currentLoadLinkJob = null
-        _loadedLinks.postValue(Some.None)
+        _loadedLinks.postValue(null)
     }
 
     private fun postPopup(text: UiText, options: List<UiText>, callback: suspend (Int?) -> Unit) {
         _selectPopup.postValue(
-            some(SelectPopup.SelectText(
+            SelectPopup.SelectText(
                 text,
                 options
             ) { value ->
                 viewModelScope.launchSafe {
-                    _selectPopup.postValue(Some.None)
+                    _selectPopup.postValue(null)
                     callback.invoke(value)
                 }
-            })
+            }
         )
     }
 
@@ -912,15 +923,15 @@ class ResultViewModel2 : ViewModel() {
         callback: suspend (Int?) -> Unit
     ) {
         _selectPopup.postValue(
-            some(SelectPopup.SelectArray(
+            SelectPopup.SelectArray(
                 text,
                 options,
             ) { value ->
                 viewModelScope.launchSafe {
-                    _selectPopup.value = Some.None
+                    _selectPopup.postValue(null)
                     callback.invoke(value)
                 }
-            })
+            }
         )
     }
 
@@ -988,7 +999,7 @@ class ResultViewModel2 : ViewModel() {
         val subs: MutableSet<SubtitleData> = mutableSetOf()
         fun updatePage() {
             if (isVisible && isActive) {
-                _loadedLinks.postValue(some(LinkProgress(links.size, subs.size)))
+                _loadedLinks.postValue(LinkProgress(links.size, subs.size))
             }
         }
         try {
@@ -1005,7 +1016,7 @@ class ResultViewModel2 : ViewModel() {
         } catch (e: Exception) {
             logError(e)
         } finally {
-            _loadedLinks.postValue(Some.None)
+            _loadedLinks.postValue(null)
         }
 
         return LinkLoadingResult(sortUrls(links), sortSubs(subs))
@@ -1027,9 +1038,9 @@ class ResultViewModel2 : ViewModel() {
                 logError(t)
                 main {
                     if (t is ActivityNotFoundException) {
-                        showToast(activity, txt(R.string.app_not_found_error), Toast.LENGTH_LONG)
+                        showToast(txt(R.string.app_not_found_error), Toast.LENGTH_LONG)
                     } else {
-                        showToast(activity, t.toString(), Toast.LENGTH_LONG)
+                        showToast(t.toString(), Toast.LENGTH_LONG)
                     }
                 }
             }
@@ -1138,9 +1149,9 @@ class ResultViewModel2 : ViewModel() {
     }
 
 
-    fun handleAction(activity: Activity?, click: EpisodeClickEvent) =
+    fun handleAction(click: EpisodeClickEvent) =
         viewModelScope.launchSafe {
-            handleEpisodeClickEvent(activity, click)
+            handleEpisodeClickEvent(click)
         }
 
     data class ExternalApp(
@@ -1170,7 +1181,7 @@ class ResultViewModel2 : ViewModel() {
         _episodeSynopsis.postValue(null)
     }
 
-    private suspend fun handleEpisodeClickEvent(activity: Activity?, click: EpisodeClickEvent) {
+    private suspend fun handleEpisodeClickEvent(click: EpisodeClickEvent) {
         when (click.action) {
             ACTION_SHOW_OPTIONS -> {
                 val options = mutableListOf<Pair<UiText, Int>>()
@@ -1228,27 +1239,26 @@ class ResultViewModel2 : ViewModel() {
                     options
                 ) { result ->
                     handleEpisodeClickEvent(
-                        activity,
                         click.copy(action = result ?: return@postPopup)
                     )
                 }
             }
+
             ACTION_CLICK_DEFAULT -> {
                 activity?.let { ctx ->
                     if (ctx.isConnectedToChromecast()) {
                         handleEpisodeClickEvent(
-                            activity,
                             click.copy(action = ACTION_CHROME_CAST_EPISODE)
                         )
                     } else {
                         val action = getPlayerAction(ctx)
                         handleEpisodeClickEvent(
-                            activity,
                             click.copy(action = action)
                         )
                     }
                 }
             }
+
             ACTION_SHOW_DESCRIPTION -> {
                 _episodeSynopsis.postValue(click.data.description)
             }
@@ -1280,15 +1290,16 @@ class ResultViewModel2 : ViewModel() {
                         )
                     )
                     showToast(
-                        activity,
                         R.string.download_started,
                         Toast.LENGTH_SHORT
                     )
                 }
             }
+
             ACTION_SHOW_TOAST -> {
-                showToast(activity, R.string.play_episode_toast, Toast.LENGTH_SHORT)
+                showToast(R.string.play_episode_toast, Toast.LENGTH_SHORT)
             }
+
             ACTION_DOWNLOAD_EPISODE -> {
                 val response = currentResponse ?: return
                 downloadEpisode(
@@ -1303,6 +1314,7 @@ class ResultViewModel2 : ViewModel() {
                     response.url
                 )
             }
+
             ACTION_DOWNLOAD_MIRROR -> {
                 val response = currentResponse ?: return
                 acquireSingleLink(
@@ -1326,12 +1338,12 @@ class ResultViewModel2 : ViewModel() {
                         )
                     }
                     showToast(
-                        activity,
                         R.string.download_started,
                         Toast.LENGTH_SHORT
                     )
                 }
             }
+
             ACTION_RELOAD_EPISODE -> {
                 ioSafe {
                     loadLinks(
@@ -1342,6 +1354,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 }
             }
+
             ACTION_CHROME_CAST_MIRROR -> {
                 acquireSingleLink(
                     click.data,
@@ -1351,6 +1364,7 @@ class ResultViewModel2 : ViewModel() {
                     startChromecast(activity, click.data, result.links, result.subs, index)
                 }
             }
+
             ACTION_PLAY_EPISODE_IN_BROWSER -> acquireSingleLink(
                 click.data,
                 isCasting = true,
@@ -1364,6 +1378,7 @@ class ResultViewModel2 : ViewModel() {
                     logError(e)
                 }
             }
+
             ACTION_COPY_LINK -> {
                 acquireSingleLink(
                     click.data,
@@ -1377,16 +1392,18 @@ class ResultViewModel2 : ViewModel() {
                     val link = result.links[index]
                     val clip = ClipData.newPlainText(link.name, link.url)
                     serviceClipboard.setPrimaryClip(clip)
-                    showToast(act, R.string.copy_link_toast, Toast.LENGTH_SHORT)
+                    showToast(R.string.copy_link_toast, Toast.LENGTH_SHORT)
                 }
             }
+
             ACTION_CHROME_CAST_EPISODE -> {
                 startChromecast(activity, click.data)
             }
+
             ACTION_PLAY_EPISODE_IN_VLC_PLAYER -> {
                 loadLinks(click.data, isVisible = true, isCasting = true) { links ->
                     if (links.links.isEmpty()) {
-                        showToast(activity, R.string.no_links_found_toast, Toast.LENGTH_SHORT)
+                        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
                         return@loadLinks
                     }
 
@@ -1397,6 +1414,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 }
             }
+
             ACTION_PLAY_EPISODE_IN_WEB_VIDEO -> acquireSingleLink(
                 click.data,
                 isCasting = true,
@@ -1413,6 +1431,7 @@ class ResultViewModel2 : ViewModel() {
                     result.subs
                 )
             }
+
             ACTION_PLAY_EPISODE_IN_MPV -> acquireSingleLink(
                 click.data,
                 isCasting = true,
@@ -1428,6 +1447,7 @@ class ResultViewModel2 : ViewModel() {
                     result.subs
                 )
             }
+
             ACTION_PLAY_EPISODE_IN_PLAYER -> {
                 val data = currentResponse?.syncData?.toList() ?: emptyList()
                 val list =
@@ -1448,6 +1468,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             ACTION_MARK_AS_WATCHED -> {
                 val isWatched =
                     DataStoreHelper.getVideoWatchState(click.data.id) == VideoWatchState.Watched
@@ -1487,13 +1508,14 @@ class ResultViewModel2 : ViewModel() {
                 }
 
                 val realRecommendations = ArrayList<SearchResponse>()
-                val apiNames = apis.filter {
-                    it.name.contains("gogoanime", true) ||
-                            it.name.contains("9anime", true)
-                }.map {
-                    it.name
+                val apiNames = synchronized(apis) {
+                    apis.filter {
+                        it.name.contains("gogoanime", true) ||
+                                it.name.contains("9anime", true)
+                    }.map {
+                        it.name
+                    }
                 }
-
                 meta.recommendations?.forEach { rec ->
                     apiNames.forEach { name ->
                         realRecommendations.add(rec.copy(apiName = name))
@@ -1672,10 +1694,10 @@ class ResultViewModel2 : ViewModel() {
 
     private fun postMovie() {
         val response = currentResponse
-        _episodes.postValue(ResourceSome.None)
+        _episodes.postValue(null)
 
         if (response == null) {
-            _movie.postValue(ResourceSome.None)
+            _movie.postValue(null)
             return
         }
 
@@ -1692,11 +1714,11 @@ class ResultViewModel2 : ViewModel() {
             }
         )
         val data = getMovie()
-        _episodes.postValue(ResourceSome.None)
+        _episodes.postValue(null)
         if (text == null || data == null) {
-            _movie.postValue(ResourceSome.None)
+            _movie.postValue(null)
         } else {
-            _movie.postValue(ResourceSome.Success(text to data))
+            _movie.postValue(Resource.Success(text to data))
         }
     }
 
@@ -1705,14 +1727,14 @@ class ResultViewModel2 : ViewModel() {
             postMovie()
         } else {
             _episodes.postValue(
-                ResourceSome.Success(
+                Resource.Success(
                     getEpisodes(
                         currentIndex ?: return,
                         currentRange ?: return
                     )
                 )
             )
-            _movie.postValue(ResourceSome.None)
+            _movie.postValue(null)
         }
         postResume()
     }
@@ -1755,14 +1777,14 @@ class ResultViewModel2 : ViewModel() {
 
         val size = currentEpisodes[indexer]?.size
         _episodesCountText.postValue(
-            some(
-                if (isMovie) null else
-                    txt(
-                        R.string.episode_format,
-                        size,
-                        txt(if (size == 1) R.string.episode else R.string.episodes),
-                    )
-            )
+
+            if (isMovie) null else
+                txt(
+                    R.string.episode_format,
+                    size,
+                    txt(if (size == 1) R.string.episode else R.string.episodes),
+                )
+
         )
 
         _selectedSeasonIndex.postValue(
@@ -1770,29 +1792,29 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedSeason.postValue(
-            some(
-                if (isMovie || currentSeasons.size <= 1) null else
-                    when (indexer.season) {
-                        0 -> txt(R.string.no_season)
-                        else -> {
-                            val seasonNames = (currentResponse as? EpisodeResponse)?.seasonNames
-                            val seasonData = seasonNames.getSeason(indexer.season)
 
-                            // If displaySeason is null then only show the name!
-                            if (seasonData?.name != null && seasonData.displaySeason == null) {
-                                txt(seasonData.name)
-                            } else {
-                                val suffix = seasonData?.name?.let { " $it" } ?: ""
-                                txt(
-                                    R.string.season_format,
-                                    txt(R.string.season),
-                                    seasonData?.displaySeason ?: indexer.season,
-                                    suffix
-                                )
-                            }
+            if (isMovie || currentSeasons.size <= 1) null else
+                when (indexer.season) {
+                    0 -> txt(R.string.no_season)
+                    else -> {
+                        val seasonNames = (currentResponse as? EpisodeResponse)?.seasonNames
+                        val seasonData = seasonNames.getSeason(indexer.season)
+
+                        // If displaySeason is null then only show the name!
+                        if (seasonData?.name != null && seasonData.displaySeason == null) {
+                            txt(seasonData.name)
+                        } else {
+                            val suffix = seasonData?.name?.let { " $it" } ?: ""
+                            txt(
+                                R.string.season_format,
+                                txt(R.string.season),
+                                seasonData?.displaySeason ?: indexer.season,
+                                suffix
+                            )
                         }
                     }
-            )
+                }
+
         )
 
         _selectedRangeIndex.postValue(
@@ -1800,13 +1822,13 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedRange.postValue(
-            some(
-                if (isMovie) null else if ((currentRanges[indexer]?.size ?: 0) > 1) {
-                    txt(R.string.episodes_range, range.startEpisode, range.endEpisode)
-                } else {
-                    null
-                }
-            )
+
+            if (isMovie) null else if ((currentRanges[indexer]?.size ?: 0) > 1) {
+                txt(R.string.episodes_range, range.startEpisode, range.endEpisode)
+            } else {
+                null
+            }
+
         )
 
         _selectedDubStatusIndex.postValue(
@@ -1814,10 +1836,10 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedDubStatus.postValue(
-            some(
-                if (isMovie || currentDubStatus.size <= 1) null else
-                    txt(indexer.dubStatus)
-            )
+
+            if (isMovie || currentDubStatus.size <= 1) null else
+                txt(indexer.dubStatus)
+
         )
 
         currentId?.let { id ->
@@ -1851,7 +1873,7 @@ class ResultViewModel2 : ViewModel() {
 
                 }
             }*/
-            _episodes.postValue(ResourceSome.Success(ret))
+            _episodes.postValue(Resource.Success(ret))
         }
     }
 
@@ -1869,7 +1891,7 @@ class ResultViewModel2 : ViewModel() {
     }
 
     private suspend fun postEpisodes(loadResponse: LoadResponse, updateFillers: Boolean) {
-        _episodes.postValue(ResourceSome.Loading())
+        _episodes.postValue(Resource.Loading())
 
         val mainId = loadResponse.getId()
         currentId = mainId
@@ -1924,6 +1946,7 @@ class ResultViewModel2 : ViewModel() {
                 }
                 episodes
             }
+
             is TvSeriesLoadResponse -> {
                 val episodes: MutableMap<EpisodeIndexer, MutableList<ResultEpisode>> =
                     mutableMapOf()
@@ -1968,6 +1991,7 @@ class ResultViewModel2 : ViewModel() {
                 }
                 episodes
             }
+
             is MovieLoadResponse -> {
                 singleMap(
                     buildResultEpisode(
@@ -1989,6 +2013,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             is LiveStreamLoadResponse -> {
                 singleMap(
                     buildResultEpisode(
@@ -2010,6 +2035,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             is TorrentLoadResponse -> {
                 singleMap(
                     buildResultEpisode(
@@ -2031,6 +2057,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             else -> {
                 mapOf()
             }
@@ -2066,7 +2093,7 @@ class ResultViewModel2 : ViewModel() {
         }
 
         currentEpisodes = allEpisodes
-        val ranges = getRanges(allEpisodes)
+        val ranges = getRanges(allEpisodes, EPISODE_RANGE_SIZE)
         currentRanges = ranges
 
 
@@ -2088,7 +2115,7 @@ class ResultViewModel2 : ViewModel() {
     }
 
     fun postResume() {
-        _resumeWatching.postValue(some(resume()))
+        _resumeWatching.postValue(resume())
     }
 
     private fun resume(): ResumeWatchingStatus? {
@@ -2186,7 +2213,6 @@ class ResultViewModel2 : ViewModel() {
                         for (ep in currentRange) {
                             if (ep.getWatchProgress() > 0.9) continue
                             handleAction(
-                                activity,
                                 EpisodeClickEvent(
                                     getPlayerAction(activity),
                                     ep
@@ -2196,6 +2222,7 @@ class ResultViewModel2 : ViewModel() {
                         }
                     }
                 }
+
                 START_ACTION_LOAD_EP -> {
                     val all = currentEpisodes.values.flatten()
                     val episode =
@@ -2206,7 +2233,6 @@ class ResultViewModel2 : ViewModel() {
                             }
                             ?: return@launchSafe
                     handleAction(
-                        activity,
                         EpisodeClickEvent(
                             getPlayerAction(activity),
                             episode
@@ -2227,7 +2253,7 @@ class ResultViewModel2 : ViewModel() {
     ) =
         ioSafe {
             _page.postValue(Resource.Loading(url))
-            _episodes.postValue(ResourceSome.Loading())
+            _episodes.postValue(Resource.Loading())
 
             preferDubStatus = dubStatus
             currentShowFillers = showFillers
@@ -2271,6 +2297,7 @@ class ResultViewModel2 : ViewModel() {
                 is Resource.Failure -> {
                     _page.postValue(data)
                 }
+
                 is Resource.Success -> {
                     if (!isActive) return@ioSafe
                     val loadResponse = ioWork {
@@ -2307,6 +2334,7 @@ class ResultViewModel2 : ViewModel() {
                     if (!isActive) return@ioSafe
                     handleAutoStart(activity, autostart)
                 }
+
                 is Resource.Loading -> {
                     debugException { "Invalid load result" }
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
index 2e7ec529..bcf401ea 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
@@ -1,12 +1,11 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ResultSelectionBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 
 typealias SelectData = Pair<UiText?, Any>
@@ -17,7 +16,9 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return SelectViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.result_selection, parent, false),
+            ResultSelectionBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+
+                    //LayoutInflater.from(parent.context).inflate(R.layout.result_selection, parent, false),
         )
     }
 
@@ -73,10 +74,10 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
 
     private class SelectViewHolder
     constructor(
-        itemView: View,
+        binding: ResultSelectionBinding,
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        private val item: MaterialButton = itemView as MaterialButton
+        RecyclerView.ViewHolder(binding.root) {
+        private val item: MaterialButton = binding.root
 
         fun update(isSelected: Boolean) {
             item.isSelected = isSelected
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
index f2eca5b8..24d56897 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
@@ -8,7 +8,6 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -162,11 +161,3 @@ fun TextView?.setTextHtml(text: UiText?) {
         this.text = str.html()
     }
 }
-
-fun TextView?.setTextHtml(text: Some<UiText>?) {
-    setTextHtml(if (text is Some.Success) text.value else null)
-}
-
-fun TextView?.setText(text: Some<UiText>?) {
-    setText(if (text is Some.Success) text.value else null)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
index 649641c8..b516348d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -4,16 +4,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.R
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
+import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
-import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.search_result_compact.view.*
 import kotlin.math.roundToInt
 
 /** Click */
@@ -39,10 +38,23 @@ class SearchAdapter(
     var hasNext: Boolean = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
         val layout =
-            if (parent.context.IsBottomLayout()) R.layout.search_result_grid_expanded else R.layout.search_result_grid
+            if (parent.context.IsBottomLayout()) SearchResultGridExpandedBinding.inflate(
+                inflater,
+                parent,
+                false
+            ) else SearchResultGridBinding.inflate(
+                inflater,
+                parent,
+                false
+            ) //R.layout.search_result_grid_expanded else R.layout.search_result_grid
+
+
+
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
+            layout,
             clickCallback,
             resView
         )
@@ -73,20 +85,25 @@ class SearchAdapter(
 
     class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: ViewBinding,
         private val clickCallback: (SearchClickCallback) -> Unit,
         resView: AutofitRecyclerView
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        val cardView: ImageView = itemView.imageView
+        RecyclerView.ViewHolder(binding.root) {
 
         private val compactView = false//itemView.context.getGridIsCompact()
         private val coverHeight: Int =
             if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
 
+        private val cardView = when(binding) {
+            is SearchResultGridExpandedBinding -> binding.imageView
+            is SearchResultGridBinding -> binding.imageView
+            else -> null
+        }
+
         fun bind(card: SearchResponse, position: Int) {
             if (!compactView) {
-                cardView.apply {
+                cardView?.apply {
                     layoutParams = FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         coverHeight
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index b4a38216..2f588c19 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -33,6 +33,8 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
+import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -56,8 +58,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-import kotlinx.android.synthetic.main.fragment_search.*
-import kotlinx.android.synthetic.main.tvtypes_chips.*
 import java.util.concurrent.locks.ReentrantLock
 
 const val SEARCH_PREF_TAGS = "search_pref_tags"
@@ -89,6 +89,7 @@ class SearchFragment : Fragment() {
 
     private val searchViewModel: SearchViewModel by activityViewModels()
     private var bottomSheetDialog: BottomSheetDialog? = null
+    var binding: FragmentSearchBinding? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -99,18 +100,21 @@ class SearchFragment : Fragment() {
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         bottomSheetDialog?.ownShow()
-        return inflater.inflate(
-            if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search,
-            container,
-            false
-        )
+
+        val layout = if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search
+
+        val root = inflater.inflate(layout, container, false)
+        // TODO TRYCATCH
+        binding = FragmentSearchBinding.bind(root)
+
+        return root
     }
 
     private fun fixGrid() {
         activity?.getSpanCount()?.let {
             currentSpan = it
         }
-        search_autofit_results.spanCount = currentSpan
+        binding?.searchAutofitResults?.spanCount = currentSpan
         currentSpan = currentSpan
         HomeFragment.configEvent.invoke(currentSpan)
     }
@@ -123,6 +127,7 @@ class SearchFragment : Fragment() {
     override fun onDestroyView() {
         hideKeyboard()
         bottomSheetDialog?.ownHide()
+        binding = null
         super.onDestroyView()
     }
 
@@ -181,7 +186,7 @@ class SearchFragment : Fragment() {
         searchViewModel.reloadRepos()
         context?.filterProviderByPreferredMedia()?.let { validAPIs ->
             bindChips(
-                home_select_group,
+                binding?.tvtypesChipsScroll?.tvtypesChips,
                 selectedSearchTypes,
                 validAPIs.flatMap { api -> api.supportedTypes }.distinct()
             ) { list ->
@@ -189,7 +194,7 @@ class SearchFragment : Fragment() {
                     setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
                     selectedSearchTypes.clear()
                     selectedSearchTypes.addAll(list)
-                    search(main_search?.query?.toString())
+                    search(binding?.mainSearch?.query?.toString())
                 }
             }
         }
@@ -199,24 +204,27 @@ class SearchFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        context?.fixPaddingStatusbar(searchRoot)
+        fixPaddingStatusbar(binding?.searchRoot)
         fixGrid()
         reloadRepos()
 
-        val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>? = activity?.let {
-            SearchAdapter(
-                ArrayList(),
-                search_autofit_results,
-            ) { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
-            }
+        binding?.apply {
+            val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>? =
+                SearchAdapter(
+                    ArrayList(),
+                    searchAutofitResults,
+                ) { callback ->
+                    SearchHelper.handleSearchClickCallback(callback)
+                }
+
+
+            searchAutofitResults.adapter = adapter
+            searchLoadingBar.alpha = 0f
         }
 
-        search_autofit_results.adapter = adapter
-        search_loading_bar.alpha = 0f
 
         val searchExitIcon =
-            main_search.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
+            binding?.mainSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
         // val searchMagIcon =
         //    main_search.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
         //searchMagIcon.scaleX = 0.65f
@@ -230,7 +238,7 @@ class SearchFragment : Fragment() {
             )!!.toMutableSet()
         }
 
-        search_filter.setOnClickListener { searchView ->
+        binding?.searchFilter?.setOnClickListener { searchView ->
             searchView?.context?.let { ctx ->
                 val validAPIs = ctx.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
                 var currentValidApis = listOf<MainAPI>()
@@ -241,7 +249,13 @@ class SearchFragment : Fragment() {
                     BottomSheetDialog(ctx)
 
                 builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-                builder.setContentView(R.layout.home_select_mainpage)
+
+                val binding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate(
+                    builder.layoutInflater,
+                    null,
+                    false
+                )
+                builder.setContentView(binding.root)
                 builder.show()
                 builder.let { dialog ->
                     val isMultiLang = ctx.getApiProviderLangSettings().let { set ->
@@ -303,7 +317,7 @@ class SearchFragment : Fragment() {
                         ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
                     bindChips(
-                        dialog.home_select_group,
+                        binding.tvtypesChipsScroll.tvtypesChips,
                         selectedSearchTypes,
                         TvType.values().toList()
                     ) { list ->
@@ -343,15 +357,15 @@ class SearchFragment : Fragment() {
             ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
         if (isTrueTvSettings()) {
-            search_filter.isFocusable = true
-            search_filter.isFocusableInTouchMode = true
+            binding?.searchFilter?.isFocusable = true
+            binding?.searchFilter?.isFocusableInTouchMode = true
         }
 
-        main_search.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 search(query)
 
-                main_search?.let {
+                binding?.mainSearch?.let {
                     hideKeyboard(it)
                 }
 
@@ -365,17 +379,17 @@ class SearchFragment : Fragment() {
                     searchViewModel.clearSearch()
                     searchViewModel.updateHistory()
                 }
-
-                search_history_holder?.isVisible = showHistory
-
-                search_master_recycler?.isVisible = !showHistory && isAdvancedSearch
-                search_autofit_results?.isVisible = !showHistory && !isAdvancedSearch
+                binding?.apply {
+                    searchHistoryHolder.isVisible = showHistory
+                    searchMasterRecycler.isVisible = !showHistory && isAdvancedSearch
+                    searchAutofitResults.isVisible = !showHistory && !isAdvancedSearch
+                }
 
                 return true
             }
         })
 
-        search_clear_call_history?.setOnClickListener {
+        binding?.searchClearCallHistory?.setOnClickListener {
             activity?.let { ctx ->
                 val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
                 val dialogClickListener =
@@ -409,8 +423,8 @@ class SearchFragment : Fragment() {
         }
 
         observe(searchViewModel.currentHistory) { list ->
-            search_clear_call_history?.isVisible = list.isNotEmpty()
-            (search_history_recycler.adapter as? SearchHistoryAdaptor?)?.updateList(list)
+            binding?.searchClearCallHistory?.isVisible = list.isNotEmpty()
+            (binding?.searchHistoryRecycler?.adapter as? SearchHistoryAdaptor?)?.updateList(list)
         }
 
         searchViewModel.updateHistory()
@@ -420,20 +434,20 @@ class SearchFragment : Fragment() {
                 is Resource.Success -> {
                     it.value.let { data ->
                         if (data.isNotEmpty()) {
-                            (search_autofit_results?.adapter as? SearchAdapter)?.updateList(data)
+                            (binding?.searchAutofitResults?.adapter as? SearchAdapter)?.updateList(data)
                         }
                     }
-                    searchExitIcon.alpha = 1f
-                    search_loading_bar.alpha = 0f
+                    searchExitIcon?.alpha = 1f
+                    binding?.searchLoadingBar?.alpha = 0f
                 }
                 is Resource.Failure -> {
                     // Toast.makeText(activity, "Server error", Toast.LENGTH_LONG).show()
-                    searchExitIcon.alpha = 1f
-                    search_loading_bar.alpha = 0f
+                    searchExitIcon?.alpha = 1f
+                    binding?.searchLoadingBar?.alpha = 0f
                 }
                 is Resource.Loading -> {
-                    searchExitIcon.alpha = 0f
-                    search_loading_bar.alpha = 1f
+                    searchExitIcon?.alpha = 0f
+                    binding?.searchLoadingBar?.alpha = 1f
                 }
             }
         }
@@ -443,7 +457,7 @@ class SearchFragment : Fragment() {
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-                (search_master_recycler?.adapter as ParentItemAdapter?)?.apply {
+                (binding?.searchMasterRecycler?.adapter as ParentItemAdapter?)?.apply {
                     val newItems = list.map { ongoing ->
                         val dataList =
                             if (ongoing.data is Resource.Success) ongoing.data.value else ArrayList()
@@ -477,7 +491,7 @@ class SearchFragment : Fragment() {
 
         val masterAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
             ParentItemAdapter(mutableListOf(), { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
+                SearchHelper.handleSearchClickCallback(callback)
             }, { item ->
                 bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
                     bottomSheetDialog = null
@@ -490,8 +504,8 @@ class SearchFragment : Fragment() {
                 SEARCH_HISTORY_OPEN -> {
                     searchViewModel.clearSearch()
                     if (searchItem.type.isNotEmpty())
-                        updateChips(home_select_group, searchItem.type.toMutableList())
-                    main_search?.setQuery(searchItem.searchText, true)
+                        updateChips(binding?.tvtypesChipsScroll?.tvtypesChips, searchItem.type.toMutableList())
+                    binding?.mainSearch?.setQuery(searchItem.searchText, true)
                 }
                 SEARCH_HISTORY_REMOVE -> {
                     removeKey(SEARCH_HISTORY_KEY, searchItem.key)
@@ -503,20 +517,23 @@ class SearchFragment : Fragment() {
             }
         }
 
-        search_history_recycler?.adapter = historyAdapter
-        search_history_recycler?.layoutManager = GridLayoutManager(context, 1)
+        binding?.apply {
+            searchHistoryRecycler.adapter = historyAdapter
+            searchHistoryRecycler.layoutManager = GridLayoutManager(context, 1)
 
-        search_master_recycler?.adapter = masterAdapter
-        search_master_recycler?.layoutManager = GridLayoutManager(context, 1)
+            searchMasterRecycler.adapter = masterAdapter
+            searchMasterRecycler.layoutManager = GridLayoutManager(context, 1)
 
-        // Automatically search the specified query, this allows the app search to launch from intent
-        arguments?.getString(SEARCH_QUERY)?.let { query ->
-            if (query.isBlank()) return@let
-            main_search?.setQuery(query, true)
-            // Clear the query as to not make it request the same query every time the page is opened
-            arguments?.putString(SEARCH_QUERY, null)
+            // Automatically search the specified query, this allows the app search to launch from intent
+            arguments?.getString(SEARCH_QUERY)?.let { query ->
+                if (query.isBlank()) return@let
+                mainSearch.setQuery(query, true)
+                // Clear the query as to not make it request the same query every time the page is opened
+                arguments?.putString(SEARCH_QUERY, null)
+            }
         }
 
+
         // SubtitlesFragment.push(activity)
         //searchViewModel.search("iron man")
         //(activity as AppCompatActivity).loadResult("https://shiro.is/overlord-dubbed", "overlord-dubbed", "Shiro")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
index 45336d5b..3e33e01a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.search
 
 import android.app.Activity
 import android.widget.Toast
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
@@ -15,21 +16,21 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 object SearchHelper {
-    fun handleSearchClickCallback(activity: Activity?, callback: SearchClickCallback) {
+    fun handleSearchClickCallback(callback: SearchClickCallback) {
         val card = callback.card
         when (callback.action) {
             SEARCH_ACTION_LOAD -> {
-                activity.loadSearchResult(card)
+                loadSearchResult(card)
             }
             SEARCH_ACTION_PLAY_FILE -> {
                 if (card is DataStoreHelper.ResumeWatchingResult) {
                     val id = card.id
                     if(id == null) {
-                        showToast(activity, R.string.error_invalid_id, Toast.LENGTH_SHORT)
+                        showToast(R.string.error_invalid_id, Toast.LENGTH_SHORT)
                     } else {
                         if (card.isFromDownload) {
                             handleDownloadClick(
-                                activity, DownloadClickEvent(
+                                DownloadClickEvent(
                                     DOWNLOAD_ACTION_PLAY_FILE,
                                     VideoDownloadHelper.DownloadEpisodeCached(
                                         card.name,
@@ -45,12 +46,11 @@ object SearchHelper {
                                 )
                             )
                         } else {
-                            activity.loadSearchResult(card, START_ACTION_LOAD_EP, id)
+                            loadSearchResult(card, START_ACTION_LOAD_EP, id)
                         }
                     }
                 } else {
                     handleSearchClickCallback(
-                        activity,
                         SearchClickCallback(SEARCH_ACTION_LOAD, callback.view, -1, callback.card)
                     )
                 }
@@ -60,10 +60,10 @@ object SearchHelper {
                     (activity as? MainActivity?)?.apply {
                         loadPopup(callback.card)
                     } ?: kotlin.run {
-                        showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                        showToast(callback.card.name, Toast.LENGTH_SHORT)
                     }
                 } else {
-                    showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                    showToast(callback.card.name, Toast.LENGTH_SHORT)
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt
index 8132301b..0a2ecb81 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt
@@ -10,7 +10,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
-import kotlinx.android.synthetic.main.search_history_item.view.*
+import com.lagradost.cloudstream3.databinding.AccountSingleBinding
+import com.lagradost.cloudstream3.databinding.SearchHistoryItemBinding
 
 data class SearchHistoryItem(
     @JsonProperty("searchedAt") val searchedAt: Long,
@@ -34,8 +35,7 @@ class SearchHistoryAdaptor(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.search_history_item, parent, false),
+            SearchHistoryItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
             clickCallback,
         )
     }
@@ -65,22 +65,24 @@ class SearchHistoryAdaptor(
 
     class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: SearchHistoryItemBinding,
         private val clickCallback: (SearchHistoryCallback) -> Unit,
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        private val removeButton: ImageView = itemView.home_history_remove
-        private val openButton: View = itemView.home_history_tab
-        private val title: TextView = itemView.home_history_title
+        RecyclerView.ViewHolder(binding.root) {
+        //  private val removeButton: ImageView = itemView.home_history_remove
+        //  private val openButton: View = itemView.home_history_tab
+        // private val title: TextView = itemView.home_history_title
 
         fun bind(card: SearchHistoryItem) {
-            title.text = card.searchText
+            binding.apply {
+                homeHistoryTitle.text = card.searchText
 
-            removeButton.setOnClickListener {
-                clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_REMOVE))
-            }
-            openButton.setOnClickListener {
-                clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_OPEN))
+                homeHistoryRemove.setOnClickListener {
+                    clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_REMOVE))
+                }
+                homeHistoryTab.setOnClickListener {
+                    clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_OPEN))
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
index 3447ee32..e1b72b30 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.search
 
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -10,14 +9,20 @@ import androidx.cardview.widget.CardView
 import androidx.core.view.isVisible
 import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.AnimeSearchResponse
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.LiveSearchResponse
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.isMovieType
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.home_result_grid.view.*
 
 object SearchResultBuilder {
     private val showCache: MutableMap<String, Boolean> = mutableMapOf()
@@ -45,19 +50,21 @@ object SearchResultBuilder {
         nextFocusDown: Int? = null,
         colorCallback : ((Palette) -> Unit)? = null
     ) {
-        val cardView: ImageView = itemView.imageView
-        val cardText: TextView? = itemView.imageText
+        val cardView: ImageView = itemView.findViewById(R.id.imageView)
+        val cardText: TextView? = itemView.findViewById(R.id.imageText)
 
-        val textIsDub: TextView? = itemView.text_is_dub
-        val textIsSub: TextView? = itemView.text_is_sub
-        val textFlag: TextView? = itemView.text_flag
-        val textQuality: TextView? = itemView.text_quality
-        val shadow: View? = itemView.title_shadow
+        val textIsDub: TextView? = itemView.findViewById(R.id.text_is_dub)
+        val textIsSub: TextView? = itemView.findViewById(R.id.text_is_sub)
+        val textFlag: TextView? = itemView.findViewById(R.id.text_flag)
+        val rating: TextView? = itemView.findViewById(R.id.text_rating)
 
-        val bg: CardView = itemView.background_card
+        val textQuality: TextView? = itemView.findViewById(R.id.text_quality)
+        val shadow: View? = itemView.findViewById(R.id.title_shadow)
 
-        val bar: ProgressBar? = itemView.watchProgress
-        val playImg: ImageView? = itemView.search_item_download_play
+        val bg: CardView = itemView.findViewById(R.id.background_card)
+
+        val bar: ProgressBar? = itemView.findViewById(R.id.watchProgress)
+        val playImg: ImageView? = itemView.findViewById(R.id.search_item_download_play)
 
         // Do logic
 
@@ -66,12 +73,25 @@ object SearchResultBuilder {
         textIsDub?.isVisible = false
         textIsSub?.isVisible = false
         textFlag?.isVisible = false
+        rating?.isVisible = false
 
         val showSub = showCache[textIsDub?.context?.getString(R.string.show_sub_key)] ?: false
         val showDub = showCache[textIsDub?.context?.getString(R.string.show_dub_key)] ?: false
         val showTitle = showCache[cardText?.context?.getString(R.string.show_title_key)] ?: false
         val showHd = showCache[textQuality?.context?.getString(R.string.show_hd_key)] ?: false
 
+        if(card is SyncAPI.LibraryItem) {
+            val showRating = (card.personalRating ?: 0) != 0
+            rating?.isVisible = showRating
+            if (showRating) {
+                // We want to show 8.5 but not 8.0 hence the replace
+                val ratingText = ((card.personalRating ?: 0).toDouble() / 10).toString()
+                    .replace(".0", "")
+
+                rating?.text = ratingText
+            }
+        }
+
         shadow?.isVisible = showTitle
 
         when (card.quality) {
@@ -142,15 +162,42 @@ object SearchResultBuilder {
             }
         }
 
-        bg.setOnClickListener {
-            click(it)
+        bg.isFocusable = false
+        bg.isFocusableInTouchMode = false
+        if(!isTrueTvSettings()) {
+            bg.setOnClickListener {
+                click(it)
+            }
+            bg.setOnLongClickListener {
+                longClick(it)
+                return@setOnLongClickListener true
+            }
         }
+        //
+       //
+        //
 
         itemView.setOnClickListener {
             click(it)
         }
-
         if (nextFocusUp != null) {
+            itemView.nextFocusUpId = nextFocusUp
+        }
+
+        if (nextFocusDown != null) {
+            itemView.nextFocusDownId = nextFocusDown
+        }
+
+        /*when (nextFocusBehavior) {
+            true -> itemView.nextFocusLeftId = bg.id
+            false -> itemView.nextFocusRightId = bg.id
+            null -> {
+                bg.nextFocusRightId = -1
+                bg.nextFocusLeftId = -1
+            }
+        }*/
+
+        /*if (nextFocusUp != null) {
             bg.nextFocusUpId = nextFocusUp
         }
 
@@ -158,36 +205,26 @@ object SearchResultBuilder {
             bg.nextFocusDownId = nextFocusDown
         }
 
-        when (nextFocusBehavior) {
-            true -> bg.nextFocusLeftId = bg.id
-            false -> bg.nextFocusRightId = bg.id
-            null -> {
-                bg.nextFocusRightId = -1
-                bg.nextFocusLeftId = -1
-            }
-        }
+        */
 
         if (isTrueTvSettings()) {
-            bg.isFocusable = true
-            bg.isFocusableInTouchMode = true
-            bg.touchscreenBlocksFocus = false
+           // bg.isFocusable = true
+           // bg.isFocusableInTouchMode = true
+           // bg.touchscreenBlocksFocus = false
             itemView.isFocusableInTouchMode = true
             itemView.isFocusable = true
         }
 
-        bg.setOnLongClickListener {
-            longClick(it)
-            return@setOnLongClickListener true
-        }
+        /**/
 
         itemView.setOnLongClickListener {
             longClick(it)
             return@setOnLongClickListener true
         }
 
-        bg.setOnFocusChangeListener { view, b ->
+        /*bg.setOnFocusChangeListener { view, b ->
             focus(view, b)
-        }
+        }*/
 
         itemView.setOnFocusChangeListener { view, b ->
             focus(view, b)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
index aceda644..320687f8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
@@ -37,7 +37,7 @@ class SearchViewModel : ViewModel() {
     private val _currentHistory: MutableLiveData<List<SearchHistoryItem>> = MutableLiveData()
     val currentHistory: LiveData<List<SearchHistoryItem>> get() = _currentHistory
 
-    private var repos = apis.map { APIRepository(it) }
+    private var repos = synchronized(apis) { apis.map { APIRepository(it) } }
 
     fun clearSearch() {
         _searchResponse.postValue(Resource.Success(ArrayList()))
@@ -48,7 +48,7 @@ class SearchViewModel : ViewModel() {
     private var onGoingSearch: Job? = null
 
     fun reloadRepos() {
-        repos = apis.map { APIRepository(it) }
+        repos = synchronized(apis) { apis.map { APIRepository(it) } }
     }
 
     fun searchAndCancel(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt
index e879f0df..1dc79dc0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt
@@ -3,11 +3,10 @@ package com.lagradost.cloudstream3.ui.settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.AccountSingleBinding
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
@@ -15,14 +14,15 @@ class AccountClickCallback(val action: Int, val view: View, val card: AuthAPI.Lo
 
 class AccountAdapter(
     val cardList: List<AuthAPI.LoginInfo>,
-    val layout: Int = R.layout.account_single,
     private val clickCallback: (AccountClickCallback) -> Unit
 ) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false), clickCallback
+            AccountSingleBinding.inflate(LayoutInflater.from(parent.context), parent, false), //LayoutInflater.from(parent.context).inflate(layout, parent, false),
+
+            clickCallback
         )
     }
 
@@ -43,18 +43,18 @@ class AccountAdapter(
     }
 
     class CardViewHolder
-    constructor(itemView: View, private val clickCallback: (AccountClickCallback) -> Unit) :
-        RecyclerView.ViewHolder(itemView) {
-        private val pfp: ImageView = itemView.findViewById(R.id.account_profile_picture)!!
-        private val accountName: TextView = itemView.findViewById(R.id.account_name)!!
+    constructor(val binding: AccountSingleBinding, private val clickCallback: (AccountClickCallback) -> Unit) :
+        RecyclerView.ViewHolder(binding.root) {
+      //  private val pfp: ImageView = itemView.findViewById(R.id.account_profile_picture)!!
+       // private val accountName: TextView = itemView.findViewById(R.id.account_name)!!
 
         fun bind(card: AuthAPI.LoginInfo) {
             // just in case name is null account index will show, should never happened
-            accountName.text = card.name ?: "%s %d".format(
-                accountName.context.getString(R.string.account),
+            binding.accountName.text = card.name ?: "%s %d".format(
+                binding.accountName.context.getString(R.string.account),
                 card.accountIndex
             )
-            pfp.isVisible = pfp.setImage(card.profilePicture)
+            binding.accountProfilePicture.isVisible = binding.accountProfilePicture.setImage(card.profilePicture)
 
             itemView.setOnClickListener {
                 clickCallback.invoke(AccountClickCallback(0, itemView, card))
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
index 1ef3cb55..33316020 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
@@ -15,6 +15,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.AccountManagmentBinding
+import com.lagradost.cloudstream3.databinding.AccountSwitchBinding
+import com.lagradost.cloudstream3.databinding.AddAccountInputBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
@@ -31,9 +34,6 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.account_managment.*
-import kotlinx.android.synthetic.main.account_switch.*
-import kotlinx.android.synthetic.main.add_account_input.*
 
 class SettingsAccount : PreferenceFragmentCompat() {
     companion object {
@@ -43,15 +43,18 @@ class SettingsAccount : PreferenceFragmentCompat() {
             api: AccountManager,
             info: AuthAPI.LoginInfo
         ) {
+            if (activity == null) return
+            val binding: AccountManagmentBinding =
+                AccountManagmentBinding.inflate(activity.layoutInflater, null, false)
             val builder =
-                AlertDialog.Builder(activity ?: return, R.style.AlertDialogCustom)
-                    .setView(R.layout.account_managment)
+                AlertDialog.Builder(activity, R.style.AlertDialogCustom)
+                    .setView(binding.root)
             val dialog = builder.show()
 
-            dialog.account_main_profile_picture_holder?.isVisible =
-                dialog.account_main_profile_picture?.setImage(info.profilePicture) == true
+            binding.accountMainProfilePictureHolder.isVisible =
+                binding.accountMainProfilePicture.setImage(info.profilePicture)
 
-            dialog.account_logout?.setOnClickListener {
+            binding.accountLogout.setOnClickListener {
                 api.logOut()
                 dialog.dismissSafe(activity)
             }
@@ -60,26 +63,28 @@ class SettingsAccount : PreferenceFragmentCompat() {
                 dialog.findViewById<TextView>(R.id.account_name)?.text = it
             }
 
-            dialog.account_site?.text = api.name
-            dialog.account_switch_account?.setOnClickListener {
+            binding.accountSite.text = api.name
+            binding.accountSwitchAccount.setOnClickListener {
                 dialog.dismissSafe(activity)
                 showAccountSwitch(activity, api)
             }
 
             if (isTvSettings()) {
-                dialog.account_switch_account?.requestFocus()
+                binding.accountSwitchAccount.requestFocus()
             }
         }
 
-        fun showAccountSwitch(activity: FragmentActivity, api: AccountManager) {
+        private fun showAccountSwitch(activity: FragmentActivity, api: AccountManager) {
             val accounts = api.getAccounts() ?: return
+            val binding: AccountSwitchBinding =
+                AccountSwitchBinding.inflate(activity.layoutInflater, null, false)
 
             val builder =
                 AlertDialog.Builder(activity, R.style.AlertDialogCustom)
-                    .setView(R.layout.account_switch)
+                    .setView(binding.root)
             val dialog = builder.show()
 
-            dialog.account_add?.setOnClickListener {
+            binding.accountAdd.setOnClickListener {
                 addAccount(activity, api)
                 dialog?.dismissSafe(activity)
             }
@@ -96,7 +101,7 @@ class SettingsAccount : PreferenceFragmentCompat() {
                 }
             }
             api.accountIndex = ogIndex
-            val adapter = AccountAdapter(items, R.layout.account_single) {
+            val adapter = AccountAdapter(items) {
                 dialog?.dismissSafe(activity)
                 api.changeAccount(it.card.accountIndex)
             }
@@ -111,17 +116,21 @@ class SettingsAccount : PreferenceFragmentCompat() {
                     is OAuth2API -> {
                         api.authenticate(activity)
                     }
+
                     is InAppAuthAPI -> {
+                        if (activity == null) return
+                        val binding: AddAccountInputBinding =
+                            AddAccountInputBinding.inflate(activity.layoutInflater, null, false)
                         val builder =
-                            AlertDialog.Builder(activity ?: return, R.style.AlertDialogCustom)
-                                .setView(R.layout.add_account_input)
+                            AlertDialog.Builder(activity, R.style.AlertDialogCustom)
+                                .setView(binding.root)
                         val dialog = builder.show()
 
-                        val visibilityMap = mapOf(
-                            dialog.login_email_input to api.requiresEmail,
-                            dialog.login_password_input to api.requiresPassword,
-                            dialog.login_server_input to api.requiresServer,
-                            dialog.login_username_input to api.requiresUsername
+                        val visibilityMap = listOf(
+                            binding.loginEmailInput to api.requiresEmail,
+                            binding.loginPasswordInput to api.requiresPassword,
+                            binding.loginServerInput to api.requiresServer,
+                            binding.loginUsernameInput to api.requiresUsername
                         )
 
                         if (isTvSettings()) {
@@ -145,12 +154,12 @@ class SettingsAccount : PreferenceFragmentCompat() {
                             }
                         }
 
-                        dialog.login_email_input?.isVisible = api.requiresEmail
-                        dialog.login_password_input?.isVisible = api.requiresPassword
-                        dialog.login_server_input?.isVisible = api.requiresServer
-                        dialog.login_username_input?.isVisible = api.requiresUsername
-                        dialog.create_account?.isGone = api.createAccountUrl.isNullOrBlank()
-                        dialog.create_account?.setOnClickListener {
+                        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
@@ -159,43 +168,43 @@ class SettingsAccount : PreferenceFragmentCompat() {
                         }
 
                         val displayedItems = listOf(
-                            dialog.login_username_input,
-                            dialog.login_email_input,
-                            dialog.login_server_input,
-                            dialog.login_password_input
+                            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.id.let { previous?.nextFocusDownId = it }
+                            previous?.id?.let { item.nextFocusUpId = it }
                             item
                         }
 
                         displayedItems.firstOrNull()?.let {
-                            dialog.create_account?.nextFocusDownId = it.id
-                            it.nextFocusUpId = dialog.create_account.id
+                            binding.createAccount.nextFocusDownId = it.id
+                            it.nextFocusUpId = binding.createAccount.id
                         }
-                        dialog.apply_btt?.id?.let {
+                        binding.applyBtt.id.let {
                             displayedItems.lastOrNull()?.nextFocusDownId = it
                         }
 
-                        dialog.text1?.text = api.name
+                        binding.text1.text = api.name
 
                         if (api.storesPasswordInPlainText) {
                             api.getLatestLoginData()?.let { data ->
-                                dialog.login_email_input?.setText(data.email ?: "")
-                                dialog.login_server_input?.setText(data.server ?: "")
-                                dialog.login_username_input?.setText(data.username ?: "")
-                                dialog.login_password_input?.setText(data.password ?: "")
+                                binding.loginEmailInput.setText(data.email ?: "")
+                                binding.loginServerInput.setText(data.server ?: "")
+                                binding.loginUsernameInput.setText(data.username ?: "")
+                                binding.loginPasswordInput.setText(data.password ?: "")
                             }
                         }
 
-                        dialog.apply_btt?.setOnClickListener {
+                        binding.applyBtt.setOnClickListener {
                             val loginData = InAppAuthAPI.LoginData(
-                                username = if (api.requiresUsername) dialog.login_username_input?.text?.toString() else null,
-                                password = if (api.requiresPassword) dialog.login_password_input?.text?.toString() else null,
-                                email = if (api.requiresEmail) dialog.login_email_input?.text?.toString() else null,
-                                server = if (api.requiresServer) dialog.login_server_input?.text?.toString() else null,
+                                username = if (api.requiresUsername) binding.loginUsernameInput.text?.toString() else null,
+                                password = if (api.requiresPassword) binding.loginPasswordInput.text?.toString() else null,
+                                email = if (api.requiresEmail) binding.loginEmailInput.text?.toString() else null,
+                                server = if (api.requiresServer) binding.loginServerInput.text?.toString() else null,
                             )
                             ioSafe {
                                 val isSuccessful = try {
@@ -207,7 +216,6 @@ class SettingsAccount : PreferenceFragmentCompat() {
                                 activity.runOnUiThread {
                                     try {
                                         showToast(
-                                            activity,
                                             activity.getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail)
                                                 .format(
                                                     api.name
@@ -220,10 +228,11 @@ class SettingsAccount : PreferenceFragmentCompat() {
                             }
                             dialog.dismissSafe(activity)
                         }
-                        dialog.cancel_btt?.setOnClickListener {
+                        binding.cancelBtt.setOnClickListener {
                             dialog.dismissSafe(activity)
                         }
                     }
+
                     else -> {
                         throw NotImplementedError("You are trying to add an account that has an unknown login method")
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index 40c996cc..e53fa91a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -8,13 +8,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.annotation.StringRes
+import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.google.android.material.appbar.MaterialToolbar
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.MainSettingsBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
 import com.lagradost.cloudstream3.ui.home.HomeFragment
@@ -22,16 +26,14 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.main_settings.*
-import kotlinx.android.synthetic.main.standard_toolbar.*
 import java.io.File
 
 class SettingsFragment : Fragment() {
     companion object {
         var beneneCount = 0
 
-        private var isTv : Boolean = false
-        private var isTrueTv : Boolean = false
+        private var isTv: Boolean = false
+        private var isTrueTv: Boolean = false
 
         fun PreferenceFragmentCompat?.getPref(id: Int): Preference? {
             if (this == null) return null
@@ -55,26 +57,31 @@ class SettingsFragment : Fragment() {
 
         fun Fragment?.setUpToolbar(title: String) {
             if (this == null) return
-            settings_toolbar?.apply {
+            val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
+
+            settingsToolbar.apply {
                 setTitle(title)
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
                 setNavigationOnClickListener {
                     activity?.onBackPressed()
                 }
             }
-            context.fixPaddingStatusbar(settings_toolbar)
+            fixPaddingStatusbar(settingsToolbar)
         }
 
         fun Fragment?.setUpToolbar(@StringRes title: Int) {
             if (this == null) return
-            settings_toolbar?.apply {
+            val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
+
+            settingsToolbar.apply {
                 setTitle(title)
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+                children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
                 setNavigationOnClickListener {
                     activity?.onBackPressed()
                 }
             }
-            context.fixPaddingStatusbar(settings_toolbar)
+            fixPaddingStatusbar(settingsToolbar)
         }
 
         fun getFolderSize(dir: File): Long {
@@ -139,12 +146,21 @@ class SettingsFragment : Fragment() {
         }
     }
 
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    var binding: MainSettingsBinding? = null
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.main_settings, container, false)
+    ): View {
+        val localBinding = MainSettingsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.main_settings, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -152,41 +168,41 @@ class SettingsFragment : Fragment() {
             activity?.navigate(id, Bundle())
         }
 
+        // used to debug leaks showToast(activity,"${VideoDownloadManager.downloadStatusEvent.size} : ${VideoDownloadManager.downloadProgressEvent.size}")
+
         val isTrueTv = isTrueTvSettings()
 
         for (syncApi in accountManagers) {
             val login = syncApi.loginInfo()
             val pic = login?.profilePicture ?: continue
-            if (settings_profile_pic?.setImage(
+            if (binding?.settingsProfilePic?.setImage(
                     pic,
                     errorImageDrawable = HomeFragment.errorProfilePic
                 ) == true
             ) {
-                settings_profile_text?.text = login.name
-                settings_profile?.isVisible = true
+                binding?.settingsProfileText?.text = login.name
+                binding?.settingsProfile?.isVisible = true
                 break
             }
         }
-
-        listOf(
-            Pair(settings_general, R.id.action_navigation_settings_to_navigation_settings_general),
-            Pair(settings_player, R.id.action_navigation_settings_to_navigation_settings_player),
-            Pair(settings_credits, R.id.action_navigation_settings_to_navigation_settings_account),
-            Pair(settings_ui, R.id.action_navigation_settings_to_navigation_settings_ui),
-            Pair(settings_providers, R.id.action_navigation_settings_to_navigation_settings_providers),
-            Pair(settings_updates, R.id.action_navigation_settings_to_navigation_settings_updates),
-            Pair(
-                settings_extensions,
-                R.id.action_navigation_settings_to_navigation_settings_extensions
-            ),
-        ).forEach { (view, navigationId) ->
-            view?.apply {
-                setOnClickListener {
-                    navigate(navigationId)
-                }
-                if (isTrueTv) {
-                    isFocusable = true
-                    isFocusableInTouchMode = true
+        binding?.apply {
+            listOf(
+                settingsGeneral to R.id.action_navigation_settings_to_navigation_settings_general,
+                settingsPlayer to R.id.action_navigation_settings_to_navigation_settings_player,
+                settingsCredits to R.id.action_navigation_settings_to_navigation_settings_account,
+                settingsUi to R.id.action_navigation_settings_to_navigation_settings_ui,
+                settingsProviders to R.id.action_navigation_settings_to_navigation_settings_providers,
+                settingsUpdates to R.id.action_navigation_settings_to_navigation_settings_updates,
+                settingsExtensions to R.id.action_navigation_settings_to_navigation_settings_extensions,
+            ).forEach { (view, navigationId) ->
+                view.apply {
+                    setOnClickListener {
+                        navigate(navigationId)
+                    }
+                    if (isTrueTv) {
+                        isFocusable = true
+                        isFocusableInTouchMode = true
+                    }
                 }
             }
         }
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 ee262eec..d76eba1e 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
@@ -20,8 +20,11 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.databinding.AddRemoveSitesBinding
+import com.lagradost.cloudstream3.databinding.AddSiteInputBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.network.initClient
@@ -38,8 +41,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.getBasePath
-import kotlinx.android.synthetic.main.add_remove_sites.*
-import kotlinx.android.synthetic.main.add_site_input.*
 import java.io.File
 
 fun getCurrentLocale(context: Context): String {
@@ -69,6 +70,7 @@ val appLanguages = arrayListOf(
     Triple("", "español", "es"),
     Triple("", "فارسی", "fa"),
     Triple("", "français", "fr"),
+    Triple("", "galego", "gl"),
     Triple("", "हिन्दी", "hi"),
     Triple("", "hrvatski", "hr"),
     Triple("", "magyar", "hu"),
@@ -188,7 +190,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
 
 
         fun showAdd() {
-            val providers = allProviders.distinctBy { it.javaClass }.sortedBy { it.name }
+            val providers = synchronized(allProviders) { allProviders.distinctBy { it.javaClass }.sortedBy { it.name } }
             activity?.showDialog(
                 providers.map { "${it.name} (${it.mainUrl})" },
                 -1,
@@ -197,21 +199,23 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                 {}) { selection ->
                 val provider = providers.getOrNull(selection) ?: return@showDialog
 
+                val binding : AddSiteInputBinding = AddSiteInputBinding.inflate(layoutInflater,null,false)
+
                 val builder =
                     AlertDialog.Builder(context ?: return@showDialog, R.style.AlertDialogCustom)
-                        .setView(R.layout.add_site_input)
+                        .setView(binding.root)
 
                 val dialog = builder.create()
                 dialog.show()
 
-                dialog.text2?.text = provider.name
-                dialog.apply_btt?.setOnClickListener {
-                    val name = dialog.site_name_input?.text?.toString()
-                    val url = dialog.site_url_input?.text?.toString()
-                    val lang = dialog.site_lang_input?.text?.toString()
+                binding.text2.text = provider.name
+                binding.applyBtt.setOnClickListener {
+                    val name = binding.siteNameInput.text?.toString()
+                    val url = binding.siteUrlInput.text?.toString()
+                    val lang = binding.siteLangInput.text?.toString()
                     val realLang = if (lang.isNullOrBlank()) provider.lang else lang
                     if (url.isNullOrBlank() || name.isNullOrBlank() || realLang.length != 2) {
-                        showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                        showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
                         return@setOnClickListener
                     }
 
@@ -219,10 +223,12 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                     val newSite = CustomSite(provider.javaClass.simpleName, name, url, realLang)
                     current.add(newSite)
                     setKey(USER_PROVIDER_API, current.toTypedArray())
+                    // reload apis
+                    MainActivity.afterPluginsLoadedEvent.invoke(false)
 
                     dialog.dismissSafe(activity)
                 }
-                dialog.cancel_btt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     dialog.dismissSafe(activity)
                 }
             }
@@ -242,18 +248,19 @@ class SettingsGeneral : PreferenceFragmentCompat() {
         }
 
         fun showAddOrDelete() {
+            val binding : AddRemoveSitesBinding = AddRemoveSitesBinding.inflate(layoutInflater,null,false)
             val builder =
                 AlertDialog.Builder(context ?: return, R.style.AlertDialogCustom)
-                    .setView(R.layout.add_remove_sites)
+                    .setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
 
-            dialog.add_site?.setOnClickListener {
+            binding.addSite.setOnClickListener {
                 showAdd()
                 dialog.dismissSafe(activity)
             }
-            dialog.remove_site?.setOnClickListener {
+            binding.removeSite.setOnClickListener {
                 showDelete()
                 dialog.dismissSafe(activity)
             }
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 42a864a6..0bef5e9a 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
@@ -105,8 +105,10 @@ class SettingsProviders : PreferenceFragmentCompat() {
 
         getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { current ->
-                val languages = APIHolder.apis.map { it.lang }.toSet()
-                    .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+                val languages = synchronized(APIHolder.apis) {
+                    APIHolder.apis.map { it.lang }.toSet()
+                        .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+                }
 
                 val currentList = current.map {
                     languages.indexOf(it)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index f9ac3fee..915ef15f 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
@@ -13,6 +13,7 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.LogcatBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
@@ -25,7 +26,6 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.logcat.*
 import okhttp3.internal.closeQuietly
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -60,7 +60,9 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         getPref(R.string.show_logcat_key)?.setOnPreferenceClickListener { pref ->
             val builder =
                 AlertDialog.Builder(pref.context, R.style.AlertDialogCustom)
-                    .setView(R.layout.logcat)
+
+            val binding = LogcatBinding.inflate(layoutInflater,null,false )
+            builder.setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
@@ -81,9 +83,9 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             }
 
             val text = log.toString()
-            dialog.text1?.text = text
+            binding.text1.text = text
 
-            dialog.copy_btt?.setOnClickListener {
+            binding.copyBtt.setOnClickListener {
                 // Can crash on too much text
                 try {
                     val serviceClipboard =
@@ -93,14 +95,14 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                     serviceClipboard.setPrimaryClip(clip)
                     dialog.dismissSafe(activity)
                 } catch (e: TransactionTooLargeException) {
-                    showToast(activity, R.string.clipboard_too_large)
+                    showToast(R.string.clipboard_too_large)
                 }
             }
-            dialog.clear_btt?.setOnClickListener {
+            binding.clearBtt.setOnClickListener {
                 Runtime.getRuntime().exec("logcat -c")
                 dialog.dismissSafe(activity)
             }
-            dialog.save_btt?.setOnClickListener {
+            binding.saveBtt.setOnClickListener {
                 var fileStream: OutputStream? = null
                 try {
                     fileStream =
@@ -119,7 +121,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                     dialog.dismissSafe(activity)
                 }
             }
-            dialog.close_btt?.setOnClickListener {
+            binding.closeBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
             return@setOnPreferenceClickListener true
@@ -156,7 +158,6 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 if (activity?.runAutoUpdate(false) == false) {
                     activity?.runOnUiThread {
                         showToast(
-                            activity,
                             R.string.no_update_found,
                             Toast.LENGTH_SHORT
                         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index 045ed92d..3c0b5b95 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
@@ -18,8 +18,10 @@ import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.Some
+import com.lagradost.cloudstream3.databinding.AddRepoInputBinding
+import com.lagradost.cloudstream3.databinding.FragmentExtensionsBinding
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -30,16 +32,22 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.widget.LinearRecycleViewLayoutManager
-import kotlinx.android.synthetic.main.add_repo_input.*
-import kotlinx.android.synthetic.main.fragment_extensions.*
 
 class ExtensionsFragment : Fragment() {
+    var binding: FragmentExtensionsBinding? = null
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.fragment_extensions, container, false)
+    ): View {
+        val localBinding = FragmentExtensionsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_extensions, container, false)
     }
 
     private fun View.setLayoutWidth(weight: Int) {
@@ -74,7 +82,7 @@ class ExtensionsFragment : Fragment() {
 
         setUpToolbar(R.string.extensions)
 
-        repo_recycler_view?.adapter = RepoAdapter(false, {
+        binding?.repoRecyclerView?.adapter = RepoAdapter(false, {
             findNavController().navigate(
                 R.id.navigation_settings_extensions_to_navigation_settings_plugins,
                 PluginsFragment.newInstance(
@@ -97,6 +105,7 @@ class ExtensionsFragment : Fragment() {
                                     extensionViewModel.loadRepositories()
                                 }
                             }
+
                             DialogInterface.BUTTON_NEGATIVE -> {}
                         }
                     }
@@ -112,12 +121,12 @@ class ExtensionsFragment : Fragment() {
         })
 
         observe(extensionViewModel.repositories) {
-            repo_recycler_view?.isVisible = it.isNotEmpty()
-            blank_repo_screen?.isVisible = it.isEmpty()
-            (repo_recycler_view?.adapter as? RepoAdapter)?.updateList(it)
+            binding?.repoRecyclerView?.isVisible = it.isNotEmpty()
+            binding?.blankRepoScreen?.isVisible = it.isEmpty()
+            (binding?.repoRecyclerView?.adapter as? RepoAdapter)?.updateList(it)
         }
 
-        repo_recycler_view?.apply {
+        binding?.repoRecyclerView?.apply {
             context?.let { ctx ->
                 layoutManager = LinearRecycleViewLayoutManager(ctx, nextFocusUpId, nextFocusDownId)
             }
@@ -138,32 +147,31 @@ class ExtensionsFragment : Fragment() {
 //            }
 //        }
 
-        observe(extensionViewModel.pluginStats) {
-            when (it) {
-                is Some.Success -> {
-                    val value = it.value
+        observeNullable(extensionViewModel.pluginStats) { value ->
+            binding?.apply {
+                if (value == null) {
+                    pluginStorageAppbar.isVisible = false
 
-                    plugin_storage_appbar?.isVisible = true
-                    if (value.total == 0) {
-                        plugin_download?.setLayoutWidth(1)
-                        plugin_disabled?.setLayoutWidth(0)
-                        plugin_not_downloaded?.setLayoutWidth(0)
-                    } else {
-                        plugin_download?.setLayoutWidth(value.downloaded)
-                        plugin_disabled?.setLayoutWidth(value.disabled)
-                        plugin_not_downloaded?.setLayoutWidth(value.notDownloaded)
-                    }
-                    plugin_not_downloaded_txt.setText(value.notDownloadedText)
-                    plugin_disabled_txt.setText(value.disabledText)
-                    plugin_download_txt.setText(value.downloadedText)
+                    return@observeNullable
                 }
-                is Some.None -> {
-                    plugin_storage_appbar?.isVisible = false
+
+                pluginStorageAppbar.isVisible = true
+                if (value.total == 0) {
+                    pluginDownload.setLayoutWidth(1)
+                    pluginDisabled.setLayoutWidth(0)
+                    pluginNotDownloaded.setLayoutWidth(0)
+                } else {
+                    pluginDownload.setLayoutWidth(value.downloaded)
+                    pluginDisabled.setLayoutWidth(value.disabled)
+                    pluginNotDownloaded.setLayoutWidth(value.notDownloaded)
                 }
+                pluginNotDownloadedTxt.setText(value.notDownloadedText)
+                pluginDisabledTxt.setText(value.disabledText)
+                pluginDownloadTxt.setText(value.downloadedText)
             }
         }
 
-        plugin_storage_appbar?.setOnClickListener {
+        binding?.pluginStorageAppbar?.setOnClickListener {
             findNavController().navigate(
                 R.id.navigation_settings_extensions_to_navigation_settings_plugins,
                 PluginsFragment.newInstance(
@@ -175,16 +183,18 @@ class ExtensionsFragment : Fragment() {
         }
 
         val addRepositoryClick = View.OnClickListener {
+            val ctx = context ?: return@OnClickListener
+            val binding = AddRepoInputBinding.inflate(LayoutInflater.from(ctx), null, false)
             val builder =
-                AlertDialog.Builder(context ?: return@OnClickListener, R.style.AlertDialogCustom)
-                    .setView(R.layout.add_repo_input)
+                AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                    .setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
             (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager?)?.primaryClip?.getItemAt(
                 0
             )?.text?.toString()?.let { copy ->
-                dialog.repo_url_input?.setText(copy)
+                binding.repoUrlInput.setText(copy)
             }
 
 //            dialog.list_repositories?.setOnClickListener {
@@ -194,14 +204,14 @@ class ExtensionsFragment : Fragment() {
 //            }
 
 //            dialog.text2?.text = provider.name
-            dialog.apply_btt?.setOnClickListener secondListener@{
-                val name = dialog.repo_name_input?.text?.toString()
+            binding.applyBtt.setOnClickListener secondListener@{
+                val name = binding.repoNameInput.text?.toString()
                 ioSafe {
-                    val url = dialog.repo_url_input?.text?.toString()
+                    val url = binding.repoUrlInput.text?.toString()
                         ?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
                     if (url.isNullOrBlank()) {
                         main {
-                            showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                            showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
                         }
                     } else {
                         val fixedName = if (!name.isNullOrBlank()) name
@@ -216,22 +226,23 @@ class ExtensionsFragment : Fragment() {
                 }
                 dialog.dismissSafe(activity)
             }
-            dialog.cancel_btt?.setOnClickListener {
+            binding.cancelBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
         }
 
         val isTv = isTrueTvSettings()
-        add_repo_button?.isGone = isTv
-        add_repo_button_imageview_holder?.isVisible = isTv
+        binding?.apply {
+            addRepoButton.isGone = isTv
+            addRepoButtonImageviewHolder.isVisible = isTv
 
-        // Band-aid for Fire TV
-        plugin_storage_appbar?.isFocusableInTouchMode = isTv
-        add_repo_button_imageview?.isFocusableInTouchMode = isTv
-
-        add_repo_button?.setOnClickListener(addRepositoryClick)
-        add_repo_button_imageview?.setOnClickListener(addRepositoryClick)
+            // Band-aid for Fire TV
+            pluginStorageAppbar.isFocusableInTouchMode = isTv
+            addRepoButtonImageview.isFocusableInTouchMode = isTv
 
+            addRepoButton.setOnClickListener(addRepositoryClick)
+            addRepoButtonImageview.setOnClickListener(addRepositoryClick)
+        }
         reloadRepositories()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
index 63ed5357..866d167c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginsOnline
@@ -40,8 +39,8 @@ class ExtensionsViewModel : ViewModel() {
     private val _repositories = MutableLiveData<Array<RepositoryData>>()
     val repositories: LiveData<Array<RepositoryData>> = _repositories
 
-    private val _pluginStats: MutableLiveData<Some<PluginStats>> = MutableLiveData(Some.None)
-    val pluginStats: LiveData<Some<PluginStats>> = _pluginStats
+    private val _pluginStats: MutableLiveData<PluginStats?> = MutableLiveData(null)
+    val pluginStats: LiveData<PluginStats?> = _pluginStats
 
     //TODO CACHE GET REQUESTS
     // DO not use viewModelScope.launchSafe, it will ANR on slow internet
@@ -78,7 +77,7 @@ class ExtensionsViewModel : ViewModel() {
         debugAssert({ stats.downloaded + stats.notDownloaded + stats.disabled != stats.total }) {
             "downloaded(${stats.downloaded}) + notDownloaded(${stats.notDownloaded}) + disabled(${stats.disabled}) != total(${stats.total})"
         }
-        _pluginStats.postValue(Some.Success(stats))
+        _pluginStats.postValue(stats)
     }
 
     private fun repos() = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
index 0c3d481b..eb0082b8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui.settings.extensions
 import android.text.format.Formatter.formatShortFileSize
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
@@ -13,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.ui.result.setText
@@ -26,10 +26,11 @@ import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.repository_item.view.*
 import org.junit.Assert
 import org.junit.Test
 import java.text.DecimalFormat
+import kotlin.math.floor
+import kotlin.math.log10
 
 
 data class PluginViewData(
@@ -45,8 +46,10 @@ class PluginAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val layout = if(isTrueTvSettings()) R.layout.repository_item_tv else R.layout.repository_item
+        val inflated = LayoutInflater.from(parent.context).inflate(layout, parent, false)
+
         return PluginViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false)
+            RepositoryItemBinding.bind(inflated) // may crash
         )
     }
 
@@ -82,8 +85,10 @@ class PluginAdapter(
 
     // Clear glide image because setImageResource doesn't override
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        holder.itemView.entry_icon?.let { pluginIcon ->
-            GlideApp.with(pluginIcon).clear(pluginIcon)
+        if (holder is PluginViewHolder) {
+            holder.binding.entryIcon.let { pluginIcon ->
+                GlideApp.with(pluginIcon).clear(pluginIcon)
+            }
         }
         super.onViewRecycled(holder)
     }
@@ -112,7 +117,7 @@ class PluginAdapter(
         fun prettyCount(number: Number): String? {
             val suffix = charArrayOf(' ', 'k', 'M', 'B', 'T', 'P', 'E')
             val numValue = number.toLong()
-            val value = Math.floor(Math.log10(numValue.toDouble())).toInt()
+            val value = floor(log10(numValue.toDouble())).toInt()
             val base = value / 3
             return if (value >= 3 && base < suffix.size) {
                 DecimalFormat("#0.00").format(
@@ -127,8 +132,8 @@ class PluginAdapter(
         }
     }
 
-    inner class PluginViewHolder(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+    inner class PluginViewHolder(val binding: RepositoryItemBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(
             data: PluginViewData,
@@ -138,17 +143,17 @@ class PluginAdapter(
             val name = metadata.name.removeSuffix("Provider")
             val alpha = if (disabled) 0.6f else 1f
             val isLocal = !data.plugin.second.url.startsWith("http")
-            itemView.main_text?.alpha = alpha
-            itemView.sub_text?.alpha = alpha
+            binding.mainText.alpha = alpha
+            binding.subText.alpha = alpha
 
             val drawableInt = if (data.isDownloaded)
                 R.drawable.ic_baseline_delete_outline_24
             else R.drawable.netflix_download
 
-            itemView.nsfw_marker?.isVisible = metadata.tvTypes?.contains("NSFW") ?: false
-            itemView.action_button?.setImageResource(drawableInt)
+            binding.nsfwMarker.isVisible = metadata.tvTypes?.contains("NSFW") ?: false
+            binding.actionButton.setImageResource(drawableInt)
 
-            itemView.action_button?.setOnClickListener {
+            binding.actionButton.setOnClickListener {
                 iconClickCallback.invoke(data.plugin)
             }
             itemView.setOnClickListener {
@@ -169,10 +174,11 @@ class PluginAdapter(
 
             if (data.isDownloaded) {
                 // On local plugins page the filepath is provided instead of url.
-                val plugin = PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
+                val plugin =
+                    PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
                 if (plugin?.openSettings != null) {
-                    itemView.action_settings?.isVisible = true
-                    itemView.action_settings.setOnClickListener {
+                    binding.actionSettings.isVisible = true
+                    binding.actionSettings.setOnClickListener {
                         try {
                             plugin.openSettings!!.invoke(itemView.context)
                         } catch (e: Throwable) {
@@ -185,13 +191,13 @@ class PluginAdapter(
                         }
                     }
                 } else {
-                    itemView.action_settings?.isVisible = false
+                    binding.actionSettings.isVisible = false
                 }
             } else {
-                itemView.action_settings?.isVisible = false
+                binding.actionSettings.isVisible = false
             }
 
-            if (itemView.entry_icon?.setImage(//itemView.entry_icon?.height ?:
+            if (!binding.entryIcon.setImage(//itemView.entry_icon?.height ?:
                     metadata.iconUrl?.replace(
                         "%size%",
                         "$iconSize"
@@ -201,41 +207,47 @@ class PluginAdapter(
                     ),
                     null,
                     errorImageDrawable = R.drawable.ic_baseline_extension_24
-                ) != true
+                )
             ) {
-                itemView.entry_icon?.setImageResource(R.drawable.ic_baseline_extension_24)
+                binding.entryIcon.setImageResource(R.drawable.ic_baseline_extension_24)
             }
 
-            itemView.ext_version?.isVisible = true
-            itemView.ext_version?.text = "v${metadata.version}"
+            binding.extVersion.isVisible = true
+            binding.extVersion.text = "v${metadata.version}"
 
             if (metadata.language.isNullOrBlank()) {
-                itemView.lang_icon?.isVisible = false
+                binding.langIcon.isVisible = false
             } else {
-                itemView.lang_icon?.isVisible = true
-                itemView.lang_icon.text = "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
+                binding.langIcon.isVisible = true
+                binding.langIcon.text =
+                    "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
             }
 
-            itemView.ext_votes?.isVisible = false
+            binding.extVotes.isVisible = false
             if (!isLocal) {
                 ioSafe {
                     metadata.getVotes().main {
-                        itemView.ext_votes?.setText(txt(R.string.extension_rating, prettyCount(it)))
-                        itemView.ext_votes?.isVisible = true
+                        binding.extVotes.setText(txt(R.string.extension_rating, prettyCount(it)))
+                        binding.extVotes.isVisible = true
                     }
                 }
             }
 
 
             if (metadata.fileSize != null) {
-                itemView.ext_filesize?.isVisible = true
-                itemView.ext_filesize?.text = formatShortFileSize(itemView.context, metadata.fileSize)
+                binding.extFilesize.isVisible = true
+                binding.extFilesize.text = formatShortFileSize(itemView.context, metadata.fileSize)
             } else {
-                itemView.ext_filesize?.isVisible = false
+                binding.extFilesize.isVisible = false
             }
-            itemView.main_text.setText(if(disabled) txt(R.string.single_plugin_disabled, name) else txt(name))
-            itemView.sub_text?.isGone = metadata.description.isNullOrBlank()
-            itemView.sub_text?.text = metadata.description.html()
+            binding.mainText.setText(
+                if (disabled) txt(
+                    R.string.single_plugin_disabled,
+                    name
+                ) else txt(name)
+            )
+            binding.subText.isGone = metadata.description.isNullOrBlank()
+            binding.subText.text = metadata.description.html()
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
index 9729b4de..00e1806d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
@@ -2,30 +2,29 @@ package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.content.res.ColorStateList
 import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import android.text.format.Formatter.formatFileSize
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.fragment_plugin_details.*
-import android.text.format.Formatter.formatFileSize
-import android.util.Log
 import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentPluginDetailsBinding
+import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.VotingApi
+import com.lagradost.cloudstream3.plugins.VotingApi.canVote
 import com.lagradost.cloudstream3.plugins.VotingApi.getVoteType
 import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.plugins.VotingApi.vote
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.plugins.VotingApi.canVote
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
-import kotlinx.android.synthetic.main.repository_item.view.*
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 
 class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragment() {
@@ -43,18 +42,27 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
         }
     }
 
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    var binding: FragmentPluginDetailsBinding? = null
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_plugin_details, container, false)
-
+    ): View {
+        val localBinding = FragmentPluginDetailsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_plugin_details, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val metadata = data.plugin.second
-        if (plugin_icon?.setImage(//plugin_icon?.height ?:
+        binding?.apply {
+        if (!pluginIcon.setImage(//plugin_icon?.height ?:
                 metadata.iconUrl?.replace(
                     "%size%",
                     "$iconSize"
@@ -64,23 +72,33 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
                 ),
                 null,
                 errorImageDrawable = R.drawable.ic_baseline_extension_24
-            ) != true
+            )
         ) {
-            plugin_icon?.setImageResource(R.drawable.ic_baseline_extension_24)
+            pluginIcon.setImageResource(R.drawable.ic_baseline_extension_24)
         }
-        plugin_name?.text = metadata.name.removeSuffix("Provider")
-        plugin_version?.text = metadata.version.toString()
-        plugin_description?.text = metadata.description ?: getString(R.string.no_data)
-        plugin_size?.text = if (metadata.fileSize == null) getString(R.string.no_data) else formatFileSize(context, metadata.fileSize)
-        plugin_author?.text = if (metadata.authors.isEmpty()) getString(R.string.no_data) else metadata.authors.joinToString(", ")
-        plugin_status?.text = resources.getStringArray(R.array.extension_statuses)[metadata.status]
-        plugin_types?.text = if ((metadata.tvTypes == null) || metadata.tvTypes.isEmpty()) getString(R.string.no_data) else metadata.tvTypes.joinToString(", ")
-        plugin_lang?.text = if (metadata.language == null)
-                getString(R.string.no_data)
+        pluginName.text = metadata.name.removeSuffix("Provider")
+        pluginVersion.text = metadata.version.toString()
+        pluginDescription.text = metadata.description ?: getString(R.string.no_data)
+        pluginSize.text =
+            if (metadata.fileSize == null) getString(R.string.no_data) else formatFileSize(
+                context,
+                metadata.fileSize
+            )
+        pluginAuthor.text =
+            if (metadata.authors.isEmpty()) getString(R.string.no_data) else metadata.authors.joinToString(
+                ", "
+            )
+        pluginStatus.text = resources.getStringArray(R.array.extension_statuses)[metadata.status]
+        pluginTypes.text =
+            if (metadata.tvTypes.isNullOrEmpty()) getString(R.string.no_data) else metadata.tvTypes.joinToString(
+                ", "
+            )
+        pluginLang.text = if (metadata.language == null)
+            getString(R.string.no_data)
         else
-                "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
+            "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
 
-        github_btn.setOnClickListener {
+        githubBtn.setOnClickListener {
             if (metadata.repositoryUrl != null) {
                 openBrowser(metadata.repositoryUrl)
             }
@@ -93,10 +111,11 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
 
         if (data.isDownloaded) {
             // On local plugins page the filepath is provided instead of url.
-            val plugin = PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
+            val plugin =
+                PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
             if (plugin?.openSettings != null && context != null) {
-                action_settings?.isVisible = true
-                action_settings.setOnClickListener {
+                actionSettings.isVisible = true
+                actionSettings.setOnClickListener {
                     try {
                         plugin.openSettings!!.invoke(requireContext())
                     } catch (e: Throwable) {
@@ -109,10 +128,10 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
                     }
                 }
             } else {
-                action_settings?.isVisible = false
+                actionSettings.isVisible = false
             }
         } else {
-            action_settings?.isVisible = false
+            actionSettings.isVisible = false
         }
 
         upvote.setOnClickListener {
@@ -136,23 +155,40 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
                 updateVoting(it)
             }
         }
+        }
     }
 
     private fun updateVoting(value: Int) {
         val metadata = data.plugin.second
-        plugin_votes.text = value.toString()
-        when (metadata.getVoteType()) {
-            VotingApi.VoteType.UPVOTE -> {
-                upvote.imageTintList =  ColorStateList.valueOf(context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary)
-                downvote.imageTintList = ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
-            }
-            VotingApi.VoteType.DOWNVOTE -> {
-                downvote.imageTintList =  ColorStateList.valueOf(context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary)
-                upvote.imageTintList = ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
-            }
-            VotingApi.VoteType.NONE -> {
-                upvote.imageTintList =  ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
-                downvote.imageTintList = ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
+        binding?.apply {
+            pluginVotes.text = value.toString()
+            when (metadata.getVoteType()) {
+                VotingApi.VoteType.UPVOTE -> {
+                    upvote.imageTintList = ColorStateList.valueOf(
+                        context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary
+                    )
+                    downvote.imageTintList = ColorStateList.valueOf(
+                        context?.colorFromAttribute(R.attr.white) ?: R.color.white
+                    )
+                }
+
+                VotingApi.VoteType.DOWNVOTE -> {
+                    downvote.imageTintList = ColorStateList.valueOf(
+                        context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary
+                    )
+                    upvote.imageTintList = ColorStateList.valueOf(
+                        context?.colorFromAttribute(R.attr.white) ?: R.color.white
+                    )
+                }
+
+                VotingApi.VoteType.NONE -> {
+                    upvote.imageTintList = ColorStateList.valueOf(
+                        context?.colorFromAttribute(R.attr.white) ?: R.color.white
+                    )
+                    downvote.imageTintList = ColorStateList.valueOf(
+                        context?.colorFromAttribute(R.attr.white) ?: R.color.white
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index d328d226..1a6215db 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -12,6 +12,7 @@ import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.databinding.FragmentPluginsBinding
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
@@ -20,9 +21,6 @@ import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.fragment_plugins.*
-import kotlinx.android.synthetic.main.tvtypes_chips.*
-import kotlinx.android.synthetic.main.tvtypes_chips_scroll.*
 
 const val PLUGINS_BUNDLE_NAME = "name"
 const val PLUGINS_BUNDLE_URL = "url"
@@ -33,11 +31,19 @@ class PluginsFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.fragment_plugins, container, false)
+    ): View {
+        val localBinding = FragmentPluginsBinding.inflate(inflater,container,false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_plugins, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     private val pluginViewModel: PluginsViewModel by activityViewModels()
+    var binding: FragmentPluginsBinding? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -66,8 +72,8 @@ class PluginsFragment : Fragment() {
         }
 
         setUpToolbar(name)
-
-        settings_toolbar?.setOnMenuItemClickListener { menuItem ->
+        binding?.settingsToolbar?.apply {
+        setOnMenuItemClickListener { menuItem ->
             when (menuItem?.itemId) {
                 R.id.download_all -> {
                     PluginsViewModel.downloadAll(activity, url, pluginViewModel)
@@ -99,67 +105,69 @@ class PluginsFragment : Fragment() {
         }
 
         val searchView =
-            settings_toolbar?.menu?.findItem(R.id.search_button)?.actionView as? SearchView
+            menu?.findItem(R.id.search_button)?.actionView as? SearchView
 
         // Don't go back if active query
-        settings_toolbar?.setNavigationOnClickListener {
+        setNavigationOnClickListener {
             if (searchView?.isIconified == false) {
                 searchView.isIconified = true
             } else {
                 activity?.onBackPressed()
             }
         }
+            searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) pluginViewModel.search(null)
+            }
 
+            searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String?): Boolean {
+                    pluginViewModel.search(query)
+                    return true
+                }
+
+                override fun onQueryTextChange(newText: String?): Boolean {
+                    pluginViewModel.search(newText)
+                    return true
+                }
+            })
+        }
 //        searchView?.onActionViewCollapsed = {
 //            pluginViewModel.search(null)
 //        }
 
         // Because onActionViewCollapsed doesn't wanna work we need this workaround :(
-        searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->
-            if (!hasFocus) pluginViewModel.search(null)
-        }
-
-        searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String?): Boolean {
-                pluginViewModel.search(query)
-                return true
-            }
-
-            override fun onQueryTextChange(newText: String?): Boolean {
-                pluginViewModel.search(newText)
-                return true
-            }
-        })
 
 
-        plugin_recycler_view?.adapter =
+
+        binding?.pluginRecyclerView?.adapter =
             PluginAdapter {
                 pluginViewModel.handlePluginAction(activity, url, it, isLocal)
             }
 
         if (isTvSettings()) {
             // Scrolling down does not reveal the whole RecyclerView on TV, add to bypass that.
-            plugin_recycler_view?.setPadding(0, 0, 0, 200.toPx)
+            binding?.pluginRecyclerView?.setPadding(0, 0, 0, 200.toPx)
         }
 
         observe(pluginViewModel.filteredPlugins) { (scrollToTop, list) ->
-            (plugin_recycler_view?.adapter as? PluginAdapter)?.updateList(list)
+            (binding?.pluginRecyclerView?.adapter as? PluginAdapter)?.updateList(list)
 
             if (scrollToTop)
-                plugin_recycler_view?.scrollToPosition(0)
+                binding?.pluginRecyclerView?.scrollToPosition(0)
         }
 
         if (isLocal) {
             // No download button and no categories on local
-            settings_toolbar?.menu?.findItem(R.id.download_all)?.isVisible = false
-            settings_toolbar?.menu?.findItem(R.id.lang_filter)?.isVisible = false
+            binding?.settingsToolbar?.menu?.findItem(R.id.download_all)?.isVisible = false
+            binding?.settingsToolbar?.menu?.findItem(R.id.lang_filter)?.isVisible = false
             pluginViewModel.updatePluginListLocal()
-            tv_types_scroll_view?.isVisible = false
+
+            binding?.tvtypesChipsScroll?.root?.isVisible = false
         } else {
             pluginViewModel.updatePluginList(context, url)
-            tv_types_scroll_view?.isVisible = true
+            binding?.tvtypesChipsScroll?.root?.isVisible = true
 
-            bindChips(home_select_group, emptyList(), TvType.values().toList()) { list ->
+            bindChips(binding?.tvtypesChipsScroll?.tvtypesChips, emptyList(), TvType.values().toList()) { list ->
                 pluginViewModel.tvTypes.clear()
                 pluginViewModel.tvTypes.addAll(list.map { it.name })
                 pluginViewModel.updateFilteredPlugins()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index 934f65bb..6c68ac17 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -86,7 +86,6 @@ class PluginsViewModel : ViewModel() {
                 }.also { list ->
                     main {
                         showToast(
-                            activity,
                             if (list.isEmpty()) {
                                 txt(
                                     R.string.batch_download_nothing_to_download_format,
@@ -113,7 +112,6 @@ class PluginsViewModel : ViewModel() {
                 }.main { list ->
                     if (list.any { it }) {
                         showToast(
-                            activity,
                             txt(
                                 R.string.batch_download_finish_format,
                                 list.count { it },
@@ -123,7 +121,7 @@ class PluginsViewModel : ViewModel() {
                         )
                         viewModel?.updatePluginListPrivate(activity, repositoryUrl)
                     } else if (list.isNotEmpty()) {
-                        showToast(activity, R.string.download_failed, Toast.LENGTH_SHORT)
+                        showToast(R.string.download_failed, Toast.LENGTH_SHORT)
                     }
                 }
             }
@@ -166,9 +164,9 @@ class PluginsViewModel : ViewModel() {
 
         runOnMainThread {
             if (success)
-                showToast(activity, message, Toast.LENGTH_SHORT)
+                showToast(message, Toast.LENGTH_SHORT)
             else
-                showToast(activity, R.string.error, Toast.LENGTH_SHORT)
+                showToast(R.string.error, Toast.LENGTH_SHORT)
         }
 
         if (success)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt
index e90166a8..602b45e4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt
@@ -1,14 +1,15 @@
 package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import kotlinx.android.synthetic.main.repository_item.view.*
 
 class RepoAdapter(
     val isSetup: Boolean,
@@ -20,9 +21,17 @@ class RepoAdapter(
     private val repositories: MutableList<RepositoryData> = mutableListOf()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = if(isTrueTvSettings()) R.layout.repository_item_tv else R.layout.repository_item
+        val layout = if (isTrueTvSettings()) RepositoryItemTvBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        ) else RepositoryItemBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )  //R.layout.repository_item_tv else R.layout.repository_item
         return RepoViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false)
+            layout
         )
     }
 
@@ -57,30 +66,57 @@ class RepoAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    inner class RepoViewHolder(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+    inner class RepoViewHolder(
+        val binding: ViewBinding
+    ) :
+        RecyclerView.ViewHolder(binding.root) {
         fun bind(
             repositoryData: RepositoryData
         ) {
             val isPrebuilt = PREBUILT_REPOSITORIES.contains(repositoryData)
             val drawable =
                 if (isSetup) R.drawable.netflix_download else R.drawable.ic_baseline_delete_outline_24
+            when (binding) {
+                is RepositoryItemTvBinding -> {
+                    binding.apply {
+                        // Only shows icon if on setup or if it isn't a prebuilt repo.
+                        // No delete buttons on prebuilt repos.
+                        if (!isPrebuilt || isSetup) {
+                            actionButton.setImageResource(drawable)
+                        }
 
-            // Only shows icon if on setup or if it isn't a prebuilt repo.
-            // No delete buttons on prebuilt repos.
-            if (!isPrebuilt || isSetup) {
-                itemView.action_button?.setImageResource(drawable)
-            }
+                        actionButton.setOnClickListener {
+                            imageClickCallback(repositoryData)
+                        }
 
-            itemView.action_button?.setOnClickListener {
-                imageClickCallback(repositoryData)
-            }
+                        repositoryItemRoot.setOnClickListener {
+                            clickCallback(repositoryData)
+                        }
+                        mainText.text = repositoryData.name
+                        subText.text = repositoryData.url
+                    }
+                }
 
-            itemView.repository_item_root?.setOnClickListener {
-                clickCallback(repositoryData)
+                is RepositoryItemBinding -> {
+                    binding.apply {
+                        // Only shows icon if on setup or if it isn't a prebuilt repo.
+                        // No delete buttons on prebuilt repos.
+                        if (!isPrebuilt || isSetup) {
+                            actionButton.setImageResource(drawable)
+                        }
+
+                        actionButton.setOnClickListener {
+                            imageClickCallback(repositoryData)
+                        }
+
+                        repositoryItemRoot.setOnClickListener {
+                            clickCallback(repositoryData)
+                        }
+                        mainText.text = repositoryData.name
+                        subText.text = repositoryData.url
+                    }
+                }
             }
-            itemView.main_text?.text = repositoryData.name
-            itemView.sub_text?.text = repositoryData.url
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
index 34cd67cd..59b1b856 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
@@ -1,97 +1,105 @@
 package com.lagradost.cloudstream3.ui.settings.testing
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentTestingBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
-import kotlinx.android.synthetic.main.fragment_testing.*
-import kotlinx.android.synthetic.main.view_test.*
 
 
 class TestFragment : Fragment() {
 
     private val testViewModel: TestViewModel by activityViewModels()
+    var binding: FragmentTestingBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setUpToolbar(R.string.category_provider_test)
         super.onViewCreated(view, savedInstanceState)
 
-        provider_test_recycler_view?.adapter = TestResultAdapter(
-            mutableListOf()
-        )
+        binding?.apply {
+            providerTestRecyclerView.adapter = TestResultAdapter(
+                mutableListOf()
+            )
 
-        testViewModel.init()
-        if (testViewModel.isRunningTest) {
-            provider_test?.setState(TestView.TestState.Running)
-        }
-
-        observe(testViewModel.providerProgress) { (passed, failed, total) ->
-            provider_test?.setProgress(passed, failed, total)
-        }
-
-        observeNullable(testViewModel.providerResults) {
-            normalSafeApiCall {
-                val newItems = it.sortedBy { api -> api.first.name }
-                (provider_test_recycler_view?.adapter as? TestResultAdapter)?.updateList(
-                    newItems
-                )
+            testViewModel.init()
+            if (testViewModel.isRunningTest) {
+                providerTest.setState(TestView.TestState.Running)
             }
-        }
 
-        provider_test?.setOnPlayButtonListener { state ->
-            when (state) {
-                TestView.TestState.Stopped -> testViewModel.stopTest()
-                TestView.TestState.Running -> testViewModel.startTest()
-                TestView.TestState.None -> testViewModel.startTest()
+            observe(testViewModel.providerProgress) { (passed, failed, total) ->
+                providerTest.setProgress(passed, failed, total)
             }
-        }
 
-        if (isTrueTvSettings()) {
-            tests_play_pause?.isFocusableInTouchMode = true
-            tests_play_pause?.requestFocus()
-        }
-
-        provider_test?.playPauseButton?.setOnFocusChangeListener { _, hasFocus ->
-            if (hasFocus) {
-                provider_test_appbar?.setExpanded(true, true)
+            observeNullable(testViewModel.providerResults) {
+                normalSafeApiCall {
+                    val newItems = it.sortedBy { api -> api.first.name }
+                    (providerTestRecyclerView.adapter as? TestResultAdapter)?.updateList(
+                        newItems
+                    )
+                }
+            }
+
+            providerTest.setOnPlayButtonListener { state ->
+                when (state) {
+                    TestView.TestState.Stopped -> testViewModel.stopTest()
+                    TestView.TestState.Running -> testViewModel.startTest()
+                    TestView.TestState.None -> testViewModel.startTest()
+                }
             }
-        }
 
-        fun focusRecyclerView() {
-            // Hack to make it possible to focus the recyclerview.
             if (isTrueTvSettings()) {
-                provider_test_recycler_view?.requestFocus()
-                provider_test_appbar?.setExpanded(false, true)
+                providerTest.playPauseButton?.isFocusableInTouchMode = true
+                providerTest.playPauseButton?.requestFocus()
             }
-        }
 
-        provider_test?.setOnMainClick {
-            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.All)
-            focusRecyclerView()
-        }
-        provider_test?.setOnFailedClick {
-            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Failed)
-            focusRecyclerView()
-        }
-        provider_test?.setOnPassedClick {
-            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Passed)
-            focusRecyclerView()
+            providerTest.playPauseButton?.setOnFocusChangeListener { _, hasFocus ->
+                if (hasFocus) {
+                    providerTestAppbar.setExpanded(true, true)
+                }
+            }
+
+            fun focusRecyclerView() {
+                // Hack to make it possible to focus the recyclerview.
+                if (isTrueTvSettings()) {
+                    providerTestRecyclerView.requestFocus()
+                    providerTestAppbar.setExpanded(false, true)
+                }
+            }
+
+            providerTest.setOnMainClick {
+                testViewModel.setFilterMethod(TestViewModel.ProviderFilter.All)
+                focusRecyclerView()
+            }
+            providerTest.setOnFailedClick {
+                testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Failed)
+                focusRecyclerView()
+            }
+            providerTest.setOnPassedClick {
+                testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Passed)
+                focusRecyclerView()
+            }
         }
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_testing, container, false)
+    ): View {
+        val localBinding = FragmentTestingBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_testing, container, false)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
index d04e2379..83480542 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
@@ -10,19 +10,20 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ProviderTestItemBinding
 import com.lagradost.cloudstream3.mvvm.getAllMessages
 import com.lagradost.cloudstream3.mvvm.getStackTracePretty
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.TestingUtils
-import kotlinx.android.synthetic.main.provider_test_item.view.*
 
 class TestResultAdapter(override val items: MutableList<Pair<MainAPI, TestingUtils.TestResultProvider>>) :
     AppUtils.DiffAdapter<Pair<MainAPI, TestingUtils.TestResultProvider>>(items) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ProviderTestViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.provider_test_item, parent, false),
+            ProviderTestItemBinding.inflate(LayoutInflater.from(parent.context), parent,false)
+            //LayoutInflater.from(parent.context)
+            //    .inflate(R.layout.provider_test_item, parent, false),
         )
     }
 
@@ -35,12 +36,12 @@ class TestResultAdapter(override val items: MutableList<Pair<MainAPI, TestingUti
         }
     }
 
-    inner class ProviderTestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val languageText: TextView = itemView.lang_icon
-        private val providerTitle: TextView = itemView.main_text
-        private val statusText: TextView = itemView.passed_failed_marker
-        private val failDescription: TextView = itemView.fail_description
-        private val logButton: ImageView = itemView.action_button
+    inner class ProviderTestViewHolder(binding: ProviderTestItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        private val languageText: TextView = binding.langIcon
+        private val providerTitle: TextView = binding.mainText
+        private val statusText: TextView = binding.passedFailedMarker
+        private val failDescription: TextView = binding.failDescription
+        private val logButton: ImageView = binding.actionButton
 
         private fun String.lastLine(): String? {
             return this.lines().lastOrNull { it.isNotBlank() }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
index 2e05baff..4fd24afe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
@@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
+import okhttp3.internal.toImmutableList
 
 class TestViewModel : ViewModel() {
     data class TestProgress(
@@ -81,15 +82,14 @@ class TestViewModel : ViewModel() {
     }
 
     fun init() {
-        val apis = APIHolder.allProviders
-        total = apis.size
+        total = synchronized(APIHolder.allProviders) { APIHolder.allProviders.size }
         updateProgress()
     }
 
     fun startTest() {
         scope = CoroutineScope(Dispatchers.Default)
 
-        val apis = APIHolder.allProviders
+        val apis = synchronized(APIHolder.allProviders) { APIHolder.allProviders.toTypedArray() }
         total = apis.size
         failed = 0
         passed = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index b7d2fff6..4369b22f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -8,21 +8,16 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.APIHolder.apis
-import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
-import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupExtensionsBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel
 import com.lagradost.cloudstream3.ui.settings.extensions.RepoAdapter
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_extensions.blank_repo_screen
-import kotlinx.android.synthetic.main.fragment_extensions.repo_recycler_view
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
 
 
 class SetupFragmentExtensions : Fragment() {
@@ -39,13 +34,24 @@ class SetupFragmentExtensions : Fragment() {
         }
     }
 
+    var binding: FragmentSetupExtensionsBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_setup_extensions, container, false)
+    ): View {
+        val localBinding = FragmentSetupExtensionsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_extensions, container, false)
     }
 
+
     override fun onResume() {
         super.onResume()
         afterRepositoryLoadedEvent += ::setRepositories
@@ -60,12 +66,12 @@ class SetupFragmentExtensions : Fragment() {
         main {
             val repositories = RepositoryManager.getRepositories() + PREBUILT_REPOSITORIES
             val hasRepos = repositories.isNotEmpty()
-            repo_recycler_view?.isVisible = hasRepos
-            blank_repo_screen?.isVisible = !hasRepos
+            binding?.repoRecyclerView?.isVisible = hasRepos
+            binding?.blankRepoScreen?.isVisible = !hasRepos
 //            view_public_repositories_button?.isVisible = hasRepos
 
             if (hasRepos) {
-                repo_recycler_view?.adapter = RepoAdapter(true, {}, {
+                binding?.repoRecyclerView?.adapter = RepoAdapter(true, {}, {
                     PluginsViewModel.downloadAll(activity, it.url, null)
                 }).apply { updateList(repositories) }
             }
@@ -80,39 +86,40 @@ class SetupFragmentExtensions : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        fixPaddingStatusbar(binding?.setupRoot)
         val isSetup = arguments?.getBoolean(SETUP_EXTENSION_BUNDLE_IS_SETUP) ?: false
 
 //        view_public_repositories_button?.setOnClickListener {
 //            openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
 //        }
 
-        with(context) {
-            if (this == null) return
+        normalSafeApiCall {
+           // val ctx = context ?: return@normalSafeApiCall
             setRepositories()
+            binding?.apply {
+                if (!isSetup) {
+                    nextBtt.setText(R.string.setup_done)
+                }
+                prevBtt.isVisible = isSetup
 
-            if (!isSetup) {
-                next_btt.setText(R.string.setup_done)
-            }
-            prev_btt?.isVisible = isSetup
+                nextBtt.setOnClickListener {
+                    // Continue setup
+                    if (isSetup)
+                        if (
+                        // If any available languages
+                            synchronized(apis) { apis.distinctBy { it.lang }.size > 1 }
+                        ) {
+                            findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
+                        } else {
+                            findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
+                        }
+                    else
+                        findNavController().navigate(R.id.navigation_home)
+                }
 
-            next_btt?.setOnClickListener {
-                // Continue setup
-                if (isSetup)
-                    if (
-                    // If any available languages
-                        apis.distinctBy { it.lang }.size > 1
-                    ) {
-                        findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
-                    } else {
-                        findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
-                    }
-                else
-                    findNavController().navigate(R.id.navigation_home)
-            }
-
-            prev_btt?.setOnClickListener {
-                findNavController().navigate(R.id.navigation_setup_language)
+                prevBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_setup_language)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index 80db59ee..5c473b73 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
@@ -13,40 +13,49 @@ import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupLanguageBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_language.*
-import kotlinx.android.synthetic.main.fragment_setup_media.listview1
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
 
 const val HAS_DONE_SETUP_KEY = "HAS_DONE_SETUP"
 
 class SetupFragmentLanguage : Fragment() {
+    var binding: FragmentSetupLanguageBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_setup_language, container, false)
+    ): View {
+        val localBinding = FragmentSetupLanguageBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_language, container, false)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
 
         // We don't want a crash for all users
         normalSafeApiCall {
-            with(context) {
-                if (this == null) return@normalSafeApiCall
-                val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+            fixPaddingStatusbar(binding?.setupRoot)
 
-                val arrayAdapter =
-                    ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+            val ctx = context ?: return@normalSafeApiCall
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
+            val arrayAdapter =
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+
+            binding?.apply {
                 // Icons may crash on some weird android versions?
                 normalSafeApiCall {
                     val drawable = when {
@@ -54,10 +63,10 @@ class SetupFragmentLanguage : Fragment() {
                         BuildConfig.BUILD_TYPE == "prerelease" -> R.drawable.cloud_2_gradient_beta
                         else -> R.drawable.cloud_2_gradient
                     }
-                    app_icon_image?.setImageDrawable(ContextCompat.getDrawable(this, drawable))
+                    appIconImage.setImageDrawable(ContextCompat.getDrawable(ctx, drawable))
                 }
 
-                val current = getCurrentLocale(this)
+                val current = getCurrentLocale(ctx)
                 val languageCodes = appLanguages.map { it.third }
                 val languageNames = appLanguages.map { (emoji, name, iso) ->
                     val flag = emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
@@ -66,18 +75,19 @@ class SetupFragmentLanguage : Fragment() {
                 val index = languageCodes.indexOf(current)
 
                 arrayAdapter.addAll(languageNames)
-                listview1?.adapter = arrayAdapter
-                listview1?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-                listview1?.setItemChecked(index, true)
+                listview1.adapter = arrayAdapter
+                listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                listview1.setItemChecked(index, true)
 
-                listview1?.setOnItemClickListener { _, _, position, _ ->
+                listview1.setOnItemClickListener { _, _, position, _ ->
                     val code = languageCodes[position]
                     CommonActivity.setLocale(activity, code)
-                    settingsManager.edit().putString(getString(R.string.locale_key), code).apply()
+                    settingsManager.edit().putString(getString(R.string.locale_key), code)
+                        .apply()
                     activity?.recreate()
                 }
 
-                next_btt?.setOnClickListener {
+                nextBtt.setOnClickListener {
                     // If no plugins go to plugins page
                     val nextDestination = if (
                         PluginManager.getPluginsOnline().isEmpty()
@@ -92,10 +102,11 @@ class SetupFragmentLanguage : Fragment() {
                     )
                 }
 
-                skip_btt?.setOnClickListener {
+                skipBtt.setOnClickListener {
                     findNavController().navigate(R.id.navigation_home)
                 }
             }
+
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
index 50fb37d6..98803818 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
@@ -10,30 +10,39 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupLayoutBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_layout.*
-import kotlinx.android.synthetic.main.fragment_setup_media.listview1
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
 import org.acra.ACRA
 
 
 class SetupFragmentLayout : Fragment() {
+
+    var binding: FragmentSetupLayoutBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_setup_layout, container, false)
+    ): View {
+        val localBinding = FragmentSetupLayoutBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_layout, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        fixPaddingStatusbar(binding?.setupRoot)
 
-        with(context) {
-            if (this == null) return
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        normalSafeApiCall {
+            val ctx = context ?: return@normalSafeApiCall
+
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
             val prefNames = resources.getStringArray(R.array.app_layout)
             val prefValues = resources.getIntArray(R.array.app_layout_values)
@@ -42,48 +51,48 @@ class SetupFragmentLayout : Fragment() {
                 settingsManager.getInt(getString(R.string.app_layout_key), -1)
 
             val arrayAdapter =
-                ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
             arrayAdapter.addAll(prefNames.toList())
-            listview1?.adapter = arrayAdapter
-            listview1?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-            listview1?.setItemChecked(
-                prefValues.indexOf(currentLayout), true
-            )
-
-            listview1?.setOnItemClickListener { _, _, position, _ ->
-                settingsManager.edit()
-                    .putInt(getString(R.string.app_layout_key), prefValues[position])
-                    .apply()
-                activity?.recreate()
-            }
-
-            acra_switch?.setOnCheckedChangeListener { _, enableCrashReporting ->
-                // Use same pref as in settings
-                settingsManager.edit().putBoolean(ACRA.PREF_DISABLE_ACRA, !enableCrashReporting)
-                    .apply()
-                val text =
-                    if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
-                crash_reporting_text?.text = getText(text)
-            }
-
-            val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true)
-            acra_switch.isChecked = enableCrashReporting
-            crash_reporting_text.text =
-                getText(
-                    if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
+            binding?.apply {
+                listview1.adapter = arrayAdapter
+                listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                listview1.setItemChecked(
+                    prefValues.indexOf(currentLayout), true
                 )
 
+                listview1.setOnItemClickListener { _, _, position, _ ->
+                    settingsManager.edit()
+                        .putInt(getString(R.string.app_layout_key), prefValues[position])
+                        .apply()
+                    activity?.recreate()
+                }
+                acraSwitch.setOnCheckedChangeListener { _, enableCrashReporting ->
+                    // Use same pref as in settings
+                    settingsManager.edit().putBoolean(ACRA.PREF_DISABLE_ACRA, !enableCrashReporting)
+                        .apply()
+                    val text =
+                        if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
+                    crashReportingText.text = getText(text)
+                }
 
-            next_btt?.setOnClickListener {
-                findNavController().navigate(R.id.navigation_home)
-            }
+                val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true)
 
-            prev_btt?.setOnClickListener {
-                findNavController().popBackStack()
+                acraSwitch.isChecked = enableCrashReporting
+                crashReportingText.text =
+                    getText(
+                        if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
+                    )
+
+
+                nextBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_home)
+                }
+
+                prevBtt.setOnClickListener {
+                    findNavController().popBackStack()
+                }
             }
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
index 257ce5c1..6916cafe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
@@ -10,72 +10,85 @@ import androidx.core.util.forEach
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.utils.DataStore.removeKey
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
+import com.lagradost.cloudstream3.databinding.FragmentSetupMediaBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_media.*
+import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 
 
 class SetupFragmentMedia : Fragment() {
+    var binding: FragmentSetupMediaBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_setup_media, container, false)
+    ): View {
+        val localBinding = FragmentSetupMediaBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_media, container, false)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        normalSafeApiCall {
+            fixPaddingStatusbar(binding?.setupRoot)
 
-        with(context) {
-            if (this == null) return
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+            val ctx = context ?: return@normalSafeApiCall
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
             val arrayAdapter =
-                ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
             val names = enumValues<TvType>().sorted().map { it.name }
             val selected = mutableListOf<Int>()
 
             arrayAdapter.addAll(names)
-            listview1?.let {
-                it.adapter = arrayAdapter
-                it.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+            binding?.apply {
+                listview1.let {
+                    it.adapter = arrayAdapter
+                    it.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
 
-                it.setOnItemClickListener { _, _, _, _ ->
-                    it.checkedItemPositions?.forEach { key, value ->
-                        if (value) {
-                            selected.add(key)
-                        } else {
-                            selected.remove(key)
+                    it.setOnItemClickListener { _, _, _, _ ->
+                        it.checkedItemPositions?.forEach { key, value ->
+                            if (value) {
+                                selected.add(key)
+                            } else {
+                                selected.remove(key)
+                            }
                         }
+                        val prefValues = selected.mapNotNull { pos ->
+                            val item =
+                                it.getItemAtPosition(pos)?.toString() ?: return@mapNotNull null
+                            val itemVal = TvType.valueOf(item)
+                            itemVal.ordinal.toString()
+                        }.toSet()
+                        settingsManager.edit()
+                            .putStringSet(getString(R.string.prefer_media_type_key), prefValues)
+                            .apply()
+
+                        // Regenerate set homepage
+                        removeKey(USER_SELECTED_HOMEPAGE_API)
                     }
-                    val prefValues = selected.mapNotNull { pos ->
-                        val item = it.getItemAtPosition(pos)?.toString() ?: return@mapNotNull null
-                        val itemVal = TvType.valueOf(item)
-                        itemVal.ordinal.toString()
-                    }.toSet()
-                    settingsManager.edit()
-                        .putStringSet(getString(R.string.prefer_media_type_key), prefValues)
-                        .apply()
-
-                    // Regenerate set homepage
-                    removeKey(USER_SELECTED_HOMEPAGE_API)
                 }
-            }
 
-            next_btt?.setOnClickListener {
-                findNavController().navigate(R.id.navigation_setup_media_to_navigation_setup_layout)
-            }
+                nextBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_setup_media_to_navigation_setup_layout)
+                }
 
-            prev_btt?.setOnClickListener {
-                findNavController().popBackStack()
+                prevBtt.setOnClickListener {
+                    findNavController().popBackStack()
+                }
             }
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
index 51abee90..59dcc402 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
@@ -14,33 +14,45 @@ import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupProviderLanguagesBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_media.*
 
 class SetupFragmentProviderLanguage : Fragment() {
+    var binding: FragmentSetupProviderLanguagesBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_setup_provider_languages, container, false)
+    ): View {
+        val localBinding = FragmentSetupProviderLanguagesBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_provider_languages, container, false)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        fixPaddingStatusbar(binding?.setupRoot)
 
-        with(context) {
-            if (this == null) return
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        normalSafeApiCall {
+            val ctx = context ?: return@normalSafeApiCall
+
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
             val arrayAdapter =
-                ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-            val current = this.getApiProviderLangSettings()
-            val langs = APIHolder.apis.map { it.lang }.toSet()
-                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+            val current = ctx.getApiProviderLangSettings()
+            val langs = synchronized(APIHolder.apis) { APIHolder.apis.map { it.lang }.toSet()
+                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName}
 
             val currentList =
                 current.map { langs.indexOf(it) }.filter { it != -1 } // TODO LOOK INTO
@@ -56,31 +68,31 @@ class SetupFragmentProviderLanguage : Fragment() {
             }
 
             arrayAdapter.addAll(languageNames)
-
-            listview1?.adapter = arrayAdapter
-            listview1?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+            binding?.apply {
+            listview1.adapter = arrayAdapter
+            listview1.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
             currentList.forEach {
                 listview1.setItemChecked(it, true)
             }
 
-            listview1?.setOnItemClickListener { _, _, _, _ ->
+            listview1.setOnItemClickListener { _, _, _, _ ->
                 val currentLanguages = mutableListOf<String>()
-                listview1?.checkedItemPositions?.forEach { key, value ->
+                listview1.checkedItemPositions?.forEach { key, value ->
                     if (value) currentLanguages.add(langs[key])
                 }
                 settingsManager.edit().putStringSet(
-                    this.getString(R.string.provider_lang_key),
+                    ctx.getString(R.string.provider_lang_key),
                     currentLanguages.toSet()
                 ).apply()
             }
 
-            next_btt?.setOnClickListener {
+            nextBtt.setOnClickListener {
                 findNavController().navigate(R.id.navigation_setup_provider_languages_to_navigation_setup_media)
             }
 
-            prev_btt?.setOnClickListener {
+            prevBtt.setOnClickListener {
                 findNavController().popBackStack()
-            }
+            } }
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
index bbb5e833..ffb593a0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
@@ -23,6 +23,7 @@ import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ChromecastSubtitleSettingsBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
@@ -31,7 +32,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.subtitle_settings.*
 
 const val CHROME_SUBTITLE_KEY = "chome_subtitle_settings"
 
@@ -137,12 +137,21 @@ class ChromecastSubtitlesFragment : Fragment() {
         //subtitle_text?.setStyle(fromSaveToStyle(state))
     }
 
+    var binding : ChromecastSubtitleSettingsBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.chromecast_subtitle_settings, container, false)
+    ): View {
+        val localBinding = ChromecastSubtitleSettingsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.chromecast_subtitle_settings, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     private lateinit var state: SaveChromeCaptionStyle
@@ -159,7 +168,7 @@ class ChromecastSubtitlesFragment : Fragment() {
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
 
-        context?.fixPaddingStatusbar(subs_root)
+        fixPaddingStatusbar(binding?.subsRoot)
 
         state = getCurrentSavedStyle()
         context?.updateState()
@@ -185,22 +194,25 @@ class ChromecastSubtitlesFragment : Fragment() {
 
             this.setOnLongClickListener {
                 it.context.setColor(id, null)
-                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
             }
         }
 
-        subs_text_color.setup(0)
-        subs_outline_color.setup(1)
-        subs_background_color.setup(2)
+        binding?.apply {
+            subsTextColor.setup(0)
+            subsOutlineColor.setup(1)
+            subsBackgroundColor.setup(2)
+        }
+
 
         val dismissCallback = {
             if (hide)
                 activity?.hideSystemUI()
         }
 
-        subs_edge_type.setFocusableInTv()
-        subs_edge_type.setOnClickListener { textView ->
+        binding?.subsEdgeType?.setFocusableInTv()
+        binding?.subsEdgeType?.setOnClickListener { textView ->
             val edgeTypes = listOf(
                 Pair(
                     EDGE_TYPE_NONE,
@@ -237,15 +249,15 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        subs_edge_type.setOnLongClickListener {
+        binding?.subsEdgeType?.setOnLongClickListener {
             state.edgeType = defaultState.edgeType
             it.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+            showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        subs_font_size.setFocusableInTv()
-        subs_font_size.setOnClickListener { textView ->
+        binding?.subsFontSize?.setFocusableInTv()
+        binding?.subsFontSize?.setOnClickListener { textView ->
             val fontSizes = listOf(
                 Pair(0.75f, "75%"),
                 Pair(0.80f, "80%"),
@@ -278,24 +290,26 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        subs_font_size.setOnLongClickListener { _ ->
+        binding?.subsFontSize?.setOnLongClickListener { _ ->
             state.fontScale = defaultState.fontScale
             //textView.context.updateState() // font size not changed
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+            showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        subs_font.setFocusableInTv()
-        subs_font.setOnClickListener { textView ->
+
+
+        binding?.subsFont?.setFocusableInTv()
+        binding?.subsFont?.setOnClickListener { textView ->
             val fontTypes = listOf(
-                Pair(null, textView.context.getString(R.string.normal)),
-                Pair("Droid Sans", "Droid Sans"),
-                Pair("Droid Sans Mono", "Droid Sans Mono"),
-                Pair("Droid Serif Regular", "Droid Serif Regular"),
-                Pair("Cutive Mono", "Cutive Mono"),
-                Pair("Short Stack", "Short Stack"),
-                Pair("Quintessential", "Quintessential"),
-                Pair("Alegreya Sans SC", "Alegreya Sans SC"),
+                null to textView.context.getString(R.string.normal),
+                "Droid Sans" to "Droid Sans",
+                "Droid Sans Mono" to "Droid Sans Mono",
+                "Droid Serif Regular" to "Droid Serif Regular",
+                "Cutive Mono" to "Cutive Mono",
+                "Short Stack" to "Short Stack",
+                "Quintessential" to "Quintessential",
+                "Alegreya Sans SC" to "Alegreya Sans SC",
             )
 
             //showBottomDialog
@@ -310,35 +324,35 @@ class ChromecastSubtitlesFragment : Fragment() {
                 textView.context.updateState()
             }
         }
-
-        subs_font.setOnLongClickListener { textView ->
+        binding?.subsFont?.setOnLongClickListener { textView ->
             state.fontFamily = defaultState.fontFamily
             textView.context.updateState()
             showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        cancel_btt.setOnClickListener {
+        binding?.cancelBtt?.setOnClickListener {
             activity?.popCurrentPage()
         }
 
-        apply_btt.setOnClickListener {
+        binding?.applyBtt?.setOnClickListener {
             it.context.saveStyle(state)
             applyStyleEvent.invoke(state)
             //it.context.fromSaveToStyle(state)
             activity?.popCurrentPage()
         }
-
-        subtitle_text.setCues(
-            listOf(
-                Cue.Builder()
-                    .setTextSize(
-                        getPixels(TypedValue.COMPLEX_UNIT_SP, 25.0f).toFloat(),
-                        Cue.TEXT_SIZE_TYPE_ABSOLUTE
-                    )
-                    .setText(subtitle_text.context.getString(R.string.subtitles_example_text))
-                    .build()
+        binding?.subtitleText?.apply {
+            setCues(
+                listOf(
+                    Cue.Builder()
+                        .setTextSize(
+                            getPixels(TypedValue.COMPLEX_UNIT_SP, 25.0f).toFloat(),
+                            Cue.TEXT_SIZE_TYPE_ABSOLUTE
+                        )
+                        .setText(context.getString(R.string.subtitles_example_text))
+                        .build()
+                )
             )
-        )
+        }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index 01995af1..f053023d 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
@@ -27,6 +27,7 @@ import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.SubtitleSettingsBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
@@ -37,8 +38,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.subtitle_settings.*
-import kotlinx.android.synthetic.main.toast.view.*
 import java.io.File
 
 const val SUBTITLE_KEY = "subtitle_settings"
@@ -184,10 +183,10 @@ class SubtitlesFragment : Fragment() {
     }
 
     private fun Context.updateState() {
-        subtitle_text?.setStyle(fromSaveToStyle(state))
-        val text = subtitle_text.context.getString(R.string.subtitles_example_text)
+        binding?.subtitleText?.setStyle(fromSaveToStyle(state))
+        val text = getString(R.string.subtitles_example_text)
         val fixedText = if (state.upperCase) text.uppercase() else text
-        subtitle_text?.setCues(
+        binding?.subtitleText?.setCues(
             listOf(
                 Cue.Builder()
                     .setTextSize(
@@ -213,12 +212,21 @@ class SubtitlesFragment : Fragment() {
         return if (color == Color.TRANSPARENT) Color.BLACK else color
     }
 
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    var binding: SubtitleSettingsBinding? = null
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.subtitle_settings, container, false)
+        savedInstanceState: Bundle?
+    ): View {
+        val localBinding = SubtitleSettingsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.subtitle_settings, container, false)
     }
 
     private lateinit var state: SaveCaptionStyle
@@ -234,11 +242,11 @@ class SubtitlesFragment : Fragment() {
         hide = arguments?.getBoolean("hide") ?: true
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
-        subs_import_text?.text = getString(R.string.subs_import_text).format(
+        binding?.subsImportText?.text = getString(R.string.subs_import_text).format(
             context?.getExternalFilesDir(null)?.absolutePath.toString() + "/Fonts"
         )
 
-        context?.fixPaddingStatusbar(subs_root)
+        fixPaddingStatusbar(binding?.subsRoot)
 
         state = getCurrentSavedStyle()
         context?.updateState()
@@ -264,317 +272,318 @@ class SubtitlesFragment : Fragment() {
 
             this.setOnLongClickListener {
                 it.context.setColor(id, null)
-                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
             }
         }
+        binding?.apply {
+            subsTextColor.setup(0)
+            subsOutlineColor.setup(1)
+            subsBackgroundColor.setup(2)
+            subsWindowColor.setup(3)
 
-        subs_text_color.setup(0)
-        subs_outline_color.setup(1)
-        subs_background_color.setup(2)
-        subs_window_color.setup(3)
-
-        val dismissCallback = {
-            if (hide)
-                activity?.hideSystemUI()
-        }
-
-        subs_subtitle_elevation.setFocusableInTv()
-        subs_subtitle_elevation.setOnClickListener { textView ->
-            val suffix = "dp"
-            val elevationTypes = listOf(
-                Pair(0, textView.context.getString(R.string.none)),
-                Pair(10, "10$suffix"),
-                Pair(20, "20$suffix"),
-                Pair(30, "30$suffix"),
-                Pair(40, "40$suffix"),
-                Pair(50, "50$suffix"),
-                Pair(60, "60$suffix"),
-                Pair(70, "70$suffix"),
-                Pair(80, "80$suffix"),
-                Pair(90, "90$suffix"),
-                Pair(100, "100$suffix"),
-            )
-
-            //showBottomDialog
-            activity?.showDialog(
-                elevationTypes.map { it.second },
-                elevationTypes.map { it.first }.indexOf(state.elevation),
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                state.elevation = elevationTypes.map { it.first }[index]
-                textView.context.updateState()
+            val dismissCallback = {
                 if (hide)
                     activity?.hideSystemUI()
             }
-        }
 
-        subs_subtitle_elevation.setOnLongClickListener {
-            state.elevation = DEF_SUBS_ELEVATION
-            it.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
+            subsSubtitleElevation.setFocusableInTv()
+            subsSubtitleElevation.setOnClickListener { textView ->
+                val suffix = "dp"
+                val elevationTypes = listOf(
+                    Pair(0, textView.context.getString(R.string.none)),
+                    Pair(10, "10$suffix"),
+                    Pair(20, "20$suffix"),
+                    Pair(30, "30$suffix"),
+                    Pair(40, "40$suffix"),
+                    Pair(50, "50$suffix"),
+                    Pair(60, "60$suffix"),
+                    Pair(70, "70$suffix"),
+                    Pair(80, "80$suffix"),
+                    Pair(90, "90$suffix"),
+                    Pair(100, "100$suffix"),
+                )
 
-        subs_edge_type.setFocusableInTv()
-        subs_edge_type.setOnClickListener { textView ->
-            val edgeTypes = listOf(
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_NONE,
-                    textView.context.getString(R.string.subtitles_none)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_OUTLINE,
-                    textView.context.getString(R.string.subtitles_outline)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_DEPRESSED,
-                    textView.context.getString(R.string.subtitles_depressed)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW,
-                    textView.context.getString(R.string.subtitles_shadow)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_RAISED,
-                    textView.context.getString(R.string.subtitles_raised)
-                ),
-            )
-
-            //showBottomDialog
-            activity?.showDialog(
-                edgeTypes.map { it.second },
-                edgeTypes.map { it.first }.indexOf(state.edgeType),
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                state.edgeType = edgeTypes.map { it.first }[index]
-                textView.context.updateState()
-            }
-        }
-
-        subs_edge_type.setOnLongClickListener {
-            state.edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE
-            it.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
-
-        subs_font_size.setFocusableInTv()
-        subs_font_size.setOnClickListener { textView ->
-            val suffix = "sp"
-            val fontSizes = listOf(
-                Pair(null, textView.context.getString(R.string.normal)),
-                Pair(6f, "6$suffix"),
-                Pair(7f, "7$suffix"),
-                Pair(8f, "8$suffix"),
-                Pair(9f, "9$suffix"),
-                Pair(10f, "10$suffix"),
-                Pair(11f, "11$suffix"),
-                Pair(12f, "12$suffix"),
-                Pair(13f, "13$suffix"),
-                Pair(14f, "14$suffix"),
-                Pair(15f, "15$suffix"),
-                Pair(16f, "16$suffix"),
-                Pair(17f, "17$suffix"),
-                Pair(18f, "18$suffix"),
-                Pair(19f, "19$suffix"),
-                Pair(20f, "20$suffix"),
-                Pair(21f, "21$suffix"),
-                Pair(22f, "22$suffix"),
-                Pair(23f, "23$suffix"),
-                Pair(24f, "24$suffix"),
-                Pair(25f, "25$suffix"),
-                Pair(26f, "26$suffix"),
-                Pair(28f, "28$suffix"),
-                Pair(30f, "30$suffix"),
-                Pair(32f, "32$suffix"),
-                Pair(34f, "34$suffix"),
-                Pair(36f, "36$suffix"),
-                Pair(38f, "38$suffix"),
-                Pair(40f, "40$suffix"),
-                Pair(42f, "42$suffix"),
-                Pair(44f, "44$suffix"),
-                Pair(48f, "48$suffix"),
-                Pair(60f, "60$suffix"),
-            )
-
-            //showBottomDialog
-            activity?.showDialog(
-                fontSizes.map { it.second },
-                fontSizes.map { it.first }.indexOf(state.fixedTextSize),
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                state.fixedTextSize = fontSizes.map { it.first }[index]
-                //textView.context.updateState() // font size not changed
-            }
-        }
-
-        subtitles_remove_bloat?.isChecked = state.removeBloat
-        subtitles_remove_bloat?.setOnCheckedChangeListener { _, b ->
-            state.removeBloat = b
-        }
-        subtitles_uppercase?.isChecked = state.upperCase
-        subtitles_uppercase?.setOnCheckedChangeListener { _, b ->
-            state.upperCase = b
-            context?.updateState()
-        }
-
-        subtitles_remove_captions?.isChecked = state.removeCaptions
-        subtitles_remove_captions?.setOnCheckedChangeListener { _, b ->
-            state.removeCaptions = b
-        }
-
-        subs_font_size.setOnLongClickListener { _ ->
-            state.fixedTextSize = null
-            //textView.context.updateState() // font size not changed
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
-
-        //Fetch current value from preference
-        context?.let { ctx ->
-            subtitles_filter_sub_lang?.isChecked =
-                PreferenceManager.getDefaultSharedPreferences(ctx)
-                    .getBoolean(getString(R.string.filter_sub_lang_key), false)
-        }
-
-        subtitles_filter_sub_lang?.setOnCheckedChangeListener { _, b ->
-            context?.let { ctx ->
-                PreferenceManager.getDefaultSharedPreferences(ctx)
-                    .edit()
-                    .putBoolean(getString(R.string.filter_sub_lang_key), b)
-                    .apply()
-            }
-        }
-
-        subs_font.setFocusableInTv()
-        subs_font.setOnClickListener { textView ->
-            val fontTypes = listOf(
-                Pair(null, textView.context.getString(R.string.normal)),
-                Pair(R.font.trebuchet_ms, "Trebuchet MS"),
-                Pair(R.font.netflix_sans, "Netflix Sans"),
-                Pair(R.font.google_sans, "Google Sans"),
-                Pair(R.font.open_sans, "Open Sans"),
-                Pair(R.font.futura, "Futura"),
-                Pair(R.font.consola, "Consola"),
-                Pair(R.font.gotham, "Gotham"),
-                Pair(R.font.lucida_grande, "Lucida Grande"),
-                Pair(R.font.stix_general, "STIX General"),
-                Pair(R.font.times_new_roman, "Times New Roman"),
-                Pair(R.font.verdana, "Verdana"),
-                Pair(R.font.ubuntu_regular, "Ubuntu"),
-                Pair(R.font.comic_sans, "Comic Sans"),
-                Pair(R.font.poppins_regular, "Poppins"),
-            )
-            val savedFontTypes = textView.context.getSavedFonts()
-
-            val currentIndex =
-                savedFontTypes.indexOfFirst { it.absolutePath == state.typefaceFilePath }
-                    .let { index ->
-                        if (index == -1)
-                            fontTypes.indexOfFirst { it.first == state.typeface }
-                        else index + fontTypes.size
-                    }
-
-            //showBottomDialog
-            activity?.showDialog(
-                fontTypes.map { it.second } + savedFontTypes.map { it.name },
-                currentIndex,
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                if (index < fontTypes.size) {
-                    state.typeface = fontTypes[index].first
-                    state.typefaceFilePath = null
-                } else {
-                    state.typefaceFilePath = savedFontTypes[index - fontTypes.size].absolutePath
-                    state.typeface = null
+                //showBottomDialog
+                activity?.showDialog(
+                    elevationTypes.map { it.second },
+                    elevationTypes.map { it.first }.indexOf(state.elevation),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.elevation = elevationTypes.map { it.first }[index]
+                    textView.context.updateState()
+                    if (hide)
+                        activity?.hideSystemUI()
                 }
+            }
+
+            subsSubtitleElevation.setOnLongClickListener {
+                state.elevation = DEF_SUBS_ELEVATION
+                it.context.updateState()
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            subsEdgeType.setFocusableInTv()
+            subsEdgeType.setOnClickListener { textView ->
+                val edgeTypes = listOf(
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_NONE,
+                        textView.context.getString(R.string.subtitles_none)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_OUTLINE,
+                        textView.context.getString(R.string.subtitles_outline)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_DEPRESSED,
+                        textView.context.getString(R.string.subtitles_depressed)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW,
+                        textView.context.getString(R.string.subtitles_shadow)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_RAISED,
+                        textView.context.getString(R.string.subtitles_raised)
+                    ),
+                )
+
+                //showBottomDialog
+                activity?.showDialog(
+                    edgeTypes.map { it.second },
+                    edgeTypes.map { it.first }.indexOf(state.edgeType),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.edgeType = edgeTypes.map { it.first }[index]
+                    textView.context.updateState()
+                }
+            }
+
+            subsEdgeType.setOnLongClickListener {
+                state.edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE
+                it.context.updateState()
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            subsFontSize.setFocusableInTv()
+            subsFontSize.setOnClickListener { textView ->
+                val suffix = "sp"
+                val fontSizes = listOf(
+                    Pair(null, textView.context.getString(R.string.normal)),
+                    Pair(6f, "6$suffix"),
+                    Pair(7f, "7$suffix"),
+                    Pair(8f, "8$suffix"),
+                    Pair(9f, "9$suffix"),
+                    Pair(10f, "10$suffix"),
+                    Pair(11f, "11$suffix"),
+                    Pair(12f, "12$suffix"),
+                    Pair(13f, "13$suffix"),
+                    Pair(14f, "14$suffix"),
+                    Pair(15f, "15$suffix"),
+                    Pair(16f, "16$suffix"),
+                    Pair(17f, "17$suffix"),
+                    Pair(18f, "18$suffix"),
+                    Pair(19f, "19$suffix"),
+                    Pair(20f, "20$suffix"),
+                    Pair(21f, "21$suffix"),
+                    Pair(22f, "22$suffix"),
+                    Pair(23f, "23$suffix"),
+                    Pair(24f, "24$suffix"),
+                    Pair(25f, "25$suffix"),
+                    Pair(26f, "26$suffix"),
+                    Pair(28f, "28$suffix"),
+                    Pair(30f, "30$suffix"),
+                    Pair(32f, "32$suffix"),
+                    Pair(34f, "34$suffix"),
+                    Pair(36f, "36$suffix"),
+                    Pair(38f, "38$suffix"),
+                    Pair(40f, "40$suffix"),
+                    Pair(42f, "42$suffix"),
+                    Pair(44f, "44$suffix"),
+                    Pair(48f, "48$suffix"),
+                    Pair(60f, "60$suffix"),
+                )
+
+                //showBottomDialog
+                activity?.showDialog(
+                    fontSizes.map { it.second },
+                    fontSizes.map { it.first }.indexOf(state.fixedTextSize),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.fixedTextSize = fontSizes.map { it.first }[index]
+                    //textView.context.updateState() // font size not changed
+                }
+            }
+
+            subtitlesRemoveBloat.isChecked = state.removeBloat
+            subtitlesRemoveBloat.setOnCheckedChangeListener { _, b ->
+                state.removeBloat = b
+            }
+            subtitlesUppercase.isChecked = state.upperCase
+            subtitlesUppercase.setOnCheckedChangeListener { _, b ->
+                state.upperCase = b
+                context?.updateState()
+            }
+
+            subtitlesRemoveCaptions.isChecked = state.removeCaptions
+            subtitlesRemoveCaptions.setOnCheckedChangeListener { _, b ->
+                state.removeCaptions = b
+            }
+
+            subsFontSize.setOnLongClickListener { _ ->
+                state.fixedTextSize = null
+                //textView.context.updateState() // font size not changed
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            //Fetch current value from preference
+            context?.let { ctx ->
+                subtitlesFilterSubLang.isChecked =
+                    PreferenceManager.getDefaultSharedPreferences(ctx)
+                        .getBoolean(getString(R.string.filter_sub_lang_key), false)
+            }
+
+            subtitlesFilterSubLang.setOnCheckedChangeListener { _, b ->
+                context?.let { ctx ->
+                    PreferenceManager.getDefaultSharedPreferences(ctx)
+                        .edit()
+                        .putBoolean(getString(R.string.filter_sub_lang_key), b)
+                        .apply()
+                }
+            }
+
+            subsFont.setFocusableInTv()
+            subsFont.setOnClickListener { textView ->
+                val fontTypes = listOf(
+                    Pair(null, textView.context.getString(R.string.normal)),
+                    Pair(R.font.trebuchet_ms, "Trebuchet MS"),
+                    Pair(R.font.netflix_sans, "Netflix Sans"),
+                    Pair(R.font.google_sans, "Google Sans"),
+                    Pair(R.font.open_sans, "Open Sans"),
+                    Pair(R.font.futura, "Futura"),
+                    Pair(R.font.consola, "Consola"),
+                    Pair(R.font.gotham, "Gotham"),
+                    Pair(R.font.lucida_grande, "Lucida Grande"),
+                    Pair(R.font.stix_general, "STIX General"),
+                    Pair(R.font.times_new_roman, "Times New Roman"),
+                    Pair(R.font.verdana, "Verdana"),
+                    Pair(R.font.ubuntu_regular, "Ubuntu"),
+                    Pair(R.font.comic_sans, "Comic Sans"),
+                    Pair(R.font.poppins_regular, "Poppins"),
+                )
+                val savedFontTypes = textView.context.getSavedFonts()
+
+                val currentIndex =
+                    savedFontTypes.indexOfFirst { it.absolutePath == state.typefaceFilePath }
+                        .let { index ->
+                            if (index == -1)
+                                fontTypes.indexOfFirst { it.first == state.typeface }
+                            else index + fontTypes.size
+                        }
+
+                //showBottomDialog
+                activity?.showDialog(
+                    fontTypes.map { it.second } + savedFontTypes.map { it.name },
+                    currentIndex,
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    if (index < fontTypes.size) {
+                        state.typeface = fontTypes[index].first
+                        state.typefaceFilePath = null
+                    } else {
+                        state.typefaceFilePath = savedFontTypes[index - fontTypes.size].absolutePath
+                        state.typeface = null
+                    }
+                    textView.context.updateState()
+                }
+            }
+
+            subsFont.setOnLongClickListener { textView ->
+                state.typeface = null
+                state.typefaceFilePath = null
                 textView.context.updateState()
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
             }
-        }
 
-        subs_font.setOnLongClickListener { textView ->
-            state.typeface = null
-            state.typefaceFilePath = null
-            textView.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
+            subsAutoSelectLanguage.setFocusableInTv()
+            subsAutoSelectLanguage.setOnClickListener { textView ->
+                val langMap = arrayListOf(
+                    SubtitleHelper.Language639(
+                        textView.context.getString(R.string.none),
+                        textView.context.getString(R.string.none),
+                        "",
+                        "",
+                        "",
+                        "",
+                        ""
+                    ),
+                )
+                langMap.addAll(SubtitleHelper.languages)
 
-        subs_auto_select_language.setFocusableInTv()
-        subs_auto_select_language.setOnClickListener { textView ->
-            val langMap = arrayListOf(
-                SubtitleHelper.Language639(
-                    textView.context.getString(R.string.none),
-                    textView.context.getString(R.string.none),
-                    "",
-                    "",
-                    "",
-                    "",
-                    ""
-                ),
-            )
-            langMap.addAll(SubtitleHelper.languages)
-
-            val lang639_1 = langMap.map { it.ISO_639_1 }
-            activity?.showDialog(
-                langMap.map { it.languageName },
-                lang639_1.indexOf(getAutoSelectLanguageISO639_1()),
-                (textView as TextView).text.toString(),
-                true,
-                dismissCallback
-            ) { index ->
-                setKey(SUBTITLE_AUTO_SELECT_KEY, lang639_1[index])
+                val lang639_1 = langMap.map { it.ISO_639_1 }
+                activity?.showDialog(
+                    langMap.map { it.languageName },
+                    lang639_1.indexOf(getAutoSelectLanguageISO639_1()),
+                    (textView as TextView).text.toString(),
+                    true,
+                    dismissCallback
+                ) { index ->
+                    setKey(SUBTITLE_AUTO_SELECT_KEY, lang639_1[index])
+                }
             }
-        }
 
-        subs_auto_select_language.setOnLongClickListener {
-            setKey(SUBTITLE_AUTO_SELECT_KEY, "en")
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
-
-        subs_download_languages.setFocusableInTv()
-        subs_download_languages.setOnClickListener { textView ->
-            val langMap = SubtitleHelper.languages
-            val lang639_1 = langMap.map { it.ISO_639_1 }
-            val keys = getDownloadSubsLanguageISO639_1()
-            val keyMap = keys.map { lang639_1.indexOf(it) }.filter { it >= 0 }
-
-            activity?.showMultiDialog(
-                langMap.map { it.languageName },
-                keyMap,
-                (textView as TextView).text.toString(),
-                dismissCallback
-            ) { indexList ->
-                setKey(SUBTITLE_DOWNLOAD_KEY, indexList.map { lang639_1[it] }.toList())
+            subsAutoSelectLanguage.setOnLongClickListener {
+                setKey(SUBTITLE_AUTO_SELECT_KEY, "en")
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
             }
-        }
 
-        subs_download_languages.setOnLongClickListener {
-            setKey(SUBTITLE_DOWNLOAD_KEY, listOf("en"))
+            subsDownloadLanguages.setFocusableInTv()
+            subsDownloadLanguages.setOnClickListener { textView ->
+                val langMap = SubtitleHelper.languages
+                val lang639_1 = langMap.map { it.ISO_639_1 }
+                val keys = getDownloadSubsLanguageISO639_1()
+                val keyMap = keys.map { lang639_1.indexOf(it) }.filter { it >= 0 }
 
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
+                activity?.showMultiDialog(
+                    langMap.map { it.languageName },
+                    keyMap,
+                    (textView as TextView).text.toString(),
+                    dismissCallback
+                ) { indexList ->
+                    setKey(SUBTITLE_DOWNLOAD_KEY, indexList.map { lang639_1[it] }.toList())
+                }
+            }
 
-        cancel_btt.setOnClickListener {
-            activity?.popCurrentPage()
-        }
+            subsDownloadLanguages.setOnLongClickListener {
+                setKey(SUBTITLE_DOWNLOAD_KEY, listOf("en"))
 
-        apply_btt.setOnClickListener {
-            it.context.saveStyle(state)
-            applyStyleEvent.invoke(state)
-            it.context.fromSaveToStyle(state)
-            activity?.popCurrentPage()
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            cancelBtt.setOnClickListener {
+                activity?.popCurrentPage()
+            }
+
+            applyBtt.setOnClickListener {
+                it.context.saveStyle(state)
+                applyStyleEvent.invoke(state)
+                it.context.fromSaveToStyle(state)
+                activity?.popCurrentPage()
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index a76b62fd..48917889 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -20,6 +20,9 @@ import android.os.*
 import android.provider.MediaStore
 import android.text.Spanned
 import android.util.Log
+import android.view.View
+import android.view.View.LAYOUT_DIRECTION_LTR
+import android.view.View.LAYOUT_DIRECTION_RTL
 import android.view.animation.DecelerateInterpolator
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -33,6 +36,7 @@ import androidx.core.widget.ContentLoadingProgressBar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -47,12 +51,14 @@ import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.wrappers.Wrappers
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
+import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
 import com.lagradost.cloudstream3.ui.WebviewFragment
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -87,6 +93,9 @@ object AppUtils {
         return if (layoutManager == null || adapter == null) false else layoutManager.findLastCompletelyVisibleItemPosition() < adapter.itemCount - 7 // bit more than 1 to make it more seamless
     }
 
+    fun View.isLtr() = this.layoutDirection == LAYOUT_DIRECTION_LTR
+    fun View.isRtl() = this.layoutDirection == LAYOUT_DIRECTION_RTL
+
     fun BottomSheetDialog?.ownHide() {
         this?.hide()
     }
@@ -198,7 +207,11 @@ object AppUtils {
         animation.start()
     }
 
-    fun Context.createNotificationChannel(channelId: String, channelName: String, description: String) {
+    fun Context.createNotificationChannel(
+        channelId: String,
+        channelName: String,
+        description: String
+    ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val importance = NotificationManager.IMPORTANCE_DEFAULT
             val channel =
@@ -288,6 +301,7 @@ object AppUtils {
 
     // https://github.com/googlearchive/leanback-homescreen-channels/blob/master/app/src/main/java/com/google/android/tvhomescreenchannels/SampleTvProvider.java
     @SuppressLint("RestrictedApi")
+    @Throws
     @WorkerThread
     suspend fun Context.addProgramsToContinueWatching(data: List<DataStoreHelper.ResumeWatchingResult>) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
@@ -369,7 +383,6 @@ object AppUtils {
             )
             main {
                 showToast(
-                    this@loadRepository,
                     getString(R.string.player_loaded_subtitles, repo.name),
                     Toast.LENGTH_LONG
                 )
@@ -577,12 +590,29 @@ object AppUtils {
         }
     }
 
+    fun loadResult(
+        url: String,
+        apiName: String,
+        startAction: Int = 0,
+        startValue: Int = 0
+    ) {
+        (activity as FragmentActivity?)?.loadResult(url, apiName, startAction, startValue)
+    }
+
     fun FragmentActivity.loadResult(
         url: String,
         apiName: String,
         startAction: Int = 0,
         startValue: Int = 0
     ) {
+        try {
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+            Kitsu.isEnabled =
+                settingsManager.getBoolean(this.getString(R.string.show_kitsu_posters_key), true)
+        }catch (t : Throwable) {
+            logError(t)
+        }
+
         this.runOnUiThread {
             // viewModelStore.clear()
             this.navigate(
@@ -592,6 +622,14 @@ object AppUtils {
         }
     }
 
+    fun loadSearchResult(
+        card: SearchResponse,
+        startAction: Int = 0,
+        startValue: Int? = null,
+    ) {
+        activity?.loadSearchResult(card, startAction, startValue)
+    }
+
     fun Activity?.loadSearchResult(
         card: SearchResponse,
         startAction: Int = 0,
@@ -776,12 +814,12 @@ object AppUtils {
         return networkInfo.any {
             conManager.getNetworkCapabilities(it)
                 ?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true
-                    } &&
+        } &&
                 !networkInfo.any {
                     conManager.getNetworkCapabilities(it)
                         ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
                 }
-        }
+    }
 
 
     private fun Activity?.cacheClass(clazz: String?) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 2318fda6..5bd0cd15 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -149,7 +149,7 @@ object BackupUtils {
     fun FragmentActivity.backup() {
         try {
             if (!checkWrite()) {
-                showToast(this, getString(R.string.backup_failed), Toast.LENGTH_LONG)
+                showToast(getString(R.string.backup_failed), Toast.LENGTH_LONG)
                 requestRW()
                 return
             }
@@ -201,7 +201,6 @@ object BackupUtils {
             printStream.close()
 
             showToast(
-                this,
                 R.string.backup_success,
                 Toast.LENGTH_LONG
             )
@@ -209,7 +208,6 @@ object BackupUtils {
             logError(e)
             try {
                 showToast(
-                    this,
                     getString(R.string.backup_failed_error_format).format(e.toString()),
                     Toast.LENGTH_LONG
                 )
@@ -243,7 +241,6 @@ object BackupUtils {
                             logError(e)
                             main { // smth can fail in .format
                                 showToast(
-                                    activity,
                                     getString(R.string.restore_failed_format).format(e.toString())
                                 )
                             }
@@ -270,7 +267,7 @@ object BackupUtils {
                     )
                 )
             } catch (e: Exception) {
-                showToast(this, e.message)
+                showToast(e.message)
                 logError(e)
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
index e1cedd39..dd2b40a3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -18,6 +18,8 @@ const val USER_PROVIDER_API = "user_custom_sites"
 
 const val PREFERENCES_NAME = "rebuild_preference"
 
+// TODO degelgate by value for get & set
+
 object DataStore {
     val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule())
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
index 26f83d1e..57a5f8e4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
@@ -3,6 +3,8 @@ package com.lagradost.cloudstream3.utils
 class Event<T> {
     private val observers = mutableSetOf<(T) -> Unit>()
 
+    val size : Int get() = observers.size
+
     operator fun plusAssign(observer: (T) -> Unit) {
         observers.add(observer)
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index f6f76fe7..6a5a665a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -399,6 +399,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Moviehab(),
     MoviehabNet(),
     Jeniusplay(),
+    StreamoUpload(),
 
     Gdriveplayerapi(),
     Gdriveplayerapp(),
@@ -548,4 +549,4 @@ abstract class ExtractorApi {
     open fun getExtractorUrl(id: String): String {
         return id
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 8b516e8c..b2c4aa5c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -300,7 +300,7 @@ class InAppUpdater {
                                     // Forcefully start any delayed installations
                                     if (ApkInstaller.delayedInstaller?.startInstallation() == true) return@setPositiveButton
 
-                                    showToast(context, R.string.download_started, Toast.LENGTH_LONG)
+                                    showToast(R.string.download_started, Toast.LENGTH_LONG)
 
                                     // Check if the setting hasn't been changed
                                     if (settingsManager.getInt(
@@ -335,7 +335,6 @@ class InAppUpdater {
                                                 if (!downloadUpdate(update.updateURL))
                                                     runOnUiThread {
                                                         showToast(
-                                                            context,
                                                             R.string.download_failed,
                                                             Toast.LENGTH_LONG
                                                         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
index 1f6d726d..8285b8ab 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
@@ -2,19 +2,28 @@ package com.lagradost.cloudstream3.utils
 
 import android.app.Activity
 import android.app.Dialog
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.*
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ListView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.*
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.core.view.marginLeft
+import androidx.core.view.marginRight
+import androidx.core.view.marginTop
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.BottomSelectionDialogBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.add_account_input.*
-import kotlinx.android.synthetic.main.add_account_input.text1
-import kotlinx.android.synthetic.main.bottom_selection_dialog_direct.*
 
 object SingleSelectionHelper {
     fun Activity?.showOptionSelectStringRes(
@@ -82,6 +91,7 @@ object SingleSelectionHelper {
     }
 
     fun Activity?.showDialog(
+        binding: BottomSelectionDialogBinding,
         dialog: Dialog,
         items: List<String>,
         selectedIndex: List<Int>,
@@ -95,39 +105,39 @@ object SingleSelectionHelper {
         if (this == null) return
 
         val realShowApply = showApply || isMultiSelect
-        val listView = dialog.listview1//.findViewById<ListView>(R.id.listview1)!!
-        val textView = dialog.text1//.findViewById<TextView>(R.id.text1)!!
-        val applyButton = dialog.apply_btt//.findViewById<TextView>(R.id.apply_btt)
-        val cancelButton = dialog.cancel_btt//findViewById<TextView>(R.id.cancel_btt)
+        val listView = binding.listview1//.findViewById<ListView>(R.id.listview1)!!
+        val textView = binding.text1//.findViewById<TextView>(R.id.text1)!!
+        val applyButton = binding.applyBtt//.findViewById<TextView>(R.id.apply_btt)
+        val cancelButton = binding.cancelBtt//findViewById<TextView>(R.id.cancel_btt)
         val applyHolder =
-            dialog.apply_btt_holder//.findViewById<LinearLayout>(R.id.apply_btt_holder)
+            binding.applyBttHolder//.findViewById<LinearLayout>(R.id.apply_btt_holder)
 
-        applyHolder?.isVisible = realShowApply
+        applyHolder.isVisible = realShowApply
         if (!realShowApply) {
             val params = listView.layoutParams as LinearLayout.LayoutParams
             params.setMargins(listView.marginLeft, listView.marginTop, listView.marginRight, 0)
             listView.layoutParams = params
         }
 
-        textView?.text = name
-        textView?.isGone = name.isBlank()
+        textView.text = name
+        textView.isGone = name.isBlank()
 
         val arrayAdapter = ArrayAdapter<String>(this, itemLayout)
         arrayAdapter.addAll(items)
 
-        listView?.adapter = arrayAdapter
+        listView.adapter = arrayAdapter
         if (isMultiSelect) {
-            listView?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+            listView.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
         } else {
-            listView?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+            listView.choiceMode = AbsListView.CHOICE_MODE_SINGLE
         }
 
         for (select in selectedIndex) {
-            listView?.setItemChecked(select, true)
+            listView.setItemChecked(select, true)
         }
 
         selectedIndex.minOrNull()?.let {
-            listView?.setSelection(it)
+            listView.setSelection(it)
         }
 
         //  var lastSelectedIndex = if(selectedIndex.isNotEmpty()) selectedIndex.first() else -1
@@ -136,7 +146,7 @@ object SingleSelectionHelper {
             dismissCallback.invoke()
         }
 
-        listView?.setOnItemClickListener { _, _, which, _ ->
+        listView.setOnItemClickListener { _, _, which, _ ->
             //  lastSelectedIndex = which
             if (realShowApply) {
                 if (!isMultiSelect) {
@@ -148,7 +158,7 @@ object SingleSelectionHelper {
             }
         }
         if (realShowApply) {
-            applyButton?.setOnClickListener {
+            applyButton.setOnClickListener {
                 val list = ArrayList<Int>()
                 for (index in 0 until listView.count) {
                     if (listView.checkedItemPositions[index])
@@ -157,7 +167,7 @@ object SingleSelectionHelper {
                 callback.invoke(list)
                 dialog.dismissSafe(this)
             }
-            cancelButton?.setOnClickListener {
+            cancelButton.setOnClickListener {
                 dialog.dismissSafe(this)
             }
         }
@@ -213,13 +223,26 @@ object SingleSelectionHelper {
     ) {
         if (this == null) return
 
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
         val builder =
             AlertDialog.Builder(this, R.style.AlertDialogCustom)
-                .setView(R.layout.bottom_selection_dialog)
+                .setView(binding.root)
 
         val dialog = builder.create()
         dialog.show()
-        showDialog(dialog, items, selectedIndex, name, true, true, callback, dismissCallback)
+        showDialog(
+            binding,
+            dialog,
+            items,
+            selectedIndex,
+            name,
+            showApply = true,
+            isMultiSelect = true,
+            callback,
+            dismissCallback
+        )
     }
 
     fun Activity?.showDialog(
@@ -232,13 +255,19 @@ object SingleSelectionHelper {
     ) {
         if (this == null) return
 
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
         val builder =
             AlertDialog.Builder(this, R.style.AlertDialogCustom)
-                .setView(R.layout.bottom_selection_dialog)
+                .setView(binding.root)
 
         val dialog = builder.create()
         dialog.show()
+
+
         showDialog(
+            binding,
             dialog,
             items,
             listOf(selectedIndex),
@@ -260,12 +289,18 @@ object SingleSelectionHelper {
         callback: (Int) -> Unit,
     ) {
         if (this == null) return
+
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
+
         val builder =
             BottomSheetDialog(this)
-        builder.setContentView(R.layout.bottom_selection_dialog)
+        builder.setContentView(binding.root)
 
         builder.show()
         showDialog(
+            binding,
             builder,
             items,
             listOf(selectedIndex),
@@ -285,13 +320,19 @@ object SingleSelectionHelper {
     ): BottomSheetDialog {
         val builder =
             BottomSheetDialog(this)
-        builder.setContentView(R.layout.bottom_selection_dialog_direct)
 
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
+
+        //builder.setContentView(R.layout.bottom_selection_dialog_direct)
+        builder.setContentView(binding.root)
         builder.show()
         showDialog(
+            binding,
             builder,
             items,
-            listOf(),
+            emptyList(),
             name,
             showApply = false,
             isMultiSelect = false,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
index e5f2f2dc..71d3a1ef 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit
 
 object SyncUtil {
     private val regexs = listOf(
-        Regex("""(9anime)\.(?:to|center|id)/watch/(?:.*?)\.([^/?]*)"""),
+        Regex("""(9anime)\.(?:to|center|id)/watch/.*?\.([^/?]*)"""),
         Regex("""(gogoanime|gogoanimes)\..*?/category/([^/?]*)"""),
         Regex("""(twist\.moe)/a/([^/?]*)"""),
     )
@@ -44,6 +44,13 @@ object SyncUtil {
                     matchList[site]?.let { realSite ->
                         getIdsFromSlug(slug, realSite)?.let {
                             return it
+                        } ?: kotlin.run {
+                            if (slug.endsWith("-dub")) {
+                                println("testing non -dub slug $slug")
+                                getIdsFromSlug(slug.removeSuffix("-dub"), realSite)?.let {
+                                    return it
+                                }
+                            }
                         }
                     }
                 }
@@ -89,8 +96,10 @@ object SyncUtil {
                 .mapNotNull { it.url }.toMutableList()
 
         if (type == "anilist") { // TODO MAKE BETTER
-            apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
-                current.add("${it.mainUrl}/anime/$id")
+            synchronized(apis) {
+                apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
+                    current.add("${it.mainUrl}/anime/$id")
+                }
             }
         }
         return current
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
index 66e1e504..dd973538 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
@@ -211,7 +211,7 @@ object TestingUtils {
 
     fun getDeferredProviderTests(
         scope: CoroutineScope,
-        providers: List<MainAPI>,
+        providers: Array<MainAPI>,
         logger: (String) -> Unit,
         callback: (MainAPI, TestResultProvider) -> Unit
     ) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 7d798204..eb2067d6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -46,11 +46,16 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions.bitmapTransform
 import com.bumptech.glide.request.target.Target
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
+import com.google.android.material.chip.ChipGroup
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.UiImage
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import jp.wasabeef.glide.transformations.BlurTransformation
 import kotlin.math.roundToInt
 
@@ -72,6 +77,30 @@ object UIHelper {
                 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
     }
 
+    fun populateChips(view: ChipGroup?, tags : List<String>) {
+        if(view == null) return
+        view.removeAllViews()
+        val context = view.context ?: return
+
+        tags.forEach { tag ->
+            val chip = Chip(context)
+            val chipDrawable = ChipDrawable.createFromAttributes(
+                context,
+                null,
+                0,
+                R.style.ChipFilled
+            )
+            chip.setChipDrawable(chipDrawable)
+            chip.text = tag
+            chip.isChecked = false
+            chip.isCheckable = false
+            chip.isFocusable = false
+            chip.isClickable = false
+            chip.setTextColor(context.colorFromAttribute(R.attr.textColor))
+            view.addView(chip)
+        }
+    }
+
     fun Activity.requestRW() {
         ActivityCompat.requestPermissions(
             this,
@@ -181,16 +210,69 @@ object UIHelper {
         }
     }
 
+    /*inline fun <reified T : ViewBinding> bindViewBinding(
+        inflater: LayoutInflater?,
+        container: ViewGroup?,
+        layout: Int
+    ): Pair<T?, UiText?> {
+        return try {
+            val localInflater = inflater ?: container?.context?.let { LayoutInflater.from(it) }
+            ?: return null to txt(
+                R.string.unable_to_inflate,
+                "Requires inflater OR container"
+            )//throw IllegalArgumentException("Requires inflater OR container"))
+
+            //println("methods: ${T::class.java.methods.map { it.name }}")
+            val bind = T::class.java.methods.first { it.name == "bind" }
+            //val inflate = T::class.java.methods.first { it.name == "inflate" }
+            val root = localInflater.inflate(layout, container, false)
+            bind.invoke(null, root) as T to null
+        } catch (t: Throwable) {
+            logError(t)
+            val message = txt(R.string.unable_to_inflate, t.message ?: "Primary constructor")
+            // if the desired layout is not found then we inflate the casted layout
+            /*try {
+                val localInflater = inflater ?: container?.context?.let { LayoutInflater.from(it) }
+                ?: return null to txt(
+                    R.string.unable_to_inflate,
+                    "Requires inflater OR container"
+                )//throw IllegalArgumentException("Requires inflater OR container"))
+
+                // we don't know what method to use as there are 2, but first *should* always be true
+                return try {
+                    val inflate = T::class.java.methods.first { it.name == "inflate" }
+                    inflate.invoke(null, localInflater, container, false) as T
+                } catch (_: Throwable) {
+                    val inflate = T::class.java.methods.last { it.name == "inflate" }
+                    inflate.invoke(null, localInflater, container, false) as T
+                } to message
+            } catch (t: Throwable) {
+                logError(t)
+            }*/
+
+            null to message
+        }
+    }*/
+
     fun ImageView?.setImage(
         url: String?,
         headers: Map<String, String>? = null,
         @DrawableRes
         errorImageDrawable: Int? = null,
         fadeIn: Boolean = true,
+        radius: Int = 0,
+        sample: Int = 3,
         colorCallback: ((Palette) -> Unit)? = null
     ): Boolean {
         if (url.isNullOrBlank()) return false
-        this.setImage(UiImage.Image(url, headers, errorImageDrawable), errorImageDrawable, fadeIn, colorCallback)
+        this.setImage(
+            UiImage.Image(url, headers, errorImageDrawable),
+            errorImageDrawable,
+            fadeIn,
+            radius,
+            sample,
+            colorCallback
+        )
         return true
     }
 
@@ -199,7 +281,9 @@ object UIHelper {
         @DrawableRes
         errorImageDrawable: Int? = null,
         fadeIn: Boolean = true,
-        colorCallback: ((Palette) -> Unit)? = null
+        radius: Int = 0,
+        sample: Int = 3,
+        colorCallback: ((Palette) -> Unit)? = null,
     ): Boolean {
         if (this == null || uiImage == null) return false
 
@@ -211,7 +295,7 @@ object UIHelper {
             } ?: return false
 
         return try {
-            val builder = GlideApp.with(this)
+            var builder = GlideApp.with(this)
                 .load(glideImage)
                 .skipMemoryCache(true)
                 .diskCacheStrategy(DiskCacheStrategy.ALL).let { req ->
@@ -220,8 +304,12 @@ object UIHelper {
                     else req
                 }
 
+            if(radius > 0) {
+                builder = builder.apply(bitmapTransform(BlurTransformation(radius, sample)))
+            }
+
             if (colorCallback != null) {
-                builder.listener(object : RequestListener<Drawable> {
+                builder = builder.listener(object : RequestListener<Drawable> {
                     @SuppressLint("CheckResult")
                     override fun onResourceReady(
                         resource: Drawable?,
@@ -397,21 +485,22 @@ object UIHelper {
         return result
     }
 
-    fun Context?.fixPaddingStatusbar(v: View?) {
-        if (v == null || this == null) return
+    fun fixPaddingStatusbar(v: View?) {
+        if (v == null) return
+        val ctx = v.context ?: return
         v.setPadding(
             v.paddingLeft,
-            v.paddingTop + getStatusBarHeight(),
+            v.paddingTop + ctx.getStatusBarHeight(),
             v.paddingRight,
             v.paddingBottom
         )
     }
 
-    fun Context.fixPaddingStatusbarView(v: View?) {
+    fun fixPaddingStatusbarView(v: View?) {
         if (v == null) return
-
+        val ctx = v.context ?: return
         val params = v.layoutParams
-        params.height = getStatusBarHeight()
+        params.height = ctx.getStatusBarHeight()
         v.layoutParams = params
     }
 
@@ -504,7 +593,7 @@ object UIHelper {
     }
 
     fun Dialog?.dismissSafe() {
-        if (this?.isShowing == true) {
+        if (this?.isShowing == true && activity?.isFinishing != true) {
             this.dismiss()
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
index c18ff48f..c138ea75 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
@@ -15,6 +15,8 @@ import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
 import androidx.preference.PreferenceManager
 import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
@@ -37,8 +39,10 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import okhttp3.internal.closeQuietly
@@ -88,12 +92,16 @@ object VideoDownloadManager {
     @DrawableRes
     const val pressToStopIcon = R.drawable.exo_icon_stop
 
+    private var updateCount : Int = 0
+    private val downloadDataUpdateCount = MutableLiveData<Int>()
+
     enum class DownloadType {
         IsPaused,
         IsDownloading,
         IsDone,
         IsFailed,
         IsStopped,
+        IsPending
     }
 
     enum class DownloadActionType {
@@ -271,6 +279,7 @@ object VideoDownloadManager {
                         DownloadType.IsPaused -> imgPaused
                         DownloadType.IsFailed -> imgError
                         DownloadType.IsStopped -> imgStopped
+                        DownloadType.IsPending -> imgDownloading
                     }
                 )
 
diff --git a/app/src/main/res/anim/rotate_around_center_point.xml b/app/src/main/res/anim/rotate_around_center_point.xml
new file mode 100644
index 00000000..76e7b39b
--- /dev/null
+++ b/app/src/main/res/anim/rotate_around_center_point.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false" >
+
+    <rotate
+        android:duration="4000"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:repeatCount="infinite"
+        android:repeatMode="restart"
+        android:toDegrees="360" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_shape_dotted.xml b/app/src/main/res/drawable/circle_shape_dotted.xml
new file mode 100644
index 00000000..6ce2808c
--- /dev/null
+++ b/app/src/main/res/drawable/circle_shape_dotted.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:innerRadiusRatio="2.5"
+    android:shape="ring"
+    android:thickness="0dp"
+    android:useLevel="false">
+    <stroke
+        tools:color="#FFF"
+        android:width="2dp"
+        android:color="?attr/download_outline_color"
+        android:dashWidth="10px"
+        android:dashGap="10px" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_clockwise.xml b/app/src/main/res/drawable/circular_progress_bar_clockwise.xml
new file mode 100644
index 00000000..a2e7f022
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_clockwise.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fromDegrees="270"
+    android:toDegrees="270">
+    <shape
+        android:innerRadiusRatio="50"
+        android:shape="ring"
+        android:innerRadius="0dp"
+        android:thicknessRatio="2.65"
+        android:useLevel="true"><!-- this line fixes the issue for lollipop api 21 -->
+        <solid android:color="?attr/download_fill_color" tools:color="#FFF" />
+    </shape>
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_counter_clockwise.xml b/app/src/main/res/drawable/circular_progress_bar_counter_clockwise.xml
new file mode 100644
index 00000000..477e8db1
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_counter_clockwise.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fromDegrees="270"
+    android:toDegrees="-90">
+    <shape
+        android:innerRadiusRatio="50"
+        android:shape="ring"
+        android:innerRadius="0dp"
+        android:thicknessRatio="2.65"
+        android:useLevel="true"><!-- this line fixes the issue for lollipop api 21 -->
+        <solid android:color="?attr/download_fill_color" tools:color="#FFF" />
+    </shape>
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_small_to_large.xml b/app/src/main/res/drawable/circular_progress_bar_small_to_large.xml
new file mode 100644
index 00000000..eed44628
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_small_to_large.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<scale xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:scaleGravity="center"
+    android:scaleHeight="100%"
+    android:scaleWidth="100%">
+    <shape
+        android:shape="ring"
+        android:innerRadius="0dp"
+        android:thicknessRatio="2.5"
+        android:useLevel="false"><!-- this line fixes the issue for lollipop api 21 -->
+        <solid
+            android:color="?attr/download_fill_color"
+            tools:color="#FFF" />
+    </shape>
+</scale>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_top_to_bottom.xml b/app/src/main/res/drawable/circular_progress_bar_top_to_bottom.xml
new file mode 100644
index 00000000..f41eea84
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_top_to_bottom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list>
+    <item>
+        <scale xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:scaleGravity="top"
+            android:scaleHeight="100%"
+            android:scaleWidth="100%">
+            <shape
+                android:shape="rectangle"
+                android:innerRadius="0dp"
+                android:thicknessRatio="2.5"
+                android:useLevel="false"><!-- this line fixes the issue for lollipop api 21 -->
+                <solid
+                    android:color="?attr/download_fill_color"
+                    tools:color="#FFF" />
+            </shape>
+        </scale>
+    </item>
+    <item>
+        <scale xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:scaleGravity="right"
+            android:scaleHeight="100%"
+            android:scaleWidth="100%">
+            <shape
+                android:shape="rectangle"
+                android:innerRadius="0dp"
+                android:thicknessRatio="2.5"
+                android:useLevel="false"><!-- this line fixes the issue for lollipop api 21 -->
+                <solid
+                    android:color="?attr/download_fill_color"
+                    tools:color="#FFF" />
+            </shape>
+        </scale>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_done.xml b/app/src/main/res/drawable/download_icon_done.xml
new file mode 100644
index 00000000..a41ac14e
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_done.xml
@@ -0,0 +1,23 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 17 1.01 L 7 1 C 5.9 1 5 1.9 5 3 L 5 21 C 5 22.1 5.9 23 7 23 L 17 23 C 18.1 23 19 22.1 19 21 L 19 3 C 19 1.9 18.1 1.01 17 1.01 Z M 17 19 L 7 19 L 7 5 L 17 5 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 7.488 13.004 L 9.132 11.36 L 12.492 14.72 L 10.848 16.364 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_2"
+        android:pathData="M 10.848 16.364 L 9.203 14.72 L 14.894 9.029 L 16.539 10.673 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_error.xml b/app/src/main/res/drawable/download_icon_error.xml
new file mode 100644
index 00000000..ef56f19a
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_error.xml
@@ -0,0 +1,23 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 17 1.01 L 7 1 C 5.9 1 5 1.9 5 3 L 5 21 C 5 22.1 5.9 23 7 23 L 17 23 C 18.1 23 19 22.1 19 21 L 19 3 C 19 1.9 18.1 1.01 17 1.01 Z M 17 19 L 7 19 L 7 5 L 17 5 Z M 10.101 13.289 L 10.513 10.311 L 9.848 9.33 L 9.496 8.867 L 11 13 L 9.706 13 L 9.745 15.93 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 15.801 14.763 L 14.157 16.407 L 7.873 10.124 L 9.518 8.479 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_2"
+        android:pathData="M 14.157 8.479 L 15.801 10.124 L 9.518 16.407 L 7.873 14.763 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_load.xml b/app/src/main/res/drawable/download_icon_load.xml
new file mode 100644
index 00000000..bde9a160
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_load.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_pause.xml b/app/src/main/res/drawable/download_icon_pause.xml
new file mode 100644
index 00000000..08455521
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_pause.xml
@@ -0,0 +1,18 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 17 1.01 L 7 1 C 5.9 1 5 1.9 5 3 L 5 21 C 5 22.1 5.9 23 7 23 L 17 23 C 18.1 23 19 22.1 19 21 L 19 3 C 19 1.9 18.1 1.01 17 1.01 Z M 17 19 L 7 19 L 7 5 L 17 5 Z M 10.101 13.289 L 10.513 10.311 L 9.848 9.33 L 9.496 8.867 L 11 13 L 9.706 13 L 9.745 15.93 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 9.104 8.931 L 11.129 8.931 L 11.129 15.956 L 9.104 15.956 Z M 12.871 8.931 L 14.896 8.931 L 14.896 15.956 L 12.871 15.956 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/episodes_shadow.xml b/app/src/main/res/drawable/episodes_shadow.xml
new file mode 100644
index 00000000..b4cdd382
--- /dev/null
+++ b/app/src/main/res/drawable/episodes_shadow.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@color/transparent"
+        android:endColor="?attr/primaryBlackBackground"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
index ebe459b2..dbda1cc0 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
@@ -3,6 +3,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48"
     android:tint="?attr/white"
+    android:autoMirrored="true"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M22,39.35 L7.95,25.3Q7.65,25.05 7.525,24.725Q7.4,24.4 7.4,24Q7.4,23.65 7.525,23.325Q7.65,23 7.95,22.75L22.05,8.6Q22.6,8.1 23.325,8.125Q24.05,8.15 24.6,8.7Q25.1,9.25 25.1,10Q25.1,10.75 24.55,11.3L13.65,22.2H38.1Q38.85,22.2 39.375,22.725Q39.9,23.25 39.9,24Q39.9,24.8 39.375,25.325Q38.85,25.85 38.1,25.85H13.65L24.65,36.8Q25.15,37.35 25.125,38.075Q25.1,38.8 24.55,39.35Q24,39.9 23.25,39.9Q22.5,39.9 22,39.35Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
index 6c3197a6..516df382 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
@@ -1,5 +1,11 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
index 2ec8c110..48ac45e7 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
@@ -3,6 +3,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48"
     android:tint="?attr/white"
+    android:autoMirrored="true"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M22.7,39.3Q22.15,38.75 22.175,38Q22.2,37.25 22.75,36.7L33.6,25.85H9.2Q8.45,25.85 7.925,25.325Q7.4,24.8 7.4,24Q7.4,23.25 7.925,22.725Q8.45,22.2 9.2,22.2H33.6L22.75,11.35Q22.2,10.8 22.175,10.025Q22.15,9.25 22.7,8.7Q23.25,8.15 24,8.15Q24.75,8.15 25.3,8.7L39.35,22.75Q39.65,23.05 39.8,23.35Q39.95,23.65 39.95,24Q39.95,24.35 39.8,24.675Q39.65,25 39.35,25.3L25.3,39.35Q24.75,39.9 24,39.875Q23.25,39.85 22.7,39.3Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
index 916c761c..b67188db 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
@@ -1,5 +1,11 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/white" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M13.3,17.3 L8.7,12.7Q8.55,12.55 8.488,12.375Q8.425,12.2 8.425,12Q8.425,11.8 8.488,11.625Q8.55,11.45 8.7,11.3L13.3,6.7Q13.575,6.425 14,6.425Q14.425,6.425 14.7,6.7Q14.975,6.975 14.975,7.4Q14.975,7.825 14.7,8.1L10.8,12L14.7,15.9Q14.975,16.175 14.975,16.6Q14.975,17.025 14.7,17.3Q14.425,17.575 14,17.575Q13.575,17.575 13.3,17.3Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.3,17.3 L8.7,12.7Q8.55,12.55 8.488,12.375Q8.425,12.2 8.425,12Q8.425,11.8 8.488,11.625Q8.55,11.45 8.7,11.3L13.3,6.7Q13.575,6.425 14,6.425Q14.425,6.425 14.7,6.7Q14.975,6.975 14.975,7.4Q14.975,7.825 14.7,8.1L10.8,12L14.7,15.9Q14.975,16.175 14.975,16.6Q14.975,17.025 14.7,17.3Q14.425,17.575 14,17.575Q13.575,17.575 13.3,17.3Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_language_24.xml b/app/src/main/res/drawable/ic_baseline_language_24.xml
index 1749952e..89b47937 100644
--- a/app/src/main/res/drawable/ic_baseline_language_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_language_24.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
index 249fe2a2..b6908e96 100644
--- a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml b/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml
index 2003bfe7..5d6045e7 100644
--- a/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z" />
 </vector>
diff --git a/app/src/main/res/drawable/netflix_skip_back.xml b/app/src/main/res/drawable/netflix_skip_back.xml
index bb63e948..5ad9c1a1 100644
--- a/app/src/main/res/drawable/netflix_skip_back.xml
+++ b/app/src/main/res/drawable/netflix_skip_back.xml
@@ -1,23 +1,23 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="850.39dp"
-        android:height="850.39dp"
-        android:viewportWidth="850.39"
-        android:viewportHeight="850.39">
+    android:width="850.39dp"
+    android:height="850.39dp"
+    android:viewportWidth="850.39"
+    android:viewportHeight="850.39">
     <path
-            android:pathData="M143.05,279.28A317.41,317.41 0,0 0,106.3 428c0,176.13 142.77,318.9 318.9,318.9S744.09,604.16 744.09,428 601.32,109.14 425.2,109.14q-14.15,0 -28,1.2"
-            android:strokeWidth="45"
-            android:fillColor="#00000000"
-            android:strokeColor="#fff"/>
+        android:fillColor="#00000000"
+        android:pathData="M143.05,279.28A317.41,317.41 0,0 0,106.3 428c0,176.13 142.77,318.9 318.9,318.9S744.09,604.16 744.09,428 601.32,109.14 425.2,109.14q-14.15,0 -28,1.2"
+        android:strokeWidth="45"
+        android:strokeColor="#fff" />
     <path
-            android:pathData="M483.083,223.108l-111.666,-111.666l25.442,-25.442l111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M483.083,223.108l-111.666,-111.666l25.442,-25.442l111.666,111.666z" />
     <path
-            android:pathData="M371.421,111.662l111.666,-111.666l25.442,25.442l-111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M371.421,111.662l111.666,-111.666l25.442,25.442l-111.666,111.666z" />
     <path
-            android:pathData="M398.087,223.272l-111.666,-111.666l25.442,-25.442l111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M398.087,223.272l-111.666,-111.666l25.442,-25.442l111.666,111.666z" />
     <path
-            android:pathData="M286.427,111.826l111.666,-111.666l25.442,25.442l-111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M286.427,111.826l111.666,-111.666l25.442,25.442l-111.666,111.666z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline.xml b/app/src/main/res/drawable/outline.xml
index 7b436c7d..30077a98 100644
--- a/app/src/main/res/drawable/outline.xml
+++ b/app/src/main/res/drawable/outline.xml
@@ -2,9 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
     <stroke android:width="2dp"
             android:color="?attr/white"/>
-    <corners
+   <!-- <corners
             android:bottomLeftRadius="@dimen/rounded_image_radius"
             android:bottomRightRadius="@dimen/rounded_image_radius"
             android:topLeftRadius="@dimen/rounded_image_radius"
             android:topRightRadius="@dimen/rounded_image_radius" />
+-->
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable.xml b/app/src/main/res/drawable/outline_drawable.xml
index 16eba83c..8eec2d0b 100644
--- a/app/src/main/res/drawable/outline_drawable.xml
+++ b/app/src/main/res/drawable/outline_drawable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true"
-          android:drawable="@drawable/outline"/> <!-- focused -->
+    <!--<item android:state_focused="true"
+          android:drawable="@drawable/outline"/>--> <!-- focused -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable_forced.xml b/app/src/main/res/drawable/outline_drawable_forced.xml
new file mode 100644
index 00000000..16eba83c
--- /dev/null
+++ b/app/src/main/res/drawable/outline_drawable_forced.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+          android:drawable="@drawable/outline"/> <!-- focused -->
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable_less.xml b/app/src/main/res/drawable/outline_drawable_less.xml
index 0b641074..db74a092 100644
--- a/app/src/main/res/drawable/outline_drawable_less.xml
+++ b/app/src/main/res/drawable/outline_drawable_less.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/outline_less" /> <!-- focused -->
+
+    <!--<item android:state_focused="true" android:drawable="@drawable/outline_less" />--> <!-- focused -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index dc29dec9..a70a40cd 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -41,6 +41,22 @@
 
         </com.google.android.material.navigationrail.NavigationRailView>
 
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/nav_view"
+            android:layout_height="70dp"
+            android:layout_width="0dp"
+            app:labelVisibilityMode="unlabeled"
+            android:visibility="gone"
+            android:background="?attr/primaryGrayBackground"
+
+            app:itemIconTint="@color/item_select_color"
+            app:itemTextColor="@color/item_select_color"
+
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:menu="@menu/bottom_nav_menu" />
+
         <LinearLayout
             android:id="@+id/cast_mini_controller_holder"
             android:layout_width="0dp"
@@ -61,4 +77,21 @@
                 tools:ignore="FragmentTagUsage" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:clickable="false"
+            android:visibility="gone"
+            android:id="@+id/focus_outline"
+            android:src="@drawable/outline"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:importantForAccessibility="no">
+        </ImageView>
+    </FrameLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cast_item.xml b/app/src/main/res/layout/cast_item.xml
index 8403940c..54df59a8 100644
--- a/app/src/main/res/layout/cast_item.xml
+++ b/app/src/main/res/layout/cast_item.xml
@@ -1,105 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusLeft="@id/episode_poster"
-        android:nextFocusRight="@id/result_episode_download"
-        android:id="@+id/episode_holder"
-        app:cardElevation="0dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
+    android:id="@+id/episode_holder"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp"
+    android:foreground="@drawable/outline_drawable"
+    app:cardBackgroundColor="@color/transparent"
+
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
 
-        android:foreground="@drawable/outline_drawable"
-        android:layout_margin="5dp">
     <LinearLayout
-            android:padding="5dp"
-            android:layout_width="100dp"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="5dp">
         <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
         <FrameLayout
-                android:layout_gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
 
             <androidx.cardview.widget.CardView
-                    app:cardCornerRadius="35dp"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:foreground="@drawable/outline_drawable">
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:foreground="@drawable/outline_drawable"
+                app:cardCornerRadius="35dp">
 
                 <ImageView
-                        android:nextFocusLeft="@id/result_episode_download"
-                        android:nextFocusRight="@id/episode_holder"
 
-                        android:id="@+id/actor_image"
-                        tools:src="@drawable/example_poster"
+                    android:id="@+id/actor_image"
+                    android:layout_width="match_parent"
 
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/episode_poster_img_des"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
 
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
-                    android:id="@+id/voice_actor_image_holder"
-                    android:layout_gravity="end|bottom"
-                    app:cardCornerRadius="20dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:foreground="@drawable/outline_drawable">
+                android:id="@+id/voice_actor_image_holder"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="end|bottom"
+                android:foreground="@drawable/outline_drawable"
+                app:cardCornerRadius="20dp">
 
                 <ImageView
-                        android:nextFocusLeft="@id/result_episode_download"
-                        android:nextFocusRight="@id/episode_holder"
+                    android:id="@+id/voice_actor_image"
+                    android:layout_width="match_parent"
 
-                        android:id="@+id/voice_actor_image"
-                        tools:src="@drawable/example_poster"
-
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/episode_poster_img_des"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
             </androidx.cardview.widget.CardView>
         </FrameLayout>
 
         <LinearLayout
-                android:paddingTop="3dp"
-                android:paddingBottom="3dp"
-                android:orientation="vertical"
-                android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp">
+
+            <TextView
+                android:id="@+id/actor_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:textColor="?attr/textColor"
+                android:textStyle="bold"
+                tools:text="Ackerman, Mikasa" />
 
             <TextView
-                    android:gravity="center_horizontal"
-                    android:id="@+id/actor_name"
-                    tools:text="Ackerman, Mikasa"
-                    android:textStyle="bold"
-                    android:textColor="?attr/textColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/voice_actor_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textColor="?attr/grayTextColor"
+                tools:text="voiceactor" />
 
             <TextView
-                    android:gravity="center_horizontal"
-                    android:id="@+id/voice_actor_name"
-                    tools:text="voiceactor"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <TextView
-                    android:gravity="center_horizontal"
-                    android:id="@+id/actor_extra"
-                    tools:text="Main"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/actor_extra"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textColor="?attr/grayTextColor"
+                tools:text="Main" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/download_button.xml b/app/src/main/res/layout/download_button.xml
new file mode 100644
index 00000000..e8023243
--- /dev/null
+++ b/app/src/main/res/layout/download_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.lagradost.cloudstream3.ui.download.button.DownloadButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/result_download_movie"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    app:download_layout="@layout/download_button_layout" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_button_layout.xml b/app/src/main/res/layout/download_button_layout.xml
new file mode 100644
index 00000000..0ceca181
--- /dev/null
+++ b/app/src/main/res/layout/download_button_layout.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/download_movie_button"
+        style="@style/BlackButton"
+        android:layout_width="match_parent"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp"
+        android:visibility="visible" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <include
+            layout="@layout/download_button_view"
+            android:layout_width="30dp"
+            android:layout_height="30dp" />
+
+        <TextView
+            android:id="@+id/result_movie_download_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="10dp"
+            android:gravity="center"
+            android:letterSpacing="0.09"
+            android:textAllCaps="false"
+            android:textColor="?attr/textColor"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            tools:text="Downloading" />
+
+        <TextView
+            android:id="@+id/result_movie_download_text_precentage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:letterSpacing="0.09"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textAllCaps="false"
+            android:textColor="?attr/textColor"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            tools:text="68%"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_button_view.xml b/app/src/main/res/layout/download_button_view.xml
new file mode 100644
index 00000000..6e40a597
--- /dev/null
+++ b/app/src/main/res/layout/download_button_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@android:color/holo_blue_light">
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/progress_downloaded"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0"
+
+        tools:progress="60"
+        android:progressDrawable="@drawable/circular_progress_bar_top_to_bottom"
+        android:visibility="visible" />
+
+    <View
+        android:id="@+id/progress_downloaded_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/circle_shape_dotted" />
+
+    <ImageView
+        android:scaleX="?attr/download_icon_scale"
+        android:scaleY="?attr/download_icon_scale"
+        tools:visibility="visible"
+        android:id="@+id/image_download_status"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_baseline_play_arrow_24"
+        android:visibility="visible"
+        app:tint="?attr/download_icon_color" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml
index f2633dd6..fd845ee8 100644
--- a/app/src/main/res/layout/download_child_episode.xml
+++ b/app/src/main/res/layout/download_child_episode.xml
@@ -1,118 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusRight="@id/download_child_episode_download"
-        android:nextFocusLeft="@id/nav_rail_view"
+    android:id="@+id/download_child_episode_holder"
+    android:layout_width="match_parent"
 
-        android:id="@+id/download_child_episode_holder"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_marginBottom="5dp">
+    android:layout_height="50dp"
+    android:layout_marginBottom="5dp"
+    android:foreground="@drawable/outline_drawable"
+    android:nextFocusLeft="@id/nav_rail_view"
+    android:nextFocusRight="@id/download_button"
+    app:cardBackgroundColor="@color/transparent"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
 
     <androidx.core.widget.ContentLoadingProgressBar
-            android:id="@+id/download_child_episode_progress"
+        android:id="@+id/download_child_episode_progress"
 
-            android:layout_marginBottom="-1.5dp"
-            android:progressTint="?attr/colorPrimary"
-            android:progressBackgroundTint="?attr/colorPrimary"
-            style="@android:style/Widget.Material.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            tools:progress="50"
-            android:layout_gravity="bottom"
-            android:layout_height="5dp" />
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <GridLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless">
 
         <ImageView
-                android:id="@+id/download_child_episode_play"
-                android:visibility="gone"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/episode_play_img_des" />
+            android:id="@+id/download_child_episode_play"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:contentDescription="@string/episode_play_img_des"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            android:visibility="gone" />
 
         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="50dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/download_child_episode_text"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:orientation="vertical"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="50dp"
-                android:layout_width="match_parent">
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+
+                android:ellipsize="marquee"
+                android:gravity="center_vertical"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:scrollHorizontally="true"
+
+                android:singleLine="true"
+                android:textColor="?attr/textColor"
+                tools:text="Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1" />
 
             <TextView
-                    android:id="@+id/download_child_episode_text"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    tools:text="Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1"
-
-                    android:scrollHorizontally="true"
-                    android:ellipsize="marquee"
-                    android:marqueeRepeatLimit="marquee_forever"
-                    android:singleLine="true"
-
-                    android:textColor="?attr/textColor"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-            <TextView
-                    android:id="@+id/download_child_episode_text_extra"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    tools:text="128MB / 237MB"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent" />
+                android:id="@+id/download_child_episode_text_extra"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:gravity="center_vertical"
+                android:textColor="?attr/grayTextColor"
+                tools:text="128MB / 237MB" />
         </LinearLayout>
 
-        <FrameLayout
-                android:layout_marginStart="-50dp"
-                android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
 
-            <androidx.core.widget.ContentLoadingProgressBar
-                    android:id="@+id/download_child_episode_progress_downloaded"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:indeterminate="false"
-                    android:progressDrawable="@drawable/circular_progress_bar"
-                    android:background="@drawable/circle_shape"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:max="100"
-                    android:layout_margin="5dp"
-                    android:layout_gravity="end|center_vertical"
-                    android:progress="0"
-                    android:visibility="visible" />
-
-            <ImageView
-                    android:nextFocusRight="@id/download_child_episode_holder"
-                    android:nextFocusLeft="@id/download_child_episode_holder"
-
-                    android:id="@+id/download_child_episode_download"
-                    android:visibility="visible"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:padding="10dp"
-                    android:layout_width="50dp"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:src="@drawable/ic_baseline_play_arrow_24"
-                    app:tint="?attr/textColor"
-                    android:contentDescription="@string/download" />
-        </FrameLayout>
+        <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+            android:id="@+id/download_button"
+            android:layout_width="@dimen/download_size"
+            android:layout_height="@dimen/download_size"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="10dp" />
     </GridLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_header_episode.xml b/app/src/main/res/layout/download_header_episode.xml
index da4b3617..226c1632 100644
--- a/app/src/main/res/layout/download_header_episode.xml
+++ b/app/src/main/res/layout/download_header_episode.xml
@@ -1,103 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="?attr/boxItemBackground"
-        android:id="@+id/episode_holder"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginTop="10dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/episode_holder"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="10dp"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="10dp"
+    android:foreground="@drawable/outline_drawable"
+    app:cardBackgroundColor="?attr/boxItemBackground"
+    app:cardCornerRadius="@dimen/rounded_image_radius">
 
     <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:orientation="horizontal">
         <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
         <androidx.cardview.widget.CardView
-                android:layout_width="70dp"
-                android:layout_height="104dp">
+            android:layout_width="70dp"
+            android:layout_height="104dp">
 
             <ImageView
-                    android:id="@+id/download_header_poster"
-                    tools:src="@drawable/example_poster"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:contentDescription="@string/episode_poster_img_des" />
+                android:id="@+id/download_header_poster"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/episode_poster_img_des"
+                android:scaleType="centerCrop"
+                tools:src="@drawable/example_poster" />
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
-                android:layout_marginStart="15dp"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:layout_width="match_parent"
-                android:layout_marginEnd="70dp"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="70dp"
+            android:orientation="vertical">
 
             <TextView
-                    android:id="@+id/download_header_title"
-                    tools:text="Perfect Run"
-                    android:textStyle="bold"
-                    android:textColor="?attr/textColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/download_header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/textColor"
+                android:textStyle="bold"
+                tools:text="Perfect Run" />
 
             <TextView
-                    android:id="@+id/download_header_info"
-                    tools:text="1 episode | 285MB"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/download_header_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/grayTextColor"
+                tools:text="1 episode | 285MB" />
         </LinearLayout>
 
         <ImageView
-                android:layout_marginStart="-50dp"
-                android:layout_height="match_parent"
-                android:padding="50dp"
-                android:layout_width="50dp"
-                android:id="@+id/download_header_goto_child"
-                android:layout_gravity="center_vertical|end"
-                android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
-                android:contentDescription="@string/download" />
+            android:id="@+id/download_header_goto_child"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:contentDescription="@string/download"
+            android:padding="50dp"
+            android:src="@drawable/ic_baseline_keyboard_arrow_right_24" />
 
-        <FrameLayout
-                android:layout_marginStart="-50dp"
-                android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
-
-            <androidx.core.widget.ContentLoadingProgressBar
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:id="@+id/download_header_progress_downloaded"
-                    android:indeterminate="false"
-                    android:progressDrawable="@drawable/circular_progress_bar"
-                    android:background="@drawable/circle_shape"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:max="100"
-                    android:layout_margin="5dp"
-                    android:layout_gravity="center_vertical"
-                    android:progress="0"
-                    android:visibility="visible" />
-
-            <ImageView
-                    android:visibility="visible"
-                    android:layout_gravity="center_vertical"
-                    android:layout_height="wrap_content"
-                    android:padding="10dp"
-                    android:layout_width="50dp"
-                    android:id="@+id/download_header_episode_download"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:src="@drawable/ic_baseline_play_arrow_24"
-                    android:contentDescription="@string/download"
-                    app:tint="?attr/white" />
-        </FrameLayout>
+        <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+            android:id="@+id/download_button"
+            android:layout_width="@dimen/download_size"
+            android:layout_height="@dimen/download_size"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="10dp" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
index b9b4fec0..8592daea 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="vertical"
-    android:id="@+id/home_header"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/primaryBlackBackground"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
     <View
         android:id="@+id/home_none_padding"
@@ -20,10 +20,10 @@
         android:layout_height="wrap_content">
 
         <androidx.viewpager2.widget.ViewPager2
-            android:descendantFocusability="blocksDescendants"
             android:id="@+id/home_preview_viewpager"
             android:layout_width="match_parent"
             android:layout_height="400dp"
+            android:descendantFocusability="blocksDescendants"
             android:orientation="horizontal">
 
         </androidx.viewpager2.widget.ViewPager2>
@@ -35,12 +35,13 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_preview_change_api"
-                style="@style/BlackButton"
+                style="@style/RegularButtonTV"
                 android:layout_width="wrap_content"
                 android:layout_gravity="top|start"
                 android:layout_marginStart="@dimen/navbar_width"
-                android:backgroundTint="@color/semiWhite"
-                android:minWidth="150dp" />
+                android:minWidth="150dp"
+                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusDown="@id/home_preview_play_btt" />
         </FrameLayout>
 
         <LinearLayout
@@ -92,27 +93,27 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_preview_play_btt"
-                    style="@style/WhiteButton"
+                    style="@style/RegularButtonTV"
                     android:layout_width="wrap_content"
                     android:layout_margin="0dp"
                     android:minWidth="150dp"
                     android:nextFocusLeft="@id/home_preview_hidden_prev_focus"
                     android:nextFocusRight="@id/home_preview_info_btt"
                     android:nextFocusUp="@id/home_preview_change_api"
-                    android:nextFocusDown="@id/home_watch_parent_item_title"
+                    android:nextFocusDown="@id/home_watch_child_recyclerview"
                     android:text="@string/home_play"
                     app:icon="@drawable/ic_baseline_play_arrow_24" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_preview_info_btt"
-                    style="@style/BlackButton"
+                    style="@style/RegularButtonTV"
                     android:layout_width="wrap_content"
                     android:minWidth="150dp"
 
                     android:nextFocusLeft="@id/home_preview_play_btt"
                     android:nextFocusRight="@id/home_preview_hidden_next_focus"
                     android:nextFocusUp="@id/home_preview_change_api"
-                    android:nextFocusDown="@id/home_watch_parent_item_title"
+                    android:nextFocusDown="@id/home_watch_child_recyclerview"
                     android:text="@string/home_info"
                     app:icon="@drawable/ic_outline_info_24" />
 
@@ -132,12 +133,14 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/home_preview_change_api2"
-            style="@style/BlackButton"
+            style="@style/RegularButtonTV"
             android:layout_width="wrap_content"
             android:layout_gravity="top|start"
             android:layout_marginStart="@dimen/navbar_width"
             android:backgroundTint="@color/semiWhite"
-            android:minWidth="150dp" />
+            android:minWidth="150dp"
+            android:nextFocusLeft="@id/nav_rail_view"
+            android:nextFocusDown="@id/home_watch_child_recyclerview" />
     </FrameLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index ebcd3e9f..ac7c4abd 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -172,4 +172,15 @@
         app:icon="@drawable/ic_baseline_filter_list_24"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/home_random"
+        style="@style/ExtendedFloatingActionButton"
+        android:layout_gravity="bottom|start"
+        android:text="@string/home_random"
+        android:textColor="?attr/textColor"
+        android:visibility="gone"
+        app:icon="@drawable/ic_baseline_play_arrow_24"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 347aaca5..a620b6ae 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -93,7 +93,7 @@
         </FrameLayout>
     </FrameLayout>
 
-    <FrameLayout
+   <!-- <FrameLayout
         android:id="@+id/player_torrent_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -127,5 +127,5 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/player_video_title"
             tools:text="17 seeders" />
-    </FrameLayout>
+    </FrameLayout>-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index 2a7607b9..07cbb3c3 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -78,6 +78,7 @@
                 app:tint="@android:color/white" />
 
             <ImageView
+                android:tag="@string/tv_no_focus_tag"
                 android:id="@+id/player_loading_go_back"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
@@ -92,7 +93,7 @@
         </FrameLayout>
     </FrameLayout>
 
-    <FrameLayout
+    <!--<FrameLayout
         android:id="@+id/player_torrent_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -126,5 +127,5 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/player_video_title"
             tools:text="17 seeders" />
-    </FrameLayout>
+    </FrameLayout>-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_plugins.xml b/app/src/main/res/layout/fragment_plugins.xml
index 40a0299c..c207b2c3 100644
--- a/app/src/main/res/layout/fragment_plugins.xml
+++ b/app/src/main/res/layout/fragment_plugins.xml
@@ -25,7 +25,7 @@
             app:titleTextColor="?attr/textColor"
             tools:title="Overlord" />
 
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include layout="@layout/tvtypes_chips_scroll" android:id="@+id/tvtypes_chips_scroll" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index a481ed6b..ee3477b0 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -277,7 +277,9 @@
                         android:layout_height="wrap_content"
                         android:descendantFocusability="blocksDescendants">
 
-                        <include layout="@layout/fragment_trailer" />
+                        <include
+                            android:id="@+id/fragment_trailer"
+                            layout="@layout/fragment_trailer" />
                     </FrameLayout>
 
                     <FrameLayout
@@ -601,89 +603,11 @@
                                     android:focusable="true"
                                     android:layout_width="match_parent" />-->
 
-                            <FrameLayout
-                                android:id="@+id/result_movie_progress_downloaded_holder"
+                            <com.lagradost.cloudstream3.ui.download.button.DownloadButton
+                                android:id="@+id/download_button"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_download_movie"
-                                    style="@style/BlackButton"
-
-                                    android:layout_width="match_parent"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="0dp"
-                                    android:clickable="true"
-                                    android:focusable="true"
-
-                                    android:nextFocusUp="@id/result_play_movie"
-                                    android:nextFocusDown="@id/result_season_button"
-                                    android:visibility="visible" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:orientation="horizontal">
-
-                                    <androidx.core.widget.ContentLoadingProgressBar
-                                        android:id="@+id/result_movie_progress_downloaded"
-                                        style="?android:attr/progressBarStyleHorizontal"
-                                        android:layout_width="25dp"
-                                        android:layout_height="25dp"
-                                        android:layout_gravity="end|center_vertical"
-                                        android:layout_margin="5dp"
-                                        android:background="@drawable/circle_shape"
-                                        android:indeterminate="false"
-                                        android:max="100"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:progress="30"
-                                        android:progressDrawable="@drawable/circular_progress_bar_filled"
-                                        android:visibility="visible" />
-
-                                    <ImageView
-                                        android:id="@+id/result_movie_download_icon"
-                                        android:layout_width="30dp"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center"
-                                        android:background="?selectableItemBackgroundBorderless"
-                                        android:contentDescription="@string/download"
-                                        android:src="@drawable/ic_baseline_play_arrow_24"
-                                        android:visibility="visible"
-                                        app:tint="?attr/white" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        tools:text="Downloading" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text_precentage"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        android:visibility="gone"
-                                        tools:text="68%" />
-                                </LinearLayout>
-                            </FrameLayout>
-
+                                android:layout_height="wrap_content"
+                                app:download_layout="@layout/download_button_layout" />
 
                             <!--<androidx.core.widget.ContentLoadingProgressBar
                                     android:layout_width="match_parent"
@@ -799,7 +723,6 @@
 
 
                         <LinearLayout
-                            android:id="@+id/result_episodes_tab"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_result_swipe.xml b/app/src/main/res/layout/fragment_result_swipe.xml
index 27729bf8..4e8e3c14 100644
--- a/app/src/main/res/layout/fragment_result_swipe.xml
+++ b/app/src/main/res/layout/fragment_result_swipe.xml
@@ -189,7 +189,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="start">
 
-                <include layout="@layout/result_sync"/>
+                <include layout="@layout/result_sync" android:id="@+id/result_sync"/>
             </FrameLayout>
 
             <FrameLayout
@@ -198,7 +198,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                <include layout="@layout/fragment_result" />
+                <include layout="@layout/fragment_result" android:id="@+id/fragment_result" />
 
             </FrameLayout>
 
@@ -209,7 +209,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="end">
 
-                <include layout="@layout/result_recommendations" />
+                <include layout="@layout/result_recommendations" android:id="@+id/result_recommendations" />
             </FrameLayout>
         </com.discord.panels.OverlappingPanelsLayout>
 
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 5eacdbe2..2fec04c6 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -1,4 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+https://developer.android.com/design/ui/tv/guides/foundations/navigation-on-tv
+1. Don't display a back button
+
+https://developer.android.com/design/ui/tv/guides/styles/layouts
+Two-pane layout
+or https://developer.android.com/design/ui/tv/guides/styles/layouts#layout-templates
+
+cast:
+https://developer.android.com/design/ui/tv/guides/components/cards#1:1
+
+https://developer.android.com/design/ui/tv/samples/jet-fit
+-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -88,6 +100,7 @@
             android:text="@string/reload_error"
             app:icon="@drawable/ic_baseline_autorenew_24" />
 
+        <!--
         <com.google.android.material.button.MaterialButton
             android:id="@+id/result_reload_connection_open_in_browser"
             style="@style/BlackButton"
@@ -99,6 +112,7 @@
             android:minWidth="200dp"
             android:text="@string/result_open_in_browser"
             app:icon="@drawable/ic_baseline_public_24" />
+            -->
 
         <TextView
             android:id="@+id/result_error_text"
@@ -110,545 +124,313 @@
             android:textColor="?attr/textColor" />
     </LinearLayout>
 
-    <LinearLayout
+
+    <FrameLayout
+        android:id="@+id/background_poster_holder"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:visibility="visible">
+
+        <ImageView
+            android:id="@+id/background_poster"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:layout_gravity="center"
+            android:alpha="0.8"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/profile_bg_dark_blue" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_gravity="bottom"
+            android:src="@drawable/background_shadow">
+
+        </ImageView>
+
+
+    </FrameLayout>
+
+
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/result_finish_loading"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:layout_height="wrap_content">
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/result_scroll"
+
+        <LinearLayout
             android:layout_width="match_parent"
-
             android:layout_height="wrap_content"
-            android:background="?attr/primaryGrayBackground">
+            android:orientation="vertical"
+            android:paddingStart="@dimen/result_padding"
+            android:paddingEnd="@dimen/result_padding">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/primaryBlackBackground"
-                android:orientation="vertical">
-
-                <com.facebook.shimmer.ShimmerFrameLayout
-                    android:id="@+id/result_trailer_loading"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    app:shimmer_auto_start="true"
-                    app:shimmer_base_alpha="0.2"
-                    app:shimmer_duration="@integer/loading_time"
-                    app:shimmer_highlight_alpha="0.3"
-                    tools:visibility="gone">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/result_padding"
-                        android:orientation="vertical">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="150dp"
-                            android:background="@color/grayShimmer"
-                            android:foreground="@drawable/outline_drawable"
-                            app:cardCornerRadius="@dimen/loading_radius" />
-                    </LinearLayout>
-                </com.facebook.shimmer.ShimmerFrameLayout>
-
-                <FrameLayout
-                    android:id="@+id/result_smallscreen_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:descendantFocusability="blocksDescendants">
-
-                    <include layout="@layout/fragment_trailer" />
-                </FrameLayout>
+                android:layout_height="wrap_content"
+                android:layout_marginTop="100dp"
+                android:orientation="horizontal">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:orientation="vertical"
-                    android:paddingStart="@dimen/result_padding"
-                    android:paddingEnd="@dimen/result_padding">
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:layout_weight="0"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/result_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:gravity="center_vertical"
+                        android:singleLine="true"
+                        android:textColor="?attr/textColor"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        tools:text="The Perfect Run The Perfect Run" />
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/result_next_airing_holder"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="15dp"
-                        android:orientation="horizontal"
-                        android:visibility="visible">
+                        android:layout_gravity="start"
+                        android:orientation="vertical">
 
-                        <LinearLayout
+                        <TextView
+                            android:id="@+id/result_episodes_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginEnd="20dp"
+                            android:textColor="?attr/textColor"
+                            android:textSize="17sp"
+                            android:textStyle="normal"
+                            android:visibility="gone"
+                            tools:text="8 Episodes" />
+
+                        <TextView
+                            android:id="@+id/result_next_airing"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:orientation="vertical">
 
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="30dp"
-                                android:layout_marginBottom="10dp"
-                                android:orientation="horizontal">
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="center"
+                            android:textColor="?attr/grayTextColor"
+                            android:textSize="17sp"
+                            android:textStyle="normal"
+                            tools:text="Episode 1022 will be released in" />
 
-                                <ImageView
-                                    android:id="@+id/result_back"
-                                    android:layout_width="30dp"
-                                    android:layout_height="30dp"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginEnd="10dp"
-                                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                                    android:clickable="true"
-                                    android:contentDescription="@string/go_back"
-                                    android:focusable="true"
-                                    android:gravity="center_vertical"
-                                    android:nextFocusDown="@id/result_description"
-                                    android:src="@drawable/ic_baseline_arrow_back_24"
-                                    app:tint="?attr/white" />
-
-                                <TextView
-                                    android:id="@+id/result_title"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="30dp"
-                                    android:layout_marginBottom="5dp"
-                                    android:gravity="center_vertical"
-                                    android:maxLines="1"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="20sp"
-                                    android:textStyle="bold"
-                                    tools:text="The Perfect Run The Perfect Run" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <androidx.cardview.widget.CardView
-                                    android:id="@+id/result_poster_holder"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginEnd="10dp"
-                                    app:cardCornerRadius="@dimen/rounded_image_radius">
-
-                                    <ImageView
-                                        android:id="@+id/result_poster"
-                                        android:layout_width="100dp"
-                                        android:layout_height="140dp"
-                                        android:layout_gravity="bottom"
-                                        android:contentDescription="@string/result_poster_img_des"
-                                        android:foreground="@drawable/outline_drawable"
-                                        android:scaleType="centerCrop"
-                                        tools:src="@drawable/example_poster" />
-                                </androidx.cardview.widget.CardView>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:orientation="vertical">
-
-                                    <com.lagradost.cloudstream3.widget.FlowLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        app:itemSpacing="10dp">
-
-                                        <com.google.android.material.button.MaterialButton
-                                            android:id="@+id/result_meta_site"
-                                            style="@style/SmallBlackButton"
-                                            android:layout_gravity="center_vertical"
-                                            tools:text="Gogoanime" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_type"
-                                            style="@style/ResultInfoText"
-                                            tools:text="Movie" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_year"
-                                            style="@style/ResultInfoText"
-                                            tools:text="2022" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_rating"
-                                            style="@style/ResultInfoText"
-                                            tools:text="Rated: 8.5/10.0" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_status"
-                                            style="@style/ResultInfoText"
-                                            tools:text="Ongoing" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_duration"
-                                            style="@style/ResultInfoText"
-                                            tools:text="121min" />
-                                    </com.lagradost.cloudstream3.widget.FlowLayout>
-                                    <!--
-                                    This has half margin and half padding to make TV focus on description look better.
-                                    The focus outline now settles between the poster and text.
-                                    -->
-                                    <TextView
-                                        android:id="@+id/result_description"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:ellipsize="end"
-                                        android:foreground="@drawable/outline_drawable"
-                                        android:maxLength="1000"
-                                        android:nextFocusUp="@id/result_back"
-                                        android:nextFocusDown="@id/result_play_movie"
-                                        android:padding="5dp"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
-                                </LinearLayout>
-                            </LinearLayout>
-
-
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/result_next_airing_time"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="start"
+                            android:textColor="?attr/textColor"
+                            android:textSize="17sp"
+                            android:textStyle="normal"
+                            tools:text="5d 3h 30m" />
                     </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/result_cast_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:ellipsize="end"
-                        android:maxLines="2"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="Cast: Joe Ligma" />
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/result_cast_items"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-
-                        android:descendantFocusability="afterDescendants"
-                        android:fadingEdge="horizontal"
-                        android:focusable="false"
-                        android:focusableInTouchMode="false"
-                        android:nextFocusUp="@id/result_back"
-                        android:nextFocusDown="@id/result_play_movie"
-                        android:orientation="horizontal"
-                        android:paddingTop="5dp"
-                        android:requiresFadingEdge="horizontal"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        tools:itemCount="2"
-                        tools:listitem="@layout/cast_item"
-                        tools:visibility="visible" />
-
-                    <TextView
-                        android:id="@+id/result_vpn"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="@string/vpn_torrent" />
-
-                    <TextView
-                        android:id="@+id/result_info"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="@string/provider_info_meta" />
-
-                    <TextView
-                        android:id="@+id/result_no_episodes"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="@string/no_episodes_found" />
-
-                    <TextView
-                        android:id="@+id/result_tag_holder"
+                    <LinearLayout
+                        android:id="@+id/result_movie_parent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="start"
                         android:layout_marginTop="10dp"
-                        android:layout_marginBottom="10dp"
-                        android:text="@string/result_tags"
-                        android:textColor="?attr/textColor"
-                        android:textSize="17sp"
-                        android:textStyle="normal"
-                        android:visibility="gone" />
+                        android:animateLayoutChanges="true"
+                        android:orientation="vertical"
+                        tools:visibility="visible">
 
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_play_movie"
+                            style="@style/ResultButtonTV"
+
+                            android:nextFocusRight="@id/result_description"
+                            android:nextFocusDown="@id/result_play_series"
+                            android:text="@string/play_movie_button"
+                            android:visibility="visible"
+                            app:icon="@drawable/ic_baseline_play_arrow_24" />
+
+                        <LinearLayout
+                            android:id="@+id/series_holder"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_series"
+                                style="@style/ResultButtonTV"
+
+                                android:nextFocusRight="@id/result_description"
+                                android:nextFocusUp="@id/result_play_movie"
+                                android:nextFocusDown="@id/result_resume_series"
+                                android:text="@string/play_episode"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24" />
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_resume_series"
+                                style="@style/ResultButtonTV"
+
+                                android:nextFocusRight="@id/result_description"
+                                android:nextFocusUp="@id/result_play_series"
+                                android:nextFocusDown="@id/result_play_trailer"
+                                android:text="@string/resume"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24" />
+                        </LinearLayout>
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_play_trailer"
+                            style="@style/ResultButtonTV"
+
+                            android:nextFocusRight="@id/result_description"
+                            android:nextFocusUp="@id/result_resume_series"
+                            android:nextFocusDown="@id/result_bookmark_button"
+                            android:text="@string/play_trailer_button"
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_baseline_play_arrow_24"
+                            tools:visibility="visible" />
+
+
+                        <!--  <com.lagradost.cloudstream3.ui.download.button.DownloadButton
+                              android:visibility="gone"
+                              android:id="@+id/download_button"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_weight="1"
+                              android:minWidth="250dp"
+                              app:download_layout="@layout/download_button_layout" />
+            -->
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_bookmark_button"
+                            style="@style/ResultButtonTV"
+                            android:nextFocusRight="@id/result_description"
+                            android:nextFocusUp="@id/result_play_trailer"
+                            android:nextFocusDown="@id/result_episodes_show"
+
+                            android:text="@string/type_none"
+                            android:visibility="visible"
+                            app:icon="@drawable/ic_baseline_bookmark_24" />
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_episodes_show"
+                            style="@style/ResultButtonTV"
+
+                            android:nextFocusRight="@id/redirect_to_episodes"
+                            android:nextFocusUp="@id/result_bookmark_button"
+                            android:nextFocusDown="@id/result_cast_items"
+
+                            android:text="@string/episodes"
+                            android:visibility="visible"
+                            app:icon="@drawable/ic_baseline_sort_24"
+                            tools:visibility="visible" />
+
+                        <View
+                            android:id="@+id/redirect_to_episodes"
+                            android:layout_width="1dp"
+                            android:layout_height="1dp"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true" />
+
+
+                        <View
+                            android:id="@+id/redirect_to_play"
+                            android:layout_width="1dp"
+                            android:layout_height="1dp"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/right_layout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/linearLayout2"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <com.lagradost.cloudstream3.widget.FlowLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:itemSpacing="10dp">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_meta_site"
+                            style="@style/SmallWhiteButton"
+                            android:layout_gravity="center_vertical"
+                            tools:text="Gogoanime" />
+
+                        <TextView
+                            android:id="@+id/result_meta_type"
+                            style="@style/ResultInfoText"
+                            tools:text="Movie" />
+
+                        <TextView
+                            android:id="@+id/result_meta_year"
+                            style="@style/ResultInfoText"
+                            tools:text="2022" />
+
+                        <TextView
+                            android:id="@+id/result_meta_rating"
+                            style="@style/ResultInfoText"
+                            tools:text="Rated: 8.5/10.0" />
+
+                        <TextView
+                            android:id="@+id/result_meta_status"
+                            style="@style/ResultInfoText"
+                            tools:text="Ongoing" />
+
+                        <TextView
+                            android:id="@+id/result_meta_duration"
+                            style="@style/ResultInfoText"
+                            tools:text="121min" />
+                    </com.lagradost.cloudstream3.widget.FlowLayout>
+
+
+                    <TextView
+                        android:id="@+id/result_description"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:fadingEdgeLength="30dp"
+                        android:foreground="@drawable/outline_drawable"
+                        android:maxLines="7"
+                        android:nextFocusUp="@id/result_back"
+                        android:nextFocusDown="@id/result_bookmark_button"
+                        android:padding="5dp"
+                        android:requiresFadingEdge="vertical"
+                        android:textColor="?attr/textColor"
+                        android:textSize="12sp"
+                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
 
                     <com.google.android.material.chip.ChipGroup
                         android:id="@+id/result_tag"
                         style="@style/ChipParent"
+
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                    <TextView
-                        android:id="@+id/result_coming_soon"
-                        android:layout_width="match_parent"
+                    <FrameLayout
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="50dp"
-                        android:text="@string/coming_soon"
-                        android:textColor="?attr/textColor"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:visibility="gone" />
-
-                    <LinearLayout
-                        android:id="@+id/result_data_holder"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/result_add_sync"
-                            style="@style/WhiteButton"
-                            android:layout_width="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="0dp"
-
-                            android:layout_marginBottom="10dp"
-                            android:text="@string/add_sync"
-                            android:visibility="gone"
-                            app:icon="@drawable/ic_baseline_add_24" />
-
-
-                        <LinearLayout
-                            android:id="@+id/result_movie_parent"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:animateLayoutChanges="true"
-                            android:orientation="horizontal"
-                            tools:visibility="visible">
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_play_movie"
-                                style="@style/WhiteButton"
-                                android:layout_width="wrap_content"
-
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_marginBottom="10dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusRight="@id/result_play_trailer"
-                                android:nextFocusUp="@id/result_cast_items"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-                                android:text="@string/play_movie_button"
-                                android:visibility="visible"
-                                app:icon="@drawable/ic_baseline_play_arrow_24">
-
-                            </com.google.android.material.button.MaterialButton>
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_play_trailer"
-                                style="@style/WhiteButton"
-                                android:layout_width="wrap_content"
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_marginBottom="10dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusUp="@id/result_cast_items"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-                                android:text="@string/play_trailer_button"
-                                android:visibility="gone"
-                                app:icon="@drawable/ic_baseline_play_arrow_24">
-
-                            </com.google.android.material.button.MaterialButton>
-
-                            <FrameLayout
-                                android:id="@+id/result_movie_progress_downloaded_holder"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="5dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusRight="@id/result_bookmark_button">
-
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_download_movie"
-                                    style="@style/BlackButton"
-                                    android:layout_width="match_parent"
-
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-
-                                    android:layout_marginEnd="0dp"
-                                    android:clickable="true"
-                                    android:focusable="true"
-                                    android:nextFocusLeft="@id/result_play_trailer"
-                                    android:nextFocusUp="@id/result_cast_items"
-                                    android:nextFocusDown="@id/result_resume_series_button_play"
-
-                                    android:visibility="visible" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:orientation="horizontal">
-
-                                    <androidx.core.widget.ContentLoadingProgressBar
-                                        android:id="@+id/result_movie_progress_downloaded"
-                                        style="?android:attr/progressBarStyleHorizontal"
-                                        android:layout_width="25dp"
-                                        android:layout_height="25dp"
-                                        android:layout_gravity="end|center_vertical"
-                                        android:layout_margin="5dp"
-                                        android:background="@drawable/circle_shape"
-                                        android:indeterminate="false"
-                                        android:max="100"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:progress="30"
-                                        android:progressDrawable="@drawable/circular_progress_bar_filled"
-                                        android:visibility="visible" />
-
-                                    <ImageView
-                                        android:id="@+id/result_movie_download_icon"
-                                        android:layout_width="30dp"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center"
-                                        android:background="?selectableItemBackgroundBorderless"
-                                        android:contentDescription="@string/download"
-                                        android:src="@drawable/ic_baseline_play_arrow_24"
-                                        android:visibility="visible"
-                                        app:tint="?attr/white" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        tools:text="Downloading" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text_precentage"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        android:visibility="gone"
-                                        tools:text="68%" />
-                                </LinearLayout>
-                            </FrameLayout>
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_bookmark_button"
-                                style="@style/BlackButton"
-
-                                android:layout_width="wrap_content"
-                                android:layout_marginStart="5dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_marginBottom="10dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusLeft="@id/result_movie_progress_downloaded_holder"
-                                android:nextFocusRight="@id/result_bookmark_button"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-                                android:text="@string/type_none"
-                                android:visibility="visible" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/result_resume_parent"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:orientation="vertical"
-                            android:visibility="gone"
-                            tools:visibility="visible">
-
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_next_series_button"
-                                style="@style/WhiteButton"
-                                android:layout_width="match_parent"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="0dp"
-                                android:layout_marginBottom="10dp"
-                                android:nextFocusUp="@id/result_bookmark_button"
-                                android:nextFocusDown="@id/result_download_movie"
-                                android:text="@string/next_episode"
-                                android:visibility="gone"
-                                app:icon="@drawable/cast_ic_mini_controller_skip_next" />
-
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <ImageView
-                                    android:id="@+id/result_resume_series_button_play"
-                                    android:layout_width="30dp"
-                                    android:layout_height="30dp"
-
-                                    android:layout_gravity="center"
-                                    android:background="?selectableItemBackgroundBorderless"
-                                    android:contentDescription="@string/download"
-
-                                    android:nextFocusUp="@id/result_play_movie"
-                                    android:nextFocusDown="@id/result_season_selection"
-                                    android:src="@drawable/ic_baseline_play_arrow_24"
-                                    android:visibility="visible"
-                                    app:tint="?attr/white" />
-
-
-                                <TextView
-                                    android:id="@+id/result_resume_series_title"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:paddingStart="10dp"
-                                    android:paddingEnd="10dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="bold"
-                                    tools:text="S1E1 Episode 1" />
-
-                                <TextView
-                                    android:id="@+id/result_resume_series_progress_text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="0"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:textColor="?attr/grayTextColor"
-                                    tools:ignore="RtlSymmetry"
-                                    tools:text="69m remaining" />
-                            </LinearLayout>
-
-                        </LinearLayout>
+                        android:visibility="gone">
 
                         <LinearLayout
                             android:id="@+id/result_resume_progress_holder"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
                             android:orientation="horizontal"
-                            android:paddingTop="10dp"
                             android:visibility="gone"
                             tools:visibility="visible">
 
@@ -661,202 +443,625 @@
                                 android:layout_weight="1"
                                 android:indeterminate="false"
                                 android:max="100"
+
+                                android:paddingEnd="10dp"
                                 android:progress="0"
                                 android:progressBackgroundTint="?attr/colorPrimary"
-                                android:visibility="visible"
+                                android:visibility="gone"
                                 tools:progress="50"
                                 tools:visibility="visible" />
 
+                            <TextView
+                                android:id="@+id/result_resume_series_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_weight="0"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:paddingEnd="5dp"
+                                android:textColor="?attr/grayTextColor"
+                                android:visibility="gone"
+                                tools:ignore="RtlSymmetry"
+                                tools:text="69m remaining" />
                         </LinearLayout>
 
+                    </FrameLayout>
+
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/result_cast_items"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:descendantFocusability="afterDescendants"
+
+                android:fadingEdge="horizontal"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:nextFocusUp="@id/result_episodes_show"
+                android:nextFocusDown="@id/result_recommendations_filter_selection"
+                android:orientation="horizontal"
+                android:paddingTop="5dp"
+                android:requiresFadingEdge="horizontal"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="2"
+                tools:listitem="@layout/cast_item"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/result_recommendations_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/result_recommendations_filter_selection"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:nextFocusUp="@id/result_cast_items"
+                    android:nextFocusDown="@id/result_recommendations_list"
+
+                    android:orientation="horizontal"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:itemCount="2"
+                    tools:listitem="@layout/result_selection" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:text="@string/recommended"
+                    android:textColor="?attr/textColor"
+                    android:textSize="17sp" />
+            </LinearLayout>
+
+            <com.lagradost.cloudstream3.ui.AutofitRecyclerView
+                android:id="@+id/result_recommendations_list"
+                android:layout_width="match_parent"
+
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusUp="@id/result_recommendations_filter_selection"
+                android:orientation="vertical"
+                app:spanCount="8"
+                tools:listitem="@layout/search_result_grid" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <ImageView
+        android:layout_gravity="end"
+        android:id="@+id/episodes_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:importantForAccessibility="no"
+        android:src="@drawable/episodes_shadow"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/episode_holder_tv"
+        android:layout_width="wrap_content"
+
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/result_padding"
+        android:paddingEnd="@dimen/result_padding"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:descendantFocusability="afterDescendants"
+            android:id="@+id/result_season_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:clipToPadding="false"
+            android:nextFocusLeft="@id/result_episodes_show"
+            android:nextFocusRight="@id/result_range_selection"
+            android:orientation="vertical"
+            android:paddingVertical="@dimen/result_padding"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/result_selection" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:descendantFocusability="afterDescendants"
+            android:id="@+id/result_range_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+
+            android:nextFocusLeft="@id/result_season_selection"
+            android:nextFocusRight="@id/result_dub_selection"
+            android:orientation="vertical"
+            android:paddingVertical="@dimen/result_padding"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/result_selection"
+            tools:visibility="visible" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:descendantFocusability="afterDescendants"
+            android:id="@+id/result_dub_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:clipToPadding="false"
+            android:nextFocusLeft="@id/result_range_selection"
+            android:nextFocusRight="@id/result_episodes"
+            android:orientation="vertical"
+            android:paddingVertical="@dimen/result_padding"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/result_selection" />
+
+
+        <!--<androidx.core.widget.ContentLoadingProgressBar
+                android:id="@+id/result_episode_loading"
+
+                style="@style/Widget.AppCompat.ProgressBar"
+                android:layout_gravity="center"
+                android:layout_width="50dp"
+                android:layout_height="50dp" />-->
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:descendantFocusability="afterDescendants"
+            android:id="@+id/result_episodes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:nextFocusLeft="@id/result_dub_selection"
+            android:nextFocusRight="@id/result_recommendations_filter_selection"
+            android:orientation="vertical"
+            android:paddingVertical="@dimen/result_padding"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/result_episode" />
+
+        <View
+            android:id="@+id/temporary_no_focus"
+            android:layout_width="1dp"
+            android:layout_height="1dp"
+            android:focusable="false"
+            android:nextFocusLeft="@id/temporary_no_focus"
+            android:nextFocusRight="@id/temporary_no_focus"
+            android:nextFocusUp="@id/temporary_no_focus"
+            android:nextFocusDown="@id/temporary_no_focus" />
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/result_padding"
+            android:paddingEnd="@dimen/result_padding"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="15dp"
+                android:orientation="horizontal"
+                android:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_marginBottom="10dp"
+                        android:orientation="horizontal">
+
+                        <!--
+                        <ImageView
+                            android:id="@+id/result_back"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginEnd="10dp"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/go_back"
+                            android:focusable="true"
+                            android:gravity="center_vertical"
+                            android:nextFocusDown="@id/result_play_movie"
+                            android:src="@drawable/ic_baseline_arrow_back_24"
+                            app:tint="?attr/white" />-->
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <!--
+
+                        <LinearLayout
+                            android:id="@+id/result_movie_parent"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:animateLayoutChanges="true"
+                            android:orientation="vertical"
+                            tools:visibility="visible">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_movie"
+                                style="@style/RegularButtonTV"
+                                android:layout_width="wrap_content"
+
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_back"
+                                android:nextFocusDown="@id/result_play_series"
+                                android:text="@string/play_movie_button"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24">
+
+                            </com.google.android.material.button.MaterialButton>
+
+                            <LinearLayout
+                                android:id="@+id/series_holder"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_play_series"
+                                    style="@style/RegularButtonTV"
+                                    android:layout_width="wrap_content"
+                                    android:layout_marginStart="0dp"
+
+                                    android:layout_marginEnd="5dp"
+                                    android:layout_marginBottom="10dp"
+                                    android:layout_weight="1"
+                                    android:minWidth="250dp"
+                                    android:nextFocusUp="@id/result_play_movie"
+                                    android:nextFocusDown="@id/result_resume_series"
+                                    android:text="@string/play_episode"
+                                    android:visibility="visible"
+                                    app:icon="@drawable/ic_baseline_play_arrow_24"
+                                    tools:visibility="gone" />
+
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_resume_series"
+                                    style="@style/RegularButtonTV"
+                                    android:layout_width="wrap_content"
+                                    android:layout_marginStart="0dp"
+
+                                    android:layout_marginEnd="5dp"
+                                    android:layout_marginBottom="10dp"
+                                    android:layout_weight="1"
+                                    android:minWidth="250dp"
+                                    android:nextFocusUp="@id/result_play_series"
+                                    android:nextFocusDown="@id/result_play_trailer"
+                                    android:text="@string/resume"
+                                    android:visibility="visible"
+                                    app:icon="@drawable/ic_baseline_play_arrow_24"
+                                    tools:visibility="gone" />
+
+                            </LinearLayout>
+
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_trailer"
+                                style="@style/RegularButtonTV"
+                                android:layout_width="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_resume_series"
+                                android:nextFocusDown="@id/result_bookmark_button"
+                                android:text="@string/play_trailer_button"
+                                android:visibility="gone"
+                                app:icon="@drawable/ic_baseline_play_arrow_24"
+                                tools:visibility="visible">
+
+                            </com.google.android.material.button.MaterialButton>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_bookmark_button"
+                                style="@style/RegularButtonTV"
+
+                                android:layout_width="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_play_trailer"
+                                android:nextFocusDown="@id/result_resume_series_button"
+                                android:text="@string/type_none"
+                                android:visibility="visible" />
+
+                            <LinearLayout
+                                android:id="@+id/result_resume_progress_holder"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="10dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone"
+                                tools:visibility="visible">
+
+                                <androidx.core.widget.ContentLoadingProgressBar
+                                    android:id="@+id/result_resume_series_progress"
+                                    style="?android:attr/progressBarStyleHorizontal"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="20dp"
+                                    android:layout_gravity="end|center_vertical"
+                                    android:layout_weight="1"
+                                    android:indeterminate="false"
+                                    android:max="100"
+                                    android:paddingEnd="10dp"
+                                    android:progress="0"
+                                    android:progressBackgroundTint="?attr/colorPrimary"
+                                    android:visibility="visible"
+                                    tools:progress="50"
+                                    tools:visibility="visible" />
+
+                                <TextView
+                                    android:id="@+id/result_resume_series_progress_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_weight="0"
+                                    android:gravity="center"
+                                    android:maxLines="1"
+                                    android:paddingEnd="5dp"
+                                    android:textColor="?attr/grayTextColor"
+                                    tools:ignore="RtlSymmetry"
+                                    tools:text="69m remaining" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+-->
+                        <androidx.cardview.widget.CardView
+                            android:id="@+id/result_poster_holder"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:visibility="gone"
+                            app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                            <ImageView
+                                android:id="@+id/result_poster"
+                                android:layout_width="100dp"
+                                android:layout_height="140dp"
+                                android:layout_gravity="bottom"
+                                android:contentDescription="@string/result_poster_img_des"
+                                android:foreground="@drawable/outline_drawable"
+                                android:scaleType="centerCrop"
+                                tools:src="@drawable/example_poster" />
+                        </androidx.cardview.widget.CardView>
+
+                        <!--
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                            <androidx.recyclerview.widget.RecyclerView
-                                android:id="@+id/result_season_selection"
-                                android:layout_width="wrap_content"
+                            <com.lagradost.cloudstream3.widget.FlowLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                app:itemSpacing="10dp">
 
-                                android:nextFocusUp="@id/result_resume_series_button_play"
-                                android:nextFocusDown="@id/result_range_selection"
-                                android:orientation="horizontal"
-                                android:paddingBottom="10dp"
-                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_selection" />
-
-                            <androidx.recyclerview.widget.RecyclerView
-                                android:id="@+id/result_range_selection"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusUp="@id/result_season_selection"
-                                android:nextFocusDown="@id/result_dub_selection"
-                                android:orientation="horizontal"
-                                android:paddingBottom="10dp"
-                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_selection" />
-
-                            <androidx.recyclerview.widget.RecyclerView
-                                android:id="@+id/result_dub_selection"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusUp="@id/result_range_selection"
-                                android:nextFocusDown="@id/result_episodes"
-                                android:orientation="horizontal"
-                                android:paddingBottom="10dp"
-                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_selection" />
-
-                            <LinearLayout
-                                android:id="@+id/result_next_airing_holder"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="start"
-                                android:layout_marginBottom="5dp"
-                                android:orientation="horizontal">
-
-                                <TextView
-                                    android:id="@+id/result_episodes_text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_meta_site"
+                                    style="@style/SmallBlackButton"
                                     android:layout_gravity="center_vertical"
-                                    android:layout_marginEnd="20dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="8 Episodes" />
+                                    tools:text="Gogoanime" />
 
                                 <TextView
-                                    android:id="@+id/result_next_airing"
-
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center"
-                                    android:textColor="?attr/grayTextColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="Episode 1022 will be released in" />
+                                    android:id="@+id/result_meta_type"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Movie" />
 
                                 <TextView
-                                    android:id="@+id/result_next_airing_time"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center"
-                                    android:paddingStart="5dp"
-                                    android:paddingEnd="5dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="5d 3h 30m" />
-                            </LinearLayout>
+                                    android:id="@+id/result_meta_year"
+                                    style="@style/ResultInfoText"
+                                    tools:text="2022" />
 
-                            <com.facebook.shimmer.ShimmerFrameLayout
-                                android:id="@+id/result_episode_loading"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center"
-                                android:layout_marginTop="15dp"
-                                android:orientation="vertical"
-                                app:shimmer_auto_start="true"
-                                app:shimmer_base_alpha="0.2"
-                                app:shimmer_duration="@integer/loading_time"
-                                app:shimmer_highlight_alpha="0.3"
-                                tools:visibility="gone">
+                                <TextView
+                                    android:id="@+id/result_meta_rating"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Rated: 8.5/10.0" />
 
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical">
+                                <TextView
+                                    android:id="@+id/result_meta_status"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Ongoing" />
 
-                                    <include layout="@layout/loading_episode" />
+                                <TextView
+                                    android:id="@+id/result_meta_duration"
+                                    style="@style/ResultInfoText"
+                                    tools:text="121min" />
+                            </com.lagradost.cloudstream3.widget.FlowLayout>
 
-                                    <include layout="@layout/loading_episode" />
-
-                                    <include layout="@layout/loading_episode" />
-
-                                    <include layout="@layout/loading_episode" />
-                                </LinearLayout>
-                            </com.facebook.shimmer.ShimmerFrameLayout>
-                            <!--<androidx.core.widget.ContentLoadingProgressBar
-                                    android:id="@+id/result_episode_loading"
-
-                                    style="@style/Widget.AppCompat.ProgressBar"
-                                    android:layout_gravity="center"
-                                    android:layout_width="50dp"
-                                    android:layout_height="50dp" />-->
-
-                            <androidx.recyclerview.widget.RecyclerView
-                                android:id="@+id/result_episodes"
+                            <TextView
+                                android:id="@+id/result_description"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:clipToPadding="false"
-                                android:nextFocusUp="@id/result_dub_selection"
-                                android:nextFocusDown="@id/result_recommendations_filter_selection"
-                                android:orientation="horizontal"
-                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_episode" />
-
-                            <View
-                                android:id="@+id/temporary_no_focus"
-                                android:layout_width="1dp"
-                                android:layout_height="1dp"
-                                android:focusable="false"
-                                android:nextFocusLeft="@id/temporary_no_focus"
-                                android:nextFocusRight="@id/temporary_no_focus"
-                                android:nextFocusUp="@id/temporary_no_focus"
-                                android:nextFocusDown="@id/temporary_no_focus" />
+                                android:ellipsize="end"
+                                android:fadingEdgeLength="30dp"
+                                android:foreground="@drawable/outline_drawable"
+                                android:maxLines="7"
+                                android:nextFocusUp="@id/result_back"
+                                android:nextFocusDown="@id/result_bookmark_button"
+                                android:padding="5dp"
+                                android:requiresFadingEdge="vertical"
+                                android:textColor="?attr/textColor"
+                                android:textSize="15sp"
+                                tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
                         </LinearLayout>
+                        -->
+                        <!--
+                                                    This has half margin and half padding to make TV focus on description look better.
+                                                    The focus outline now settles between the poster and text.
+                                                    -->
                     </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/result_cast_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="Cast: Joe Ligma" />
+
+            <TextView
+                android:id="@+id/result_vpn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="@string/vpn_torrent" />
+
+            <TextView
+                android:id="@+id/result_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="@string/provider_info_meta" />
+
+            <TextView
+                android:id="@+id/result_no_episodes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="@string/no_episodes_found" />
+
+
+            <TextView
+                android:id="@+id/result_coming_soon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:paddingTop="50dp"
+                android:text="@string/coming_soon"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/result_data_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/result_add_sync"
+                    style="@style/WhiteButton"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="0dp"
+
+                    android:layout_marginBottom="10dp"
+                    android:text="@string/add_sync"
+                    android:visibility="gone"
+                    app:icon="@drawable/ic_baseline_add_24" />
+
+
+                <!--<LinearLayout
+
+                    android:id="@+id/result_resume_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    tools:visibility="gone">
+
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/result_next_series_button"
+                        style="@style/WhiteButton"
+                        android:layout_width="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginEnd="0dp"
+                        android:layout_marginBottom="10dp"
+                        android:nextFocusUp="@id/result_bookmark_button"
+                        android:nextFocusDown="@id/result_download_movie"
+                        android:text="@string/next_episode"
+                        android:visibility="gone"
+                        app:icon="@drawable/cast_ic_mini_controller_skip_next" />
 
                     <LinearLayout
-                        android:id="@+id/result_recommendations_holder"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp">
+                        android:orientation="horizontal">
 
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/result_recommendations_filter_selection"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:nextFocusUp="@id/result_episodes"
+                        <ImageView
+                            android:id="@+id/result_resume_series_button"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+
+                            android:layout_gravity="center"
+                            android:background="?selectableItemBackgroundBorderless"
+                            android:contentDescription="@string/download"
+
+                            android:nextFocusUp="@id/result_play_movie"
+                            android:nextFocusDown="@id/result_season_selection"
+                            android:src="@drawable/ic_baseline_play_arrow_24"
+                            android:visibility="visible"
+                            app:tint="?attr/white" />
 
-                            android:nextFocusDown="@id/result_recommendations"
-                            android:orientation="horizontal"
-                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                            tools:itemCount="2"
-                            tools:listitem="@layout/result_selection" />
 
                         <TextView
+                            android:id="@+id/result_resume_series_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:gravity="center_vertical"
-                            android:text="@string/recommended"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="10dp"
                             android:textColor="?attr/textColor"
-                            android:textSize="17sp" />
+                            android:textSize="17sp"
+                            android:textStyle="bold"
+                            tools:text="S1E1 Episode 1" />
+
                     </LinearLayout>
 
-                    <com.lagradost.cloudstream3.ui.AutofitRecyclerView
-                        android:id="@+id/result_recommendations"
-                        android:layout_width="match_parent"
-
-                        android:layout_height="wrap_content"
-                        android:background="?attr/primaryBlackBackground"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
-                        android:nextFocusUp="@id/result_recommendations_filter_selection"
-                        android:orientation="vertical"
-                        app:spanCount="8"
-                        tools:listitem="@layout/search_result_grid" />
-                </LinearLayout>
-
+                </LinearLayout>-->
             </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index bed08570..83fd3919 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -88,7 +88,7 @@
                 app:tint="?attr/textColor" />
         </FrameLayout>
 
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include layout="@layout/tvtypes_chips_scroll" android:id="@+id/tvtypes_chips_scroll" />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
index 0a85a471..63c61393 100644
--- a/app/src/main/res/layout/fragment_search_tv.xml
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -89,7 +89,7 @@
                 app:tint="?attr/textColor" />
         </FrameLayout>
 
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include layout="@layout/tvtypes_chips_scroll" android:id="@+id/tvtypes_chips_scroll" />
     </LinearLayout>
 
 
@@ -122,18 +122,17 @@
         tools:listitem="@layout/homepage_parent" />
 
     <FrameLayout
+        android:background="?attr/primaryBlackBackground"
         android:id="@+id/search_history_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
         <androidx.recyclerview.widget.RecyclerView
-            android:paddingStart="@dimen/navbar_width"
+            android:layout_marginStart="@dimen/navbar_width"
             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:visibility="visible"
@@ -141,6 +140,7 @@
             tools:listitem="@layout/search_history_item" />
 
         <com.google.android.material.button.MaterialButton
+            android:layout_marginStart="@dimen/navbar_width"
             android:id="@+id/search_clear_call_history"
             style="@style/BlackButton"
             android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/home_result_grid_expanded.xml b/app/src/main/res/layout/home_result_grid_expanded.xml
index b697c1de..3c3804a5 100644
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@@ -7,7 +7,7 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/background_card"
+
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
@@ -16,13 +16,22 @@
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:cardElevation="0dp">
 
+    <ImageView
+        android:id="@+id/title_shadow"
+        android:visibility="gone"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:clickable="false"
+        android:focusable="false"
+        tools:ignore="ContentDescription" />
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <androidx.cardview.widget.CardView
-            android:id="@+id/image_holder"
+            android:id="@+id/background_card"
             android:layout_width="114dp"
             android:layout_height="180dp"
             android:elevation="10dp"
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index a4bb686c..1d2d1780 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -26,7 +26,7 @@
         android:layout_gravity="bottom"
         android:layout_width="match_parent"
         android:layout_height="60dp">
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include layout="@layout/tvtypes_chips_scroll" android:id="@+id/tvtypes_chips_scroll" />
         <LinearLayout
             android:id="@+id/apply_btt_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/library_viewpager_page.xml b/app/src/main/res/layout/library_viewpager_page.xml
index f69f68b5..7d278cff 100644
--- a/app/src/main/res/layout/library_viewpager_page.xml
+++ b/app/src/main/res/layout/library_viewpager_page.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <com.lagradost.cloudstream3.ui.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/page_recyclerview"
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 1ed0cd4b..5592f3a6 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -54,7 +54,6 @@
             android:background="@color/black_overlay" />
 
         <RelativeLayout
-            android:id="@+id/player_time_menu"
             android:layout_width="match_parent"
             android:layout_height="200dp"
             android:orientation="horizontal"
@@ -85,6 +84,33 @@
                 style="@style/SmallBlackButton"
                 android:text="@string/filler" />
         </FrameLayout>
+        <!-- atm this is useless, however it might be used for PIP one day? -->
+        <ImageView
+            android:visibility="gone"
+            android:id="@+id/player_fullscreen"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="20dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/baseline_fullscreen_24"
+            app:tint="@color/white" />
+        <FrameLayout
+            android:id="@+id/player_intro_play"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/player_open_source"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:visibility="gone"
+            android:importantForAccessibility="no" />
+
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_video_holder"
@@ -190,39 +216,6 @@
                 tools:visibility="visible" />
 
             <!-- This nested layout is necessary because of buffering and clicking-->
-            <FrameLayout
-                android:id="@+id/player_pause_play_holder_holder"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <FrameLayout
-                    android:id="@+id/player_pause_play_holder"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:ignore="uselessParent">
-
-                    <ImageView
-                        android:id="@+id/player_pause_play"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/video_tap_button"
-                        android:nextFocusLeft="@id/exo_rew"
-
-                        android:nextFocusRight="@id/exo_ffwd"
-
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-
-                        android:src="@drawable/netflix_pause"
-                        app:tint="@color/white"
-                        tools:ignore="ContentDescription" />
-                </FrameLayout>
-            </FrameLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/player_center_menu"
@@ -279,7 +272,32 @@
                         app:tint="@color/white"
                         tools:ignore="ContentDescription" />
                 </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/player_pause_play_holder_holder"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
+                    <ImageView
+                        android:id="@+id/player_pause_play"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_gravity="center"
+                        android:background="@drawable/video_tap_button"
+                        android:nextFocusLeft="@id/exo_rew"
+
+                        android:nextFocusRight="@id/exo_ffwd"
+
+                        android:nextFocusUp="@id/player_go_back"
+                        android:nextFocusDown="@id/player_lock"
+
+                        android:src="@drawable/netflix_pause"
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription" />
+                </FrameLayout>
                 <FrameLayout
                     android:id="@+id/player_ffwd_holder"
                     android:layout_width="0dp"
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 fed3e0e5..e9805d31 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -54,6 +54,146 @@
 
         </LinearLayout>
     -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:id="@+id/player_progressbar_left_holder"
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:alpha="1"
+                tools:visibility="visible">
+                <!--VERY hacky layout -->
+                <ImageView
+                    android:id="@+id/player_progressbar_left_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="220dp"
+                    android:src="@drawable/ic_baseline_volume_up_24"
+                    app:tint="@android:color/white"
+                    tools:ignore="ContentDescription">
+
+                </ImageView>
+
+                <ProgressBar
+                    android:id="@+id/player_progressbar_left"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="5dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginStart="40dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:progress="100"
+                    android:progressDrawable="@drawable/progress_drawable_vertical"
+                    tools:progress="30" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/player_progressbar_right_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:alpha="1"
+                tools:ignore="RtlHardcoded"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:id="@+id/player_progressbar_right_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="220dp"
+                    android:src="@drawable/ic_baseline_brightness_7_24"
+                    app:tint="@android:color/white"
+                    tools:ignore="ContentDescription">
+
+                </ImageView>
+
+                <ProgressBar
+                    android:id="@+id/player_progressbar_right"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="5dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginEnd="40dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:progress="100"
+                    android:progressDrawable="@drawable/progress_drawable_vertical" />
+            </RelativeLayout>
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/player_time_text"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:gravity="center"
+            android:shadowColor="@android:color/black"
+            android:shadowRadius="10.0"
+            android:textColor="@android:color/white"
+            android:textSize="30sp"
+            android:visibility="gone"
+            tools:text="+100"
+            tools:visibility="visible" />
+
+        <FrameLayout
+            android:id="@+id/player_pause_play_holder_holder"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <FrameLayout
+            android:id="@+id/player_intro_play"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/player_open_source"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:importantForAccessibility="no"
+            android:visibility="gone" />
+
+        <!-- atm this is useless, however it might be used for PIP one day? -->
+        <ImageView
+            android:id="@+id/player_fullscreen"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="20dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/baseline_fullscreen_24"
+            android:visibility="gone"
+            app:tint="@color/white" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_video_holder"
@@ -61,35 +201,73 @@
             android:layout_height="match_parent"
             android:padding="16dp">
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/skip_chapter_button"
+                style="@style/NiceButton"
+                android:layout_width="150dp"
+                android:layout_height="40dp"
+                android:layout_marginEnd="100dp"
+                android:backgroundTint="@color/skipOpTransparent"
+                android:maxLines="1"
+                android:nextFocusLeft="@id/player_pause_play"
+                android:nextFocusUp="@id/player_go_back"
+                android:nextFocusDown="@id/player_pause_play"
+                android:padding="10dp"
+                android:textColor="@color/white"
+                android:visibility="gone"
+                app:cornerRadius="@dimen/rounded_button_radius"
+                app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:strokeColor="@color/white"
+                app:strokeWidth="1dp"
+                tools:text="Skip Opening"
+                tools:visibility="visible" />
+
             <FrameLayout
                 android:id="@+id/player_top_holder"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/player_video_title"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="80dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginEnd="32dp"
-                    android:gravity="end"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    tools:text="Hello world" />
+                    android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/player_video_title_rez"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="80dp"
-                    android:layout_marginTop="40dp"
-                    android:layout_marginEnd="32dp"
-                    android:gravity="end"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    tools:text="1920x1080" />
+                    <TextView
+                        android:id="@+id/player_video_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        tools:text="Hello world" />
+
+                    <TextView
+                        android:id="@+id/player_video_title_rez"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
+                        tools:text="1920x1080" />
+
+                    <FrameLayout
+                        android:id="@+id/player_episode_filler_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:layout_marginTop="2dp">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_episode_filler"
+                            style="@style/SmallBlackButton"
+                            android:text="@string/filler" />
+                    </FrameLayout>
+                </LinearLayout>
 
                 <!-- Removed as it has no use anymore-->
                 <!--<androidx.mediarouter.app.MediaRouteButton
@@ -127,10 +305,113 @@
                         android:background="@drawable/video_tap_button_always_white"
                         android:clickable="true"
                         android:contentDescription="@string/go_back_img_des"
-                        android:focusable="true" />
+                        android:focusable="true"
+                        android:tag="@string/tv_no_focus_tag" />
                 </FrameLayout>
             </FrameLayout>
 
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/player_center_menu"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:layoutDirection="ltr"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible">
+
+                <FrameLayout
+                    android:id="@+id/player_rew_holder"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|start"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.5">
+
+                    <TextView
+                        android:id="@+id/exo_rew_text"
+                        android:layout_width="200dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="19sp"
+
+                        android:textStyle="bold"
+                        tools:text="10" />
+
+                    <ImageButton
+                        android:id="@id/exo_rew"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_gravity="center"
+
+                        android:background="@drawable/video_tap_button_skip"
+                        android:nextFocusLeft="@id/exo_rew"
+                        android:nextFocusUp="@id/player_go_back"
+                        android:nextFocusDown="@id/player_pause_play"
+                        android:padding="10dp"
+                        android:scaleType="fitCenter"
+                        android:scaleX="-1"
+                        android:src="@drawable/netflix_skip_forward"
+                        android:tintMode="src_in"
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:id="@+id/player_ffwd_holder"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.5">
+
+                    <TextView
+                        android:id="@+id/exo_ffwd_text"
+                        android:layout_width="200dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="19sp"
+                        android:textStyle="bold"
+                        tools:text="10" />
+
+                    <ImageButton
+                        android:id="@id/exo_ffwd"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_gravity="center"
+
+                        android:background="@drawable/video_tap_button_skip"
+                        android:nextFocusRight="@id/exo_rew"
+                        android:nextFocusUp="@id/player_go_back"
+                        android:nextFocusDown="@id/player_pause_play"
+                        android:padding="10dp"
+                        android:scaleType="fitCenter"
+                        android:src="@drawable/netflix_skip_forward"
+                        android:tintMode="src_in"
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription" />
+                </FrameLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
             <ProgressBar
                 android:id="@+id/player_buffering"
@@ -231,6 +512,7 @@
 
                     <ImageView
                         android:id="@+id/player_pause_play"
+
                         android:layout_width="30dp"
                         android:layout_height="30dp"
                         android:layout_gravity="center"
@@ -238,10 +520,11 @@
                         android:background="@drawable/video_tap_button"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-
+                        android:nextFocusUp="@id/skip_chapter_button"
+                        android:nextFocusDown="@id/player_skip_op"
                         android:src="@drawable/netflix_pause"
+
+                        android:tag="@string/tv_no_focus_tag"
                         app:tint="@color/player_button_tv"
                         tools:ignore="ContentDescription" />
 
@@ -304,12 +587,52 @@
                         android:layout_height="match_parent"
                         android:orientation="horizontal">
 
+                        <FrameLayout
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:visibility="gone">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/player_lock"
+                                style="@style/VideoButtonTV"
+                                android:nextFocusLeft="@id/player_skip_episode"
+
+                                android:nextFocusRight="@id/player_resize_btt"
+                                android:nextFocusUp="@id/player_pause_play"
+                                android:text="@string/video_lock"
+                                android:visibility="gone"
+                                app:icon="@drawable/video_locked" />
+                        </FrameLayout>
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_op"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_pause_play"
+                            android:nextFocusRight="@id/player_skip_episode"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_skip_episode"
+                            android:text="@string/video_skip_op"
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_episode"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_skip_op"
+
+                            android:nextFocusRight="@id/player_resize_btt"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_resize_btt"
+                            android:text="@string/next_episode"
+                            app:icon="@drawable/ic_baseline_skip_next_24" />
+
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/player_resize_btt"
                             style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_lock"
+                            android:nextFocusLeft="@id/player_skip_episode"
+
                             android:nextFocusRight="@id/player_speed_btt"
                             android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_speed_btt"
                             android:text="@string/video_aspect_ratio_resize"
                             app:icon="@drawable/ic_baseline_aspect_ratio_24" />
 
@@ -317,8 +640,10 @@
                             android:id="@+id/player_speed_btt"
                             style="@style/VideoButtonTV"
                             android:nextFocusLeft="@id/player_resize_btt"
+
                             android:nextFocusRight="@id/player_subtitle_offset_btt"
                             android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_subtitle_offset_btt"
                             app:icon="@drawable/ic_baseline_speed_24"
                             tools:text="Speed" />
 
@@ -327,6 +652,8 @@
                             style="@style/VideoButtonTV"
                             android:nextFocusLeft="@id/player_speed_btt"
                             android:nextFocusRight="@id/player_sources_btt"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_sources_btt"
                             android:text="@string/subtitle_offset"
 
                             android:visibility="gone"
@@ -339,6 +666,8 @@
                             android:nextFocusLeft="@id/player_subtitle_offset_btt"
                             android:nextFocusRight="@id/player_tracks_btt"
                             android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_tracks_btt"
+
                             android:text="@string/video_source"
                             app:icon="@drawable/ic_baseline_playlist_play_24" />
 
@@ -350,25 +679,6 @@
                             android:nextFocusUp="@id/player_pause_play"
                             android:text="@string/tracks"
                             app:icon="@drawable/ic_baseline_playlist_play_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_skip_op"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_sources_btt"
-                            android:nextFocusRight="@id/player_skip_episode"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:text="@string/video_skip_op"
-                            app:icon="@drawable/ic_baseline_fast_forward_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_skip_episode"
-                            style="@style/VideoButtonTV"
-
-                            android:nextFocusLeft="@id/player_skip_op"
-                            android:nextFocusRight="@id/player_lock"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:text="@string/next_episode"
-                            app:icon="@drawable/ic_baseline_skip_next_24" />
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
diff --git a/app/src/main/res/layout/player_episodes_large.xml b/app/src/main/res/layout/player_episodes_large.xml
index b1f815e4..47696563 100644
--- a/app/src/main/res/layout/player_episodes_large.xml
+++ b/app/src/main/res/layout/player_episodes_large.xml
@@ -40,7 +40,6 @@
             android:foreground="@drawable/outline_drawable">
 
         <ImageView
-                android:nextFocusLeft="@id/result_episode_download"
                 android:nextFocusRight="@id/episode_holder"
 
                 android:id="@+id/episode_poster"
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index 550b08d5..7351a41f 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -27,8 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_rowWeight="1"
                 android:layout_marginTop="10dp"
-                android:background="@drawable/outline_drawable_less"
-                android:foreground="?attr/selectableItemBackgroundBorderless"
+                android:foreground="@drawable/outline_drawable_forced"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -66,7 +65,7 @@
                 android:layout_height="match_parent"
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
-                android:listSelector="@drawable/outline_drawable_less"
+                android:listSelector="@drawable/outline_drawable_forced"
                 android:nextFocusLeft="@id/sort_subtitles"
                 android:nextFocusRight="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
@@ -95,8 +94,7 @@
                     android:layout_height="wrap_content"
                     android:layout_rowWeight="1"
                     android:layout_marginTop="10dp"
-                    android:background="@drawable/outline_drawable_less"
-                    android:foreground="?attr/selectableItemBackgroundBorderless"
+                    android:foreground="@drawable/outline_drawable_forced"
                     android:orientation="horizontal"
                     android:paddingTop="10dp"
                     android:paddingBottom="10dp">
@@ -140,7 +138,7 @@
                 android:layout_height="match_parent"
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
-                android:listSelector="@drawable/outline_drawable_less"
+                android:listSelector="@drawable/outline_drawable_forced"
                 android:nextFocusLeft="@id/sort_providers"
                 android:nextFocusRight="@id/cancel_btt"
                 android:requiresFadingEdge="vertical"
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index 127cbd34..80ff4bec 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:nextFocusRight="@id/result_episode_download"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/episode_holder"
 
-        android:id="@+id/episode_holder"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:layout_marginBottom="5dp"
 
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:layout_marginBottom="5dp">
+    android:nextFocusRight="@id/download_button"
+    app:cardBackgroundColor="@color/transparent"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
     <!--
         android:nextFocusLeft="@id/result_episode_download"
         -->
@@ -39,91 +39,63 @@
         </View>
     </LinearLayout>-->
     <androidx.core.widget.ContentLoadingProgressBar
-            android:layout_marginBottom="-1.5dp"
-            android:id="@+id/episode_progress"
-            android:progressTint="?attr/colorPrimary"
-            android:progressBackgroundTint="?attr/colorPrimary"
-            style="@android:style/Widget.Material.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            tools:progress="50"
-            android:layout_gravity="bottom"
-            android:layout_height="5dp" />
+        android:id="@+id/episode_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless">
 
         <ImageView
-                app:tint="?attr/textColor"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                android:id="@+id/episode_play"
-                android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/episode_play_img_des"
-                android:layout_height="match_parent"
-                android:layout_width="wrap_content" />
+            android:id="@+id/episode_play"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:contentDescription="@string/episode_play_img_des"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            app:tint="?attr/textColor" />
         <!--marquee_forever-->
         <com.google.android.material.button.MaterialButton
-                android:layout_gravity="center"
-                style="@style/SmallBlackButton"
-                android:text="@string/filler"
-                android:id="@+id/episode_filler" />
+            android:id="@+id/episode_filler"
+            style="@style/SmallWhiteButton"
+            android:layout_gravity="center"
+            android:text="@string/filler" />
 
         <TextView
-                android:id="@+id/episode_text"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="50dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                tools:text="Episode 1"
-                android:textColor="?attr/textColor"
+            android:id="@+id/episode_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="50dp"
+            android:ellipsize="marquee"
 
-                android:scrollHorizontally="true"
-                android:ellipsize="marquee"
+            android:gravity="center_vertical"
+            android:marqueeRepeatLimit="0"
 
-                android:marqueeRepeatLimit="0"
-                android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
 
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+            android:textColor="?attr/textColor"
+            tools:text="Episode 1" />
     </LinearLayout>
 
-    <FrameLayout
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
-
-        <androidx.core.widget.ContentLoadingProgressBar
-                android:layout_marginEnd="10dp"
-                android:layout_marginStart="10dp"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:id="@+id/result_episode_progress_downloaded"
-                android:indeterminate="false"
-                android:progressDrawable="@drawable/circular_progress_bar"
-                android:background="@drawable/circle_shape"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:max="100"
-                android:layout_margin="5dp"
-                android:layout_gravity="end|center_vertical"
-                android:progress="0"
-                android:visibility="visible" />
-
-        <!--
-        android:nextFocusRight="@id/episode_holder"-->
-        <ImageView
-                android:nextFocusLeft="@id/episode_holder"
-                app:tint="?attr/white"
-                android:id="@+id/result_episode_download"
-                android:visibility="visible"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="10dp"
-                android:layout_width="50dp"
-                android:background="?selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/download" />
-    </FrameLayout>
+    <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+        android:id="@+id/download_button"
+        android:layout_width="@dimen/download_size"
+        android:layout_height="@dimen/download_size"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginStart="-50dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="10dp" />
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index 0aeedeea..75292965 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -1,151 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusRight="@id/result_episode_download"
-        android:id="@+id/episode_holder_large"
+    android:id="@+id/episode_holder_large"
+    android:layout_width="wrap_content"
 
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="?attr/boxItemBackground"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="10dp"
+    android:nextFocusRight="@id/download_button"
+    app:cardBackgroundColor="?attr/boxItemBackground"
 
-        android:layout_marginBottom="10dp">
+    app:cardCornerRadius="@dimen/rounded_image_radius">
 
     <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:padding="10dp"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:id="@+id/episode_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:orientation="vertical"
+        android:padding="10dp">
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:layout_height="wrap_content">
+            android:id="@+id/episode_lin_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
             <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
             <androidx.cardview.widget.CardView
-                    android:layout_width="126dp"
-                    android:layout_height="72dp"
-                    android:foreground="@drawable/outline_drawable">
+                android:layout_width="126dp"
+                android:layout_height="72dp"
+                android:foreground="@drawable/outline_drawable">
 
                 <ImageView
-                        android:nextFocusRight="@id/result_episode_download"
+                    android:id="@+id/episode_poster"
 
-                        android:id="@+id/episode_poster"
-                        tools:src="@drawable/example_poster"
-                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/episode_poster_img_des"
 
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:nextFocusRight="@id/download_button"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
 
                 <ImageView
-                        android:src="@drawable/play_button"
-                        android:layout_gravity="center"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:contentDescription="@string/play_episode" />
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center"
+                    android:contentDescription="@string/play_episode"
+                    android:src="@drawable/play_button" />
 
                 <androidx.core.widget.ContentLoadingProgressBar
-                        android:layout_marginBottom="-1.5dp"
-                        android:id="@+id/episode_progress"
-                        android:progressTint="?attr/colorPrimary"
-                        android:progressBackgroundTint="?attr/colorPrimary"
-                        style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                        android:layout_width="match_parent"
-                        tools:progress="50"
-                        android:layout_gravity="bottom"
-                        android:layout_height="5dp" />
+                    android:id="@+id/episode_progress"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="5dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="-1.5dp"
+                    android:progressBackgroundTint="?attr/colorPrimary"
+                    android:progressTint="?attr/colorPrimary"
+                    tools:progress="50" />
             </androidx.cardview.widget.CardView>
 
             <LinearLayout
-                    android:layout_marginStart="15dp"
-                    android:orientation="vertical"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_marginEnd="50dp"
-                    android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="50dp"
+                android:orientation="vertical">
 
                 <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <com.google.android.material.button.MaterialButton
-                            android:layout_gravity="start"
-                            style="@style/SmallBlackButton"
-                            android:layout_marginEnd="10dp"
-                            android:text="@string/filler"
-                            android:id="@+id/episode_filler" />
+                        android:id="@+id/episode_filler"
+                        style="@style/SmallWhiteButton"
+                        android:layout_gravity="start"
+                        android:layout_marginEnd="10dp"
+                        android:text="@string/filler" />
 
                     <TextView
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/episode_text"
-                            tools:text="1. Jobless"
-                            android:textStyle="bold"
-                            android:textColor="?attr/textColor"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                        android:id="@+id/episode_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:textColor="?attr/textColor"
+                        android:textStyle="bold"
+                        tools:text="1. Jobless" />
                 </LinearLayout>
 
                 <TextView
-                        android:id="@+id/episode_rating"
-                        tools:text="Rated: 8.8"
-                        android:textColor="?attr/grayTextColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                    android:id="@+id/episode_rating"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/grayTextColor"
+                    tools:text="Rated: 8.8" />
             </LinearLayout>
 
-            <FrameLayout
-                    android:layout_marginStart="-50dp"
-                    android:layout_gravity="end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                <androidx.core.widget.ContentLoadingProgressBar
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginStart="10dp"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:id="@+id/result_episode_progress_downloaded"
-                        android:indeterminate="false"
-                        android:progressDrawable="@drawable/circular_progress_bar"
-                        android:background="@drawable/circle_shape"
-                        style="?android:attr/progressBarStyleHorizontal"
-                        android:max="100"
-                        android:layout_margin="5dp"
-                        android:layout_gravity="end|center_vertical"
-                        android:progress="0"
-                        android:visibility="visible" />
-
-                <ImageView
-                        android:nextFocusLeft="@id/episode_poster"
-                        android:id="@+id/result_episode_download"
-
-                        android:visibility="visible"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:padding="10dp"
-                        android:layout_width="50dp"
-                        android:background="?selectableItemBackgroundBorderless"
-                        android:src="@drawable/ic_baseline_play_arrow_24"
-                        android:contentDescription="@string/download"
-                        app:tint="?attr/white" />
-            </FrameLayout>
+            <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+                android:id="@+id/download_button"
+                android:layout_width="@dimen/download_size"
+                android:layout_height="@dimen/download_size"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginStart="-50dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:padding="10dp" />
         </LinearLayout>
 
         <TextView
-                android:maxLines="4"
-                android:ellipsize="end"
-                android:paddingTop="10dp"
-                android:paddingBottom="10dp"
-                android:id="@+id/episode_descript"
-                android:textColor="?attr/grayTextColor"
-                tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart."
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+            android:id="@+id/episode_descript"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="4"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:textColor="?attr/grayTextColor"
+            tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart." />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_large_tv.xml b/app/src/main/res/layout/result_episode_large_tv.xml
index 2222bd36..5a9dee30 100644
--- a/app/src/main/res/layout/result_episode_large_tv.xml
+++ b/app/src/main/res/layout/result_episode_large_tv.xml
@@ -3,7 +3,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusRight="@id/result_episode_download"
         android:id="@+id/episode_holder_large"
 
         android:layout_width="wrap_content"
@@ -74,7 +73,7 @@
 
                     <com.google.android.material.button.MaterialButton
                             android:layout_gravity="start"
-                            style="@style/SmallBlackButton"
+                            style="@style/SmallWhiteButton"
                             android:layout_marginEnd="10dp"
                             android:text="@string/filler"
                             android:id="@+id/episode_filler" />
diff --git a/app/src/main/res/layout/result_episode_tv.xml b/app/src/main/res/layout/result_episode_tv.xml
index 597aca08..53590b6b 100644
--- a/app/src/main/res/layout/result_episode_tv.xml
+++ b/app/src/main/res/layout/result_episode_tv.xml
@@ -2,7 +2,6 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
-        android:nextFocusRight="@id/result_episode_download"
 
         android:id="@+id/episode_holder"
         android:layout_width="wrap_content"
@@ -38,7 +37,7 @@
                 tools:visibility="visible"
                 android:gravity="center"
                 android:layout_gravity="center"
-                style="@style/SmallBlackButton"
+                style="@style/SmallWhiteButton"
                 android:text="@string/filler"
                 android:id="@+id/episode_filler" />
 
diff --git a/app/src/main/res/layout/result_recommendations.xml b/app/src/main/res/layout/result_recommendations.xml
index 1585960a..38d00b3d 100644
--- a/app/src/main/res/layout/result_recommendations.xml
+++ b/app/src/main/res/layout/result_recommendations.xml
@@ -20,7 +20,7 @@
                 android:layout_marginBottom="10dp"
                 android:layout_marginStart="0dp"
                 android:layout_marginEnd="0dp"
-                app:layout_constraintBottom_toTopOf="@id/result_recommendations" />
+                app:layout_constraintBottom_toTopOf="@id/result_recommendations_list" />
 
         <com.lagradost.cloudstream3.ui.AutofitRecyclerView
                 android:descendantFocusability="afterDescendants"
@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:clipToPadding="false"
                 app:spanCount="3"
-                android:id="@+id/result_recommendations"
+                android:id="@+id/result_recommendations_list"
                 tools:listitem="@layout/search_result_grid"
                 android:orientation="vertical" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/result_selection.xml b/app/src/main/res/layout/result_selection.xml
index fe880dc9..925c65c9 100644
--- a/app/src/main/res/layout/result_selection.xml
+++ b/app/src/main/res/layout/result_selection.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--style="@style/SelectableButton"-->
+
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/SelectableButton"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="10dp"
-        tools:text="Season 1" />
\ No newline at end of file
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/RegularButtonTV"
+    android:layout_gravity="start"
+    android:layout_margin="2dp"
+    android:minWidth="115dp"
+    android:singleLine="true"
+    tools:text="1000-1000" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_history_item.xml b/app/src/main/res/layout/search_history_item.xml
index ef441234..3e9ee833 100644
--- a/app/src/main/res/layout/search_history_item.xml
+++ b/app/src/main/res/layout/search_history_item.xml
@@ -6,10 +6,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/outline_drawable_less"
-    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+
     android:nextFocusRight="@id/home_history_remove"
     android:orientation="horizontal">
-
+    <!-- android:foreground="?android:attr/selectableItemBackgroundBorderless"
+      -->
     <TextView
         android:id="@+id/home_history_title"
         android:layout_width="wrap_content"
@@ -29,7 +30,6 @@
         android:layout_gravity="center_vertical|end"
 
         android:background="@drawable/outline_drawable_less"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
 
         android:nextFocusLeft="@id/home_history_tab"
         android:padding="10dp"
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index f3c35ca4..cec7d4ce 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_result_root"
@@ -75,6 +75,12 @@
                 style="@style/SubButton"
                 android:layout_gravity="end" />
 
+            <TextView
+                android:id="@+id/text_rating"
+                style="@style/RatingButton"
+                android:layout_gravity="end"
+
+                tools:text="7.7" />
             <TextView
                 android:id="@+id/text_flag"
                 style="@style/SearchBox"
@@ -85,6 +91,18 @@
                 tools:text="🇸🇪"
                 tools:visibility="visible" />
         </LinearLayout>
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/watchProgress"
+            style="@android:style/Widget.Material.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="-1.5dp"
+            android:progressBackgroundTint="?attr/colorPrimary"
+            android:progressTint="?attr/colorPrimary"
+            android:visibility="gone"
+            tools:progress="50"
+            tools:visibility="visible" />
     </androidx.cardview.widget.CardView>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index cf6ab3b2..c64486b4 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -58,29 +58,12 @@
                     style="@style/SubButton"
                     android:layout_gravity="end" />
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/text_rating_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+
+                <TextView
+                    android:id="@+id/text_rating"
+                    style="@style/RatingButton"
                     android:layout_gravity="end"
-                    android:layout_margin="2dp"
-                    android:backgroundTint="@color/ratingColorBg"
-                    android:elevation="0dp"
-                    android:visibility="gone"
-                    app:cardCornerRadius="@dimen/rounded_image_radius"
-                    app:cardElevation="0dp"
-                    tools:visibility="visible">
-
-                    <TextView
-                        android:id="@+id/text_rating"
-                        style="@style/SearchBox"
-                        android:layout_margin="0dp"
-                        android:minWidth="40dp"
-                        android:textColor="@color/ratingColor"
-
-                        tools:text="★ 7.7" />
-                </androidx.cardview.widget.CardView>
-
+                    tools:text="7.7" />
 
                 <TextView
                     android:id="@+id/text_flag"
@@ -93,6 +76,15 @@
                     tools:visibility="visible" />
             </LinearLayout>
 
+            <ImageView
+                android:focusable="false"
+                android:visibility="gone"
+                android:clickable="false"
+                android:focusableInTouchMode="false"
+                android:id="@+id/title_shadow"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                tools:ignore="ContentDescription" />
 
             <androidx.core.widget.ContentLoadingProgressBar
                 android:id="@+id/watchProgress"
diff --git a/app/src/main/res/layout/sort_bottom_footer_add_choice.xml b/app/src/main/res/layout/sort_bottom_footer_add_choice.xml
index 82937ba1..63d79227 100644
--- a/app/src/main/res/layout/sort_bottom_footer_add_choice.xml
+++ b/app/src/main/res/layout/sort_bottom_footer_add_choice.xml
@@ -4,5 +4,6 @@
         style="@style/CheckLabel"
         android:id="@android:id/text1"
         tools:text="hello"
+        android:foreground="@drawable/outline_drawable_forced"
         app:drawableStartCompat="@drawable/ic_baseline_add_24"
         app:drawableTint="?attr/textColor" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml b/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml
index 0938ad1f..a9b8bde9 100644
--- a/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml
+++ b/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml
@@ -14,9 +14,9 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/NoCheckLabel"
-        tools:text="hello"
-        android:textStyle="normal"
-        android:textColor="?attr/textColor"
-        android:id="@android:id/text1" />
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="@style/NoCheckLabel"
+    android:textColor="?attr/textColor"
+    android:textStyle="normal"
+    tools:text="hello" />
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 0488f1f3..736d114c 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -75,11 +75,123 @@
             android:src="@drawable/play_button" />
     </FrameLayout>
 
+    <FrameLayout
+        android:id="@+id/player_top_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="80dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="32dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/player_video_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                tools:text="Hello world" />
+
+            <TextView
+                android:id="@+id/player_video_title_rez"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                tools:text="1920x1080" />
+
+            <FrameLayout
+                android:id="@+id/player_episode_filler_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="2dp"
+                android:visibility="gone">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/player_episode_filler"
+                    style="@style/SmallBlackButton"
+                    android:text="@string/filler" />
+            </FrameLayout>
+        </LinearLayout>
+
+        <!-- Removed as it has no use anymore-->
+        <!--<androidx.mediarouter.app.MediaRouteButton
+                android:id="@+id/player_media_route_button"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_gravity="end"
+                android:layout_margin="5dp"
+                android:mediaRouteTypes="user"
+                android:visibility="visible"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />-->
+
+        <FrameLayout
+            android:id="@+id/player_go_back_holder"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="5dp"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/go_back_img_des"
+                android:src="@drawable/ic_baseline_arrow_back_24"
+                app:tint="@android:color/white" />
+
+            <ImageView
+                android:id="@+id/player_go_back"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_gravity="center"
+                android:background="@drawable/video_tap_button_always_white"
+                android:clickable="true"
+                android:contentDescription="@string/go_back_img_des"
+                android:focusable="true" />
+        </FrameLayout>
+    </FrameLayout>
+
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/player_video_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/skip_chapter_button"
+            style="@style/NiceButton"
+            android:layout_width="150dp"
+            android:layout_height="40dp"
+            android:layout_marginEnd="100dp"
+            android:backgroundTint="@color/skipOpTransparent"
+            android:maxLines="1"
+            android:padding="10dp"
+            android:textColor="@color/white"
+            android:visibility="gone"
+            app:cornerRadius="@dimen/rounded_button_radius"
+            app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:strokeColor="@color/white"
+            app:strokeWidth="1dp"
+            tools:text="Skip Opening"
+            tools:visibility="visible" />
+
         <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
         <ProgressBar
             android:id="@+id/player_buffering"
@@ -99,40 +211,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible" />
 
-        <!-- This nested layout is necessary because of buffering and clicking-->
-        <FrameLayout
-            android:id="@+id/player_pause_play_holder_holder"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
 
-            <FrameLayout
-                android:id="@+id/player_pause_play_holder"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:ignore="uselessParent">
-
-                <ImageView
-                    android:id="@+id/player_pause_play"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/video_tap_button"
-                    android:nextFocusLeft="@id/exo_rew"
-
-                    android:nextFocusRight="@id/exo_ffwd"
-
-                    android:nextFocusUp="@id/player_go_back"
-                    android:nextFocusDown="@id/player_lock"
-
-                    android:src="@drawable/netflix_pause"
-                    app:tint="@color/white"
-                    tools:ignore="ContentDescription" />
-            </FrameLayout>
-        </FrameLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_center_menu"
@@ -188,7 +267,33 @@
                     app:tint="@color/white"
                     tools:ignore="ContentDescription" />
             </FrameLayout>
+            <!-- This nested layout is necessary because of buffering and clicking-->
+            <FrameLayout
+                android:id="@+id/player_pause_play_holder_holder"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
+                <ImageView
+                    android:id="@+id/player_pause_play"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button"
+                    android:nextFocusLeft="@id/exo_rew"
+
+                    android:nextFocusRight="@id/exo_ffwd"
+
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
+
+                    android:src="@drawable/netflix_pause"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
+            </FrameLayout>
             <FrameLayout
                 android:id="@+id/player_ffwd_holder"
                 android:layout_width="0dp"
@@ -289,6 +394,11 @@
                 tools:ignore="ContentDescription" />
         </LinearLayout>
 
+        <FrameLayout
+            android:id="@+id/piphide"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
         <ImageView
             android:id="@+id/player_open_source"
             android:layout_width="24dp"
@@ -373,7 +483,110 @@
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:src="@drawable/baseline_fullscreen_24"
                 app:tint="@color/white" />
+
+            <HorizontalScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="60dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/player_lock"
+                        style="@style/VideoButton"
+                        android:nextFocusLeft="@id/player_skip_episode"
+                        android:nextFocusRight="@id/player_resize_btt"
+                        android:text="@string/video_lock"
+                        app:icon="@drawable/video_locked"
+
+                        app:iconSize="30dp" />
+
+                    <LinearLayout
+                        android:id="@+id/player_lock_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_resize_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_lock"
+
+                            android:nextFocusRight="@id/player_speed_btt"
+                            android:text="@string/video_aspect_ratio_resize"
+                            app:icon="@drawable/ic_baseline_aspect_ratio_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_speed_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_resize_btt"
+
+                            android:nextFocusRight="@id/player_subtitle_offset_btt"
+                            app:icon="@drawable/ic_baseline_speed_24"
+                            tools:text="Speed" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_subtitle_offset_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_speed_btt"
+                            android:nextFocusRight="@id/player_sources_btt"
+                            android:text="@string/subtitle_offset"
+
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_outline_subtitles_24"
+                            tools:visibility="visible" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_sources_btt"
+                            style="@style/VideoButton"
+                            android:layout_height="40dp"
+
+                            android:nextFocusLeft="@id/player_subtitle_offset_btt"
+                            android:nextFocusRight="@id/player_tracks_btt"
+                            android:text="@string/video_source"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_tracks_btt"
+                            style="@style/VideoButton"
+                            android:layout_height="40dp"
+
+                            android:nextFocusLeft="@id/player_sources_btt"
+                            android:nextFocusRight="@id/player_skip_op"
+                            android:text="@string/tracks"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_op"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_sources_btt"
+
+                            android:nextFocusRight="@id/player_skip_episode"
+                            android:text="@string/video_skip_op"
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_episode"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_skip_op"
+
+                            android:nextFocusRight="@id/player_lock"
+                            android:text="@string/next_episode"
+                            app:icon="@drawable/ic_baseline_skip_next_24" />
+                    </LinearLayout>
+                </LinearLayout>
+            </HorizontalScrollView>
+
         </LinearLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/tvtypes_chips_scroll.xml b/app/src/main/res/layout/tvtypes_chips_scroll.xml
index 45b27dbc..66c7efda 100644
--- a/app/src/main/res/layout/tvtypes_chips_scroll.xml
+++ b/app/src/main/res/layout/tvtypes_chips_scroll.xml
@@ -6,5 +6,5 @@
     android:requiresFadingEdge="horizontal"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <include layout="@layout/tvtypes_chips" />
+    <include layout="@layout/tvtypes_chips" android:id="@+id/tvtypes_chips" />
 </HorizontalScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index e59f670e..6d0a94fb 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -436,7 +436,7 @@
 
     <fragment
         android:id="@+id/navigation_results_phone"
-        android:name="com.lagradost.cloudstream3.ui.result.ResultFragmentPhone"
+        android:name="com.lagradost.cloudstream3.ui.result.ResultTrailerPlayer"
         android:layout_height="match_parent"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c423b239..40d445ae 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -55,7 +55,7 @@
     <string name="download_failed">فشل التنزيل</string>
     <string name="download_canceled">تم إلغاء التنزيل</string>
     <string name="download_done">تم التنزيل</string>
-    <string name="stream">تشغيل</string>
+    <string name="stream">بث</string>
     <string name="error_loading_links_toast">خطأ في تحميل الرابط</string>
     <string name="download_storage_text">التخزين الداخلي</string>
     <string name="app_dubbed_text">مدبلج</string>
@@ -71,7 +71,7 @@
     <string name="home_info">معلومات</string>
     <string name="filter_bookmarks">تصفية الاشارات المرجعية</string>
     <string name="error_bookmarks_text">إشارات مرجعية</string>
-    <string name="action_remove_from_bookmarks">حذف</string>
+    <string name="action_remove_from_bookmarks">ازالة</string>
     <string name="action_add_to_bookmarks">إعداد حالة المشاهدة</string>
     <string name="sort_apply">تطبيق</string>
     <string name="sort_cancel">إلغاء</string>
@@ -578,4 +578,5 @@
 \nملاحظة: إذا كان المجموع 10 أو أكثر ، فسيتخطى المشغل التحميل تلقائيًا عند تحميل هذا الرابط!</string>
     <string name="qualities">النوعيات</string>
     <string name="profile_background_des">خلفية الملف الشخصي</string>
+    <string name="unable_to_inflate">تعذر إنشاء واجهة المستخدم بشكل صحيح ، وهذا خطأ كبير ويجب الإبلاغ عنه على الفور %s</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0543a94e..d76aa94b 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -29,7 +29,7 @@
     <string name="search_hint">Търсене…</string>
     <string formatted="true" name="search_hint_site">Търси %s…</string>
     <string name="no_data">Няма данни</string>
-    <string name="episode_more_options_des">Още опций</string>
+    <string name="episode_more_options_des">Още опции</string>
     <string name="next_episode">Следващ епизод</string>
     <string name="result_tags">Жанрове</string>
     <string name="result_share">Сподели</string>
@@ -124,16 +124,16 @@
     <string name="eigengraumode_settings">Режим Eigengravy (промяна скорост на възпроизвеждане)</string>
     <string name="eigengraumode_settings_des">Добавя опция за скорост в плейъра</string>
     <string name="swipe_to_seek_settings">Плъзнете за преместване</string>
-    <string name="swipe_to_seek_settings_des">Плъзнете наляво или надясно, за да контролирате времето във видеоплейъра</string>
+    <string name="swipe_to_seek_settings_des">Плъзнете пръст от една страна на друга, за да контролирате позицията си във видеоклип</string>
     <string name="swipe_to_change_settings">Плъзнете, за да промените настройките</string>
-    <string name="swipe_to_change_settings_des">Плъзнете наляво или надясно, за да промените яркостта или силата на звука</string>
+    <string name="swipe_to_change_settings_des">Плъзнете нагоре или надолу от лявата или дясната страна, за да промените яркостта или силата на звука</string>
     <string name="autoplay_next_settings">Автоматично пускане на следващ епизод</string>
     <string name="autoplay_next_settings_des">Започнете следващия епизод, когато текущият приключи</string>
     <string name="double_tap_to_seek_settings">Докоснете двукратно за превъртане</string>
     <string name="double_tap_to_pause_settings">Докоснете два пъти за пауза</string>
-    <string name="double_tap_to_seek_amount_settings">Размер на превъртане</string>
+    <string name="double_tap_to_seek_amount_settings">Размер на превъртане (секунди)</string>
     <string name="double_tap_to_seek_settings_des">Докоснете два пъти от дясната или лявата страна, за да превъртите напред или назад</string>
-    <string name="double_tap_to_pause_settings_des">Докоснете в средата, за да направите пауза</string>
+    <string name="double_tap_to_pause_settings_des">Докоснете два пъти в средата, за да поставите на пауза</string>
     <string name="use_system_brightness_settings">Използвайте яркостта на системата</string>
     <string name="use_system_brightness_settings_des">Използвайте системна яркост в плейъра на приложението вместо тъмно наслагване</string>
     <string name="episode_sync_settings">Актуализирайте прогреса на гледане</string>
@@ -497,4 +497,12 @@
     <string name="delayed_update_notice">Приложението ще се актуализира при изход от него</string>
     <string name="update_started">Започна Актуализация</string>
     <string name="action_remove_from_watched">Премахване от гледани</string>
+    <string name="search_poster_img_des">Постер</string>
+    <string name="browser">Браузър</string>
+    <string name="test_log">Регистър</string>
+    <string name="test_passed">Преминато</string>
+    <string name="test_failed">Неуспешен</string>
+    <string name="library">Библиотека</string>
+    <string name="watch_quality_pref_data">Предпочитано качество за гледане (Мобилни данни)</string>
+    <string name="start">Начало</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cc9f0ad4..db9398ca 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -570,4 +570,5 @@
 \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>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 5e02924f..c24c0971 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -7,7 +7,7 @@
     <string name="title_settings">Ρυθμίσεις</string>
     <string name="play_with_app_name">Άνοιγμα με CloudStream</string>
     <string name="search_hint">Αναζήτηση…</string>
-    <string name="search_poster_img_des">Πόστερ</string>
+    <string name="search_poster_img_des">Αφίσα</string>
     <string name="no_data">Χωρίς δεδομένα</string>
     <string name="episode_more_options_des">Περισσότερες Επιλογές</string>
     <string name="go_back_img_des">Πίσω</string>
@@ -96,9 +96,9 @@
     <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Προσθέτει την επιλογή ταχύτητας στο πρόγραμμα αναπαραγωγής</string>
     <string name="swipe_to_seek_settings">Σύρετε για αναζήτηση</string>
-    <string name="swipe_to_seek_settings_des">Σύρετε αριστερά ή δεξιά για να ελέγξετε τον χρόνο στην μπάρα του προγράμματος αναπαραγωγής</string>
+    <string name="swipe_to_seek_settings_des">Σύρετε από πλευρά σε πλευρά για να ελέγξετε το σημείο του βίντεο στο οποίο βρίσκεστε</string>
     <string name="swipe_to_change_settings">Σύρετε για να αλλάξετε ρυθμίσεις</string>
-    <string name="swipe_to_change_settings_des">Σύρετε αριστερά ή δεξιά για να αλλάξετε τη φωτεινότητα ή την ένταση</string>
+    <string name="swipe_to_change_settings_des">Σύρετε πάνω ή κάτω στην αριστερή ή στη δεξιά μεριά της οθόνης για να αλλάξετε τη φωτεινότητα ή την ένταση</string>
     <string name="double_tap_to_seek_settings">Διπλό πάτημα για αναζήτηση</string>
     <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για αναζήτηση προς τα μπροστά ή πίσω</string>
     <string name="search">Αναζήτηση</string>
@@ -108,7 +108,7 @@
     <string name="bug_report_settings_off">Αποστέλλει δεδομένα μόνο για καταρρεύσεις</string>
     <string name="bug_report_settings_on">Δεν στέλνει δεδομένα</string>
     <string name="updates_settings">Εμφάνιση ενημερώσεων</string>
-    <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων</string>
+    <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων κατά την εκκίνηση της εφαρμογής.</string>
     <string name="uprereleases_settings">Ενημέρωση σε προ-εκδόσεις (beta)</string>
     <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων (beta) αντί για σταθερές εκδόσεις (stable)</string>
     <string name="github">GitHub</string>
@@ -121,7 +121,7 @@
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
     <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση!
 \n%s -&gt; %s</string>
-    <string name="double_tap_to_pause_settings_des">Πάτημα στη μέση για παύση</string>
+    <string name="double_tap_to_pause_settings_des">Πατήστε δύο φορές στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
     <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής, αντί εφαρμογής προεπιλεγμένου σκούρου επικαλύμματος</string>
     <string name="episode_sync_settings">Ενημέρωση προόδου παρακολούθησης</string>
@@ -390,7 +390,7 @@
     <string name="action_open_play">@string/home_play</string>
     <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
     <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
-    <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής</string>
+    <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής (σε δευτερόλεπτα)</string>
     <string name="automatic_plugin_updates">Αυτόματη ενημέρωση plugin</string>
     <string name="automatic_plugin_download">Αυτόματη λήψη plugin</string>
     <string name="dns_pref">DNS μέσω HTTPS</string>
@@ -464,7 +464,7 @@
     <string name="pref_category_defaults">Προεπιλεγμένα</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subs_font_size">Μέγεθος γραμματοσειράς</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">Άνιμε</string>
     <string name="pref_category_links">Σύνδεσμοι</string>
     <string name="pref_category_looks">Εμφάνιση</string>
     <string name="pref_category_ui_features">Χαρακτηριστικά</string>
@@ -508,4 +508,8 @@
 \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>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bc830084..ac757b15 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -546,4 +546,5 @@
     <string name="use">Usar</string>
     <string name="qualities">Calidades</string>
     <string name="profile_background_des">Perfil del fondo</string>
+    <string name="unable_to_inflate">La interfaz de usuario no se ha podido crear correctamente, se trata de un GRAN BUG y debe ser reportado inmediatamente %s</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 00000000..8386188c
--- /dev/null
+++ b/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="home_main_poster_img_des">Póster Principal</string>
+    <string name="home_next_random_img_des">Seguinte ó azar</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="cast_format" formatted="true">Elenco: %s</string>
+    <string name="next_episode_format" formatted="true">O episodio %d se lanzará en</string>
+    <string name="result_poster_img_des">Póster</string>
+    <string name="search_poster_img_des">Cartel</string>
+    <string name="episode_poster_img_des">Póster do Episodio</string>
+    <string name="go_back_img_des">Regresar</string>
+    <string name="home_change_provider_img_des">Cambiar provedor</string>
+</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 722352a6..f27b12fe 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -193,7 +193,7 @@
     <string name="queued">antri</string>
     <string name="no_subtitles">Tidak Ada Subtitle</string>
     <string name="default_subtitles">Default</string>
-    <string name="free_storage">Bebas</string>
+    <string name="free_storage">Tersedia</string>
     <string name="used_storage">Terpakai</string>
     <string name="app_storage">Aplikasi</string>
     <!--plural-->
@@ -243,7 +243,7 @@
     <string name="dont_show_again">Jangan tunjukkan lagi</string>
     <string name="skip_update">Skip Update ini</string>
     <string name="update">Update</string>
-    <string name="watch_quality_pref">Kualitas tontonan yang lebih diinginkan (WIFI)</string>
+    <string name="watch_quality_pref">Kualitas nonton yang diinginkan (WiFi)</string>
     <string name="limit_title">Karakter maksimal judul pemutar video</string>
     <string name="limit_title_rez">Resolusi pemutar video</string>
     <string name="video_buffer_size_settings">Ukuran buffer video</string>
@@ -252,7 +252,7 @@
     <string name="video_buffer_clear_settings">Membersihkan cache video dan gambar</string>
     <string name="video_ram_description">Dapat menyebabkan crash jika disetel terlalu tinggi. Jangan diubah jika perangkat anda memiliki jumlah RAM yang rendah, seperti TV Android atau ponsel lama.</string>
     <string name="video_disk_description">Dapat bermasalah pada sistem dengan ruang penyimpanan rendah, seperti Android TV, jika diatur terlalu tinggi.</string>
-    <string name="dns_pref">DNS melalui HTTPS</string>
+    <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Berguna untuk melewati blok ISP</string>
     <string name="download_path_pref">Jalur download</string>
     <string name="nginx_url_pref">NGINX server URL</string>
@@ -260,7 +260,7 @@
     <string name="resize_fit">Paskan dengan layar</string>
     <string name="resize_fill">Regang</string>
     <string name="resize_zoom">Zoom</string>
-    <string name="legal_notice">Peringatan</string>
+    <string name="legal_notice">Disclaimer</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Umum</string>
     <string name="random_button_settings">Tombol Acak</string>
@@ -364,7 +364,7 @@
     <string name="kitsu_settings">Tampilkan poster dari Kitsu</string>
     <string name="automatic_plugin_download_summary">Pasang otomatis semua plugins yang belum terpasang, dari repositori yang telah ditambahkan.</string>
     <string name="live_singular">Siaran langsung</string>
-    <string name="nsfw_singular">17+</string>
+    <string name="nsfw_singular">NSFW</string>
     <string name="example_password">password123</string>
     <string name="category_providers">Penyedia</string>
     <string name="pref_category_cache">Cache</string>
@@ -374,7 +374,7 @@
     <string name="pref_category_defaults">Bawaan</string>
     <string name="pref_category_looks">Tampilan</string>
     <string name="pref_category_ui_features">Fitur</string>
-    <string name="enable_nsfw_on_providers">Tampilkan konten 17+</string>
+    <string name="enable_nsfw_on_providers">Tampilkan konten NSFW</string>
     <string name="play_trailer_button">Putar Cuplikan</string>
     <string name="play_livestream_button">Putar Siaran</string>
     <string name="stream">Siaran</string>
@@ -385,7 +385,7 @@
     <string name="redo_setup_process">Ulang proses pemasangan</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
-    <string name="nsfw">17+</string>
+    <string name="nsfw">NSFW</string>
     <string name="others">Lainnya</string>
     <string name="other_singular">Video</string>
     <string name="add_site_pref">Duplikasi Website</string>
@@ -393,7 +393,7 @@
     <string name="pref_category_links">Tautan</string>
     <string name="pref_category_app_updates">Perbarui Aplikasi</string>
     <string name="pref_category_backup">Cadangkan</string>
-    <string name="pref_category_extensions">Fitur Tambahan</string>
+    <string name="pref_category_extensions">Ekstensi</string>
     <string name="play_with_app_name">Putar di CloudStream</string>
     <string name="pref_filter_search_quality">Sembunyikan kualitas video terpilih di pencarian</string>
     <string name="season_format">%s %d%s</string>
@@ -464,7 +464,7 @@
     <string name="app_layout_subtext">Ubah tampilan aplikasi</string>
     <string name="crash_reporting_title">Laporkan Crash</string>
     <string name="setup_done">Selesai</string>
-    <string name="extensions">Fitur Tambahan</string>
+    <string name="extensions">Ekstensi</string>
     <string name="delete_repository">Hapus Repositori</string>
     <string name="setup_extensions_subtext">Unduh semua situs yang ingin digunakan</string>
     <string name="extension_size">Ukuran</string>
@@ -485,7 +485,7 @@
     <string name="pref_category_actions">Aksi</string>
     <string name="referer">Referer</string>
     <string name="yes">Ya</string>
-    <string name="extension_install_first">Pasang dulu fitur tambahan</string>
+    <string name="extension_install_first">Install ekstensi terlebih dahulu</string>
     <string name="all_languages_preference">Semua Bahasa</string>
     <string name="skip_type_format" formatted="true">Lewati %s</string>
     <string name="skip_type_op">Pembuka</string>
@@ -546,12 +546,12 @@
     <string name="subscription_new">Berlangganan ke %s</string>
     <string name="subscription_deleted">Berhenti berlangganan di %s</string>
     <string name="subscription_episode_released">Episode %d telah rilis!</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proksi</string>
-    <string name="jsdelivr_enabled">Tidak dapat menjangkau GitHub. Mengaktifkan proksi jsDelivr…</string>
+    <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
+    <string name="jsdelivr_enabled">Tidak dapat menjangkau GitHub. Mengaktifkan proxy jsDelivr…</string>
     <string name="jsdelivr_proxy_summary">Melewati pemblokiran GitHub menggunakan jsDelivr. Dapat menyebabkan pembaruan tertunda beberapa hari.</string>
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
-    <string name="watch_quality_pref_data">Nonton dengan kualitas yang di inginkan (Data Seluler)</string>
+    <string name="watch_quality_pref_data">Kualitas nonton yang diinginkan (Data Seluler)</string>
     <string name="mobile_data">Data seluler</string>
     <string name="help">Bantuan</string>
     <string name="quality_profile_help">Di sini anda dapat mengubah sumber yang diurutkan. Jika video memiliki prioritas lebih tinggi, video tersebut akan muncul lebih tinggi dalam pemilihan sumber. Jumlah prioritas sumber dan prioritas kualitas adalah prioritas video.
@@ -569,4 +569,5 @@
     <string name="profiles">Profil</string>
     <string name="qualities">Kualitas</string>
     <string name="profile_background_des">Latar belakang profil</string>
+    <string name="unable_to_inflate">UI tidak dapat dibuat dengan benar, ini adalah BUG UTAMA dan harus segera dilaporkan %s</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5fcc14da..5e415dc6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -201,4 +201,7 @@
     <string name="preview_background_img_des">バックグラウンドをプレビュー</string>
     <string name="play_livestream_button">ライブストリームの再生</string>
     <string name="home_change_provider_img_des">プロバイダーの変更</string>
+    <string name="next_episode_format" formatted="true">エピソード %d は にリリースされます</string>
+    <string name="type_re_watching">再視聴</string>
+    <string name="play_torrent_button">ストリームトレント</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7d4bf3e3..60b776b1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -549,4 +549,5 @@
     <string name="help">Pomoc</string>
     <string name="qualities">Jakości</string>
     <string name="profile_background_des">Tło profilu</string>
+    <string name="unable_to_inflate">Nie można było poprawnie utworzyć interfejsu użytkownika, jest to POWAŻNY BŁĄD i należy go natychmiast zgłosić %s</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0fad744c..e246c673 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -59,7 +59,7 @@
     <string name="sort_copy">Скопіювати</string>
     <string name="sort_close">Закрити</string>
     <string name="sort_save">Зберегти</string>
-    <string name="player_speed">Швидкість програвача</string>
+    <string name="player_speed">Швидкість плеєра</string>
     <string name="subs_window_color">Колір вікна</string>
     <string name="subs_edge_type">Тип контуру</string>
     <string name="subs_font">Шрифт</string>
@@ -80,15 +80,15 @@
     <string name="normal_no_plot">Сюжет не знайдено</string>
     <string name="torrent_no_plot">Опис не знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
-    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших програм</string>
+    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибирає чорні рамки</string>
     <string name="player_subtitles_settings">Субтитри</string>
     <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Налаштування субтитрів Chromecast</string>
     <string name="eigengraumode_settings">Режим Eigengravy</string>
     <string name="swipe_to_change_settings">Проведіть пальцем, щоб змінити налаштування</string>
-    <string name="swipe_to_change_settings_des">Проведіть пальцем вгору або вниз ліворуч або праворуч, щоб змінити яскравість або гучність</string>
-    <string name="autoplay_next_settings_des">Відтворення наступного епізоду після закінчення поточного</string>
+    <string name="swipe_to_change_settings_des">Проведіть пальцем вгору або вниз, ліворуч або праворуч, щоб змінити яскравість чи гучність</string>
+    <string name="autoplay_next_settings_des">Відтворювати наступний епізод після закінчення поточного</string>
     <string name="title_home">Головна</string>
     <string name="app_name">CloudStream</string>
     <string name="filler" formatted="true">Філер</string>
@@ -129,12 +129,12 @@
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
     <string name="player_subtitles_settings_des">Налаштування субтитрів плеєра</string>
-    <string name="eigengraumode_settings_des">Додає опцію швидкості в плеєрі</string>
+    <string name="eigengraumode_settings_des">Додає опцію керування швидкістю в плеєрі</string>
     <string name="swipe_to_seek_settings">Проведіть пальцем, щоб перемотати</string>
     <string name="double_tap_to_seek_settings">Двічі торкніться, щоб перемотати</string>
     <string name="double_tap_to_pause_settings">Двічі торкніться для паузи</string>
     <string name="double_tap_to_seek_amount_settings">Крок перемотки (Секунди)</string>
-    <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоб призупинити</string>
+    <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоб призупинити відтворення відео</string>
     <string name="use_system_brightness_settings">Використовувати яскравість системи</string>
     <string name="episode_sync_settings">Оновити прогрес перегляду</string>
     <string name="restore_settings">Відновлення даних з резервної копії</string>
@@ -154,7 +154,7 @@
     <string name="show_trailers_settings">Показати трейлери</string>
     <string name="pref_filter_search_quality">Приховати вибрану якість відео в результатах пошуку</string>
     <string name="automatic_plugin_download">Автоматичне завантаження плагінів</string>
-    <string name="updates_settings">Показати оновлення програми</string>
+    <string name="updates_settings">Показувати оновлення застосунку</string>
     <string name="redo_setup_process">Повторний процес налаштування</string>
     <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
     <string name="apk_installer_settings">Встановлювач APK</string>
@@ -162,7 +162,7 @@
     <string name="lightnovel">Застосунок для легких новел від тих же розробників</string>
     <string name="anim">Застосунок для аніме від тих же розробників</string>
     <string name="benene">Дайте бананів розробникам</string>
-    <string name="app_language">Мова програми</string>
+    <string name="app_language">Мова застосунку</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
     <string name="no_links_found_toast">Посилань не знайдено</string>
     <string name="play_episode_toast">Переглянути епізод</string>
@@ -189,7 +189,7 @@
     <string name="default_subtitles">За замовчуванням</string>
     <string name="free_storage">Вільно</string>
     <string name="used_storage">Зайнято</string>
-    <string name="app_storage">Програма</string>
+    <string name="app_storage">Застосунок</string>
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
@@ -208,7 +208,7 @@
     <string name="remote_error">Віддалена помилка</string>
     <string name="render_error">Помилка рендеринга</string>
     <string name="episode_action_chromecast_mirror">Дзеркало Chromecast</string>
-    <string name="episode_action_play_in_app">Переглянути в програмі</string>
+    <string name="episode_action_play_in_app">Переглянути в застосунку</string>
     <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
@@ -221,7 +221,7 @@
     <string name="show_title">Заголовок</string>
     <string name="poster_ui_settings">Перемикання елементів інтерфейсу на плакаті</string>
     <string name="no_update_found">Оновлення не знайдено</string>
-    <string name="double_tap_to_seek_settings_des">Двічі торкніться праворуч або ліворуч, щоб перейти вперед або назад</string>
+    <string name="double_tap_to_seek_settings_des">Двічі торкніться праворуч або ліворуч, щоб перемотати відео вперед або назад</string>
     <string name="use_system_brightness_settings_des">Використовуйте системну яскравість у плеєрі замість темної накладки</string>
     <string name="restore_success">Завантажено файл резервної копії</string>
     <string name="torrent">Торренти</string>
@@ -273,7 +273,7 @@
     <string name="resize_fill">Заповнити</string>
     <string name="resize_zoom">Збільшити</string>
     <string name="tracks">Доріжки</string>
-    <string name="pref_category_app_updates">Оновлення програми</string>
+    <string name="pref_category_app_updates">Оновлення застосунку</string>
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жести</string>
     <string name="pref_category_player_features">Особливості плеєра</string>
@@ -283,19 +283,19 @@
     <string name="pref_category_ui_features">Особливості</string>
     <string name="category_general">Загальне</string>
     <string name="random_button_settings">Випадкова кнопка</string>
-    <string name="random_button_settings_desc">Показати випадкову кнопку на Головній сторінці</string>
+    <string name="random_button_settings_desc">Показувати кнопку на Головній сторінці, яка вибирає випадковий фільм чи серіал</string>
     <string name="provider_lang_settings">Мови постачальника</string>
-    <string name="app_layout">Макет програми</string>
+    <string name="app_layout">Макет застосунку</string>
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Авто</string>
     <string name="tv_layout">Макет телевізора</string>
     <string name="phone_layout">Макет телефону</string>
     <string name="emulator_layout">Макет емулятора</string>
     <string name="primary_color_settings">Основний колір</string>
-    <string name="app_theme_settings">Тема програми</string>
+    <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви постера</string>
     <string name="bottom_title_settings_des">Розмістіть назву під постером</string>
-    <string name="example_password">пароль123</string>
+    <string name="example_password">Пароль123</string>
     <string name="example_username">Моє круте ім\'я</string>
     <string name="example_email">hello@world.com</string>
     <string name="example_site_name">Мій крутий сайт</string>
@@ -354,7 +354,7 @@
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="download_path_pref">Шлях завантаження</string>
     <string name="add_site_summary">Додайте клон існуючого сайту, з іншою URL-адресою</string>
-    <string name="display_subbed_dubbed_settings">Відображати Дубляж/Субтитри аніме</string>
+    <string name="display_subbed_dubbed_settings">Відображати мітку Дубляж/Субтитри в аніме</string>
     <string name="legal_notice">Застереження</string>
     <string name="pref_category_extensions">Розширення</string>
     <string name="pref_category_actions">Дії</string>
@@ -368,7 +368,7 @@
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subtitles_depressed">Депресивний</string>
     <string name="account">обліковий запис</string>
-    <string name="create_account">Створити обліковий запис</string>
+    <string name="create_account">Створити</string>
     <string name="added_sync_format" formatted="true">Додано %s</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_score">Оцінений</string>
@@ -401,7 +401,7 @@
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
     <string name="subtitles_remove_bloat">Видалити роздуття субтитрів</string>
-    <string name="referer">Реферер</string>
+    <string name="referer">Referer</string>
     <string name="next">Далі</string>
     <string name="provider_languages_tip">Дивіться відео на цих мовах</string>
     <string name="skip_setup">Пропустити налаштування</string>
@@ -437,7 +437,7 @@
     <string name="uppercase_all_subtitles">Усі субтитри у верхньому регістрі</string>
     <string name="single_plugin_disabled" formatted="true">%s (Вимкнено)</string>
     <string name="video_tracks">Відео доріжки</string>
-    <string name="apply_on_restart">Застосувати при перезавантаженні</string>
+    <string name="apply_on_restart">Застосується при перезавантаженні</string>
     <string name="safe_mode_crash_info">Переглянути інформацію про збій</string>
     <string name="extension_rating" formatted="true">Рейтинг: %s</string>
     <string name="extension_description">Опис</string>
@@ -462,17 +462,17 @@
     <string name="skip_type_intro">Вступ</string>
     <string name="clear_history">Очистити історію</string>
     <string name="history">Історія</string>
-    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінґу/кінця</string>
+    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінґу/ендінґу</string>
     <string name="clipboard_too_large">Забагато тексту. Не вдалося зберегти в буфер обміну.</string>
     <string name="action_mark_as_watched">Позначити як переглянуте</string>
     <string name="confirm_exit_dialog">Ви впевнені що хочете вийти\?</string>
     <string name="yes">Так</string>
     <string name="no">Ні</string>
-    <string name="update_notification_installing">Встановлення оновлення програми…</string>
-    <string name="update_notification_failed">Не вдалося встановити нову версію програми</string>
-    <string name="apk_installer_legacy">Старий</string>
+    <string name="update_notification_installing">Встановлення оновлення застосунку…</string>
+    <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
+    <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">Інсталятор пакетів</string>
-    <string name="delayed_update_notice">Програму буде оновлено після виходу</string>
+    <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
     <string name="delete_repository_plugins">Це також призведе до видалення всіх плагінів репозиторію</string>
     <string name="all_languages_preference">Всі мови</string>
     <string name="previous">Назад</string>
@@ -484,44 +484,44 @@
     <string name="player_pref">Бажаний відеоплеєр</string>
     <string name="safe_mode_title">Увімкнено безпечний режим</string>
     <string name="extension_authors">Автори</string>
-    <string name="update_notification_downloading">Завантаження оновлення програми…</string>
+    <string name="update_notification_downloading">Завантаження оновлення застосунку…</string>
     <string name="safe_mode_description">Усі розширення були вимкнені через збій, щоб допомогти вам знайти те, що стало причиною проблеми.</string>
-    <string name="app_not_found_error">Програму не знайдено</string>
+    <string name="app_not_found_error">Застосунок не знайдено</string>
     <string name="skip_type_mixed_op">Змішаний опенінґ</string>
     <string name="action_remove_from_watched">Видалити з переглянутого</string>
-    <string name="sort_updated_old">За оновленням (від старого до нового)</string>
-    <string name="sort_updated_new">За оновленням (від нового до старого)</string>
+    <string name="sort_updated_old">Оновленням (від старого до нового)</string>
+    <string name="sort_updated_new">Оновленням (від нового до старого)</string>
     <string name="library">Бібліотека</string>
     <string name="sort">Сортувати</string>
-    <string name="sort_rating_desc">За рейтингом (від високого до низького)</string>
+    <string name="sort_rating_desc">Рейтингом (від високого до низького)</string>
     <string name="sort_by">Сортувати за</string>
-    <string name="sort_alphabetical_a">За алфавітом (від А до Я)</string>
-    <string name="sort_rating_asc">За рейтингом (від низького до високого)</string>
+    <string name="sort_alphabetical_a">Алфавітом (від А до Я)</string>
+    <string name="sort_rating_asc">Рейтингом (від низького до високого)</string>
     <string name="empty_library_no_accounts_message">Ваша бібліотека порожня :(
 \nУвійдіть в обліковий запис бібліотеки або додайте фільми до вашої локальної бібліотеки.</string>
-    <string name="sort_alphabetical_z">За алфавітом (від Я до А)</string>
+    <string name="sort_alphabetical_z">Алфавітом (від Я до А)</string>
     <string name="select_library">Виберіть бібліотеку</string>
-    <string name="open_with">Відкрити з</string>
+    <string name="open_with">Відкрити</string>
     <string name="browser">Браузер</string>
     <string name="empty_library_logged_in_message">Цей список порожній. Спробуйте перейти до іншого.</string>
     <string name="safe_mode_file">Файл безпечного режиму знайдено!
 \nРозширеня не завантажуються під час запуску, доки файл не буде видалено.</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_off_seek_settings">Плеєр сховано - обсяг пошуку</string>
-    <string name="android_tv_interface_on_seek_settings">Плеєр показано - обсяг пошуку</string>
-    <string name="android_tv_interface_on_seek_settings_summary">Обсяг пошуку, який використовується, коли плеєр видимий</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Обсяг пошуку, який використовується, коли гравець прихований</string>
-    <string name="test_failed">Не вдалося</string>
-    <string name="test_passed">Пройдено</string>
+    <string name="android_tv_interface_off_seek_settings">Плеєр сховано - обсяг перемотки</string>
+    <string name="android_tv_interface_on_seek_settings">Плеєр показано - обсяг перемотки</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Обсяг перемотки, який використовується, коли плеєр видимий</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Обсяг перемотки, який використовується, коли плеєр прихований</string>
+    <string name="test_failed">Тест провалено</string>
+    <string name="test_passed">Тест пройдено</string>
     <string name="restart">Перезапуск</string>
     <string name="test_log">Журнал</string>
-    <string name="start">Старт</string>
-    <string name="stop">Стоп</string>
-    <string name="category_provider_test">Тест постачальника</string>
+    <string name="start">Почати</string>
+    <string name="stop">Зупинити</string>
+    <string name="category_provider_test">Тестування постачальників</string>
     <string name="subscription_in_progress_notification">Оновлення підписаних шоу</string>
     <string name="subscription_list_name">Підписано</string>
-    <string name="subscription_new">Підписано на %s</string>
-    <string name="subscription_deleted">Відписатися від %s</string>
+    <string name="subscription_new">Ви підписалися на %s</string>
+    <string name="subscription_deleted">Ви відписалися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f896e5c1..4b394227 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -378,7 +378,7 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Áp phích</string>
+    <string name="poster_image">Ảnh áp phích</string>
     <string name="category_player">Trình phát</string>
     <string name="resolution_and_title">Độ phân giải và Tiêu đề</string>
     <string name="title">Tiêu đề</string>
@@ -389,15 +389,15 @@
     <string name="error">Lỗi</string>
     <string name="subtitles_remove_captions">Xoá phụ đề đã dùng</string>
     <string name="subtitles_remove_bloat">Loại bỏ mã hoá phụ đề</string>
-    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ</string>
+    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ media được chuộng hơn</string>
     <string name="extras">Thêm</string>
     <string name="trailer">Xem trước</string>
     <string name="network_adress_example">Liên kết trực tiếp</string>
     <string name="referer">Đề xuất</string>
     <string name="next">Tiếp theo</string>
     <string name="provider_languages_tip">Xem video bằng các ngôn ngữ này</string>
-    <string name="previous">Trước</string>
-    <string name="skip_setup">Bỏ qua</string>
+    <string name="previous">Trước đó</string>
+    <string name="skip_setup">Bỏ qua cài đặt setup</string>
     <string name="app_layout_subtext">Chọn giao diện phù hợp với thiết bị của bạn</string>
     <string name="crash_reporting_title">Báo cáo sự cố</string>
     <string name="preferred_media_subtext">Bạn muốn xem gì</string>
@@ -407,7 +407,7 @@
     <string name="repository_name_hint">Tên kho lưu trữ</string>
     <string name="repository_url_hint">Đường dẫn kho lưu trữ</string>
     <string name="plugin_loaded">Đã tải plugin</string>
-    <string name="plugin_deleted">Đã xoá plugin</string>
+    <string name="plugin_deleted">Plugin đã xoá</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Bắt đầu tải %d %s…</string>
@@ -436,7 +436,7 @@
     <string name="audio_tracks">Âm thanh</string>
     <string name="video_tracks">Chất lượng Video</string>
     <string name="apply_on_restart">Áp dụng khi khởi động lại</string>
-    <string name="safe_mode_title">Bật chế độ an toàn</string>
+    <string name="safe_mode_title">Chế độ an toàn được bật</string>
     <string name="safe_mode_description">Đã xảy ra sự cố và chúng tôi đã tự động tắt tất cả các tiện ích mở rộng, hãy tìm và xóa tiện ích mở rộng đang gây ra sự cố.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
     <string name="history">Lịch sử</string>
@@ -486,13 +486,13 @@
     <string name="skip_type_op">Mở đầu</string>
     <string name="skip_type_ed">Kết thúc</string>
     <string name="skip_type_recap">Tóm tắt</string>
-    <string name="skip_type_mixed_ed">Mở đầu tuỳ chọn</string>
-    <string name="skip_type_mixed_op">Kết thúc tuỳ chọn</string>
+    <string name="skip_type_mixed_ed">Các kết thúc hỗn hợp</string>
+    <string name="skip_type_mixed_op">Các mở đầu hỗn hợp</string>
     <string name="skip_type_creddits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
     <string name="enable_skip_op_from_database_des">Hiển thị nút tua nhanh cho mở đầu/kết thúc</string>
-    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
+    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào khay nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát\?</string>
     <string name="yes">Có</string>
@@ -503,11 +503,11 @@
     <string name="library">Thư viện</string>
     <string name="browser">Trình duyệt</string>
     <string name="plugin_downloaded">Plugin đã tải</string>
-    <string name="apk_installer_legacy">Mặc định</string>
-    <string name="sort_updated_new">Tải lên (Mới đến Cũ)</string>
-    <string name="sort_updated_old">Tải lên (Cũ đến Mới)</string>
+    <string name="apk_installer_legacy">Di sản</string>
+    <string name="sort_updated_new">Đã cập nhật (Mới đến Cũ)</string>
+    <string name="sort_updated_old">Đã cập nhật (Cũ đến Mới)</string>
     <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
-\nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ</string>
+\nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
     <string name="open_with">Mở với</string>
     <string name="provider_info_meta">Siêu dữ liệu không có sẵn, video sẽ không được tải nếu nó không tồn tại trên trang web.</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
@@ -515,7 +515,7 @@
     <string name="sort_rating_desc">Xếp hạng (Cao đến Thấp)</string>
     <string name="sort_rating_asc">Xếp hạng (Thấp đến Cao)</string>
     <string name="sort_alphabetical_z">Chữ cái (Z đến A)</string>
-    <string name="sort_by">Sắp xếp</string>
+    <string name="sort_by">Sắp xếp theo</string>
     <string name="empty_library_logged_in_message">Danh sách này trống, hãy thử chuyển sang danh sách khác.</string>
     <string name="sort_alphabetical_a">Chữ cái (A đến Z)</string>
     <string name="select_library">Chọn Thư viện</string>
@@ -532,16 +532,33 @@
     <string name="subscription_new">Đã đăng kí %s</string>
     <string name="subscription_episode_released">Tập %d đã ra mắt!</string>
     <string name="subscription_list_name">Đã đăng kí</string>
-    <string name="stop">Dừng</string>
+    <string name="stop">Dừng lại</string>
     <string name="pref_category_bypass">Bỏ qua ISP</string>
     <string name="subscription_deleted">Đã bỏ đăng ký %s</string>
     <string name="safe_mode_file">Tìm thấy tệp Safe mode!
-\nKhông tải bất cứ tiện ích nào khi khởi dộng cho đến khi tệp bị xoá</string>
-    <string name="revert">Trở lại</string>
+\nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
+    <string name="revert">Đảo ngược lại</string>
     <string name="subscription_in_progress_notification">Đang cập nhật các phim đã đăng kí</string>
-    <string name="jsdelivr_proxy_summary">Bỏ qua chặn GitHub bằng cách dùng jsDelivr. Có thể gây ra việc cập nhật bị chậm vài ngày</string>
+    <string name="jsdelivr_proxy_summary">Bỏ qua chặn GitHub bằng cách dùng jsDelivr. Có thể gây ra việc cập nhật bị chậm vài ngày.</string>
     <string name="android_tv_interface_off_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát ẩn</string>
     <string name="android_tv_interface_off_seek_settings">Lượng tua thêm</string>
     <string name="android_tv_interface_on_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát hiện lên</string>
     <string name="android_tv_interface_on_seek_settings">Lượng tua thêm</string>
+    <string name="profile_number">Hồ sơ %d</string>
+    <string name="mobile_data">Dữ liệu di động</string>
+    <string name="set_default">Đặt mặc định</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="use">Sử dụng</string>
+    <string name="edit">Điều chỉnh</string>
+    <string name="profiles">Hồ sơ</string>
+    <string name="help">Trợ giúp</string>
+    <string name="profile_background_des">Nền hồ sơ</string>
+    <string name="quality_profile_help">Tại đây bạn có thể thay đổi cách sắp xếp các nguồn. Nếu video có mức độ ưu tiên cao hơn thì video đó sẽ xuất hiện cao hơn trong lựa chọn nguồn. Tổng ưu tiên nguồn và ưu tiên chất lượng là ưu tiên video.
+\n
+\nNguồn A: 3
+\nChất lượng B: 7
+\nSẽ có mức độ ưu tiên video kết hợp là 10.
+\n
+\nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
+    <string name="qualities">Các phẩm chất</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index dbd96827..033a5f50 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -577,4 +577,21 @@
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
     <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>
+    <string name="profile_number">简介 %d</string>
+    <string name="wifi">无线网络</string>
+    <string name="set_default">设为默认</string>
+    <string name="use">使用</string>
+    <string name="edit">编辑</string>
+    <string name="profiles">配置文件</string>
+    <string name="help">帮助</string>
+    <string name="mobile_data">移动流量</string>
+    <string name="quality_profile_help">在这里，您可以更改源的排序方式。如果视频具有更高的优先级，它将在源选择中显示得更高。源优先级和质量优先级的总和就是视频优先级。
+\n
+\n来源 A：3
+\n质量 B： 7
+\n组合视频优先级为 10。
+\n
+\n注意：如果总和为 10 或更多，则加载该链接时播放器将自动跳过加载！</string>
+    <string name="qualities">质量</string>
+    <string name="profile_background_des">个人资料背景</string>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 95094311..28e5da9f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,6 +17,39 @@
         <attr name="header_text" format="string" />
     </declare-styleable>
 
+    <declare-styleable name="PieFetchButton">
+        <attr name="download_layout" format="reference" />
+        <attr name="download_background_progress" format="reference" />
+        <attr name="download_outline_active" format="reference" />
+        <attr name="download_outline_non_active" format="reference" />
+        <attr name="download_waiting_animation" format="reference" />
+        <attr name="download_progress_drawable" format="reference" />
+        <attr name="download_animate_waiting" format="boolean" />
+        <attr name="download_fill_color" format="color" />
+        <attr name="download_outline_color" format="color" />
+        <attr name="download_icon_color" format="color" />
+        <attr name="download_icon_scale" format="float" />
+
+        <attr name="download_fill" format="enum">
+            <enum name="clockwise" value="0" />
+            <enum name="counter_clockwise" value="1" />
+            <enum name="small_to_large" value="2" />
+            <!--<enum name="top_to_bottom" value="3" />-->
+        </attr>
+
+        <attr name="download_fill_override" format="reference" />
+
+        <attr name="download_hide_when_icon" format="boolean" />
+
+        <attr name="download_icon_init" format="reference" />
+        <attr name="download_icon_error" format="reference" />
+        <attr name="download_icon_complete" format="reference" />
+        <attr name="download_icon_active" format="reference" />
+        <attr name="download_icon_waiting" format="reference" />
+        <attr name="download_icon_removed" format="reference" />
+        <attr name="download_icon_paused" format="reference" />
+    </declare-styleable>
+
     <declare-styleable name="MainColors">
         <attr name="colorPrimary" format="color" />
         <attr name="colorSearch" format="color" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 567b6d35..b44706c1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,4 +17,7 @@
 
     <dimen name="storage_radius">3dp</dimen>
     <dimen name="navbar_width">62dp</dimen>
+
+    <dimen name="download_size">50dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fbaecd2e..c101b0b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -677,4 +677,8 @@
     </string>
     <string name="qualities">Qualities</string>
     <string name="profile_background_des">Profile background</string>
+    <string name="unable_to_inflate">UI was unable to be created correctly, this is a MAJOR BUG and should be reported immediately %s</string>
+
+
+    <string name="tv_no_focus_tag" translatable="false">tv_no_focus_tag</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b9648162..5a92a7f3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,11 +65,17 @@
         <item name="white">#FFF</item>
 
         <item name="preferenceTheme">@style/CustomPreferenceThemeOverlay</item>
+
+
+        <item name="download_icon_color">?attr/white</item>
+        <item name="download_fill_color">?attr/white</item>
+        <item name="download_outline_color">?attr/white</item>
+        <item name="download_icon_scale">1.0</item>
     </style>
 
     <style name="ListViewStyle" parent="Widget.AppCompat.ListView">
         <item name="android:divider">@null</item>
-        <item name="android:listSelector">@drawable/outline_drawable_less</item>
+        <item name="android:listSelector">@drawable/outline_drawable_forced</item>
         <item name="android:drawSelectorOnTop">false</item>
     </style>
 
@@ -79,7 +85,8 @@
 
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
         <item name="chipBackgroundColor">@color/chip_color</item>
-        <item name="chipStrokeColor">@color/white_transparent_toggle</item>
+       <!-- <item name="chipStrokeColor">@color/white_transparent_toggle</item>-->
+        <item name="chipStrokeColor">@color/transparent</item>
         <item name="chipStrokeWidth">2dp</item>
         <item name="textColor">@color/chip_color_text</item>
         <item name="android:textColor">@color/chip_color_text</item>
@@ -97,7 +104,7 @@
     </style>
 
     <style name="ChipParent">
-        <item name="chipSpacingVertical">5dp</item>
+        <item name="chipSpacingVertical">-5dp</item>
         <item name="chipSpacingHorizontal">5dp</item>
         <item name="textColor">?attr/textColor</item>
     </style>
@@ -125,8 +132,13 @@
         <item name="android:textColor">@color/subColorText</item>
     </style>
 
+    <!--<style name="RatingButton" parent="@style/SearchBox">
+        <item name="android:background">@drawable/rating_bg_color</item>
+        <item name="android:textColor">@color/ratingColor</item>
+    </style>-->
+
     <style name="RatingButton" parent="@style/SearchBox">
-        <item name="android:minWidth">30dp</item>
+        <item name="android:minWidth">40dp</item>
         <item name="android:background">@drawable/rating_bg_color</item>
         <item name="drawableTint">@color/ratingColor</item>
         <item name="android:textColor">@color/ratingColor</item>
@@ -483,9 +495,10 @@
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>
         <item name="android:selectAllOnFocus">true</item>
-        <item name="android:background">@drawable/outline_drawable_less</item>
+       <!-- <item name="android:background">@drawable/outline_drawable_less</item>
+               <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
+       -->
         <item name="android:textColor">?attr/textColor</item>
-        <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
         <item name="drawableEndCompat">@drawable/ic_baseline_keyboard_arrow_right_24</item>
     </style>
@@ -535,6 +548,7 @@
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:foreground">@drawable/outline_drawable_less</item>
+        <item name="android:tag">@string/tv_no_focus_tag</item>
     </style>
 
     <style name="WhiteButton" parent="NiceButton">
@@ -558,6 +572,7 @@
         <item name="drawableStartCompat">@drawable/ic_baseline_check_24_listview</item>
     </style>
 
+
     <style name="NoCheckLabel" parent="@style/AppTextViewStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -595,6 +610,19 @@
         <item name="android:minWidth">0dp</item>
     </style>
 
+    <style name="SmallWhiteButton" parent="WhiteButton">
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="iconPadding">0dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:minWidth">0dp</item>
+    </style>
+
     <style name="RoundedSelectableButtonIcon" parent="RoundedSelectableButton">
         <item name="minWidth">0dp</item>
         <item name="iconTint">?attr/textColor</item>
@@ -699,7 +727,45 @@
         <item name="strokeColor">@color/tag_stroke_color</item>
     </style>
 
+    <style name="ResultButtonTV" parent="@style/RegularButtonTV">
+        <item name="android:tag">@string/tv_no_focus_tag</item>
+        <item name="iconGravity">start</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_width">250dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+    </style>
+
+    <style name="RegularButtonTV">
+        <item name="android:tag">@string/tv_no_focus_tag</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="strokeColor">@color/transparent</item>
+        <item name="backgroundTint">@null</item>
+        <item name="android:background">@drawable/player_button_tv</item>
+        <item name="rippleColor">@color/white</item>
+        <item name="android:shadowColor">@color/transparent</item>
+
+        <item name="iconTint">@color/player_on_button_tv</item>
+        <item name="textColor">@color/player_on_button_tv</item>
+        <item name="android:textColor">@color/player_on_button_tv</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="iconSize">16dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:baselineAligned">false</item>
+        <item name="textAllCaps">false</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_marginStart">4dp</item>
+        <item name="android:layout_marginEnd">4dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:insetTop">0dp</item>
+    </style>
+
     <style name="VideoButtonTV">
+        <item name="android:tag">@string/tv_no_focus_tag</item>
         <item name="android:stateListAnimator">@null</item>
         <item name="strokeColor">@color/transparent</item>
         <item name="backgroundTint">@null</item>
diff --git a/fastlane/metadata/android/ar-SA/full_description.txt b/fastlane/metadata/android/ar-SA/full_description.txt
new file mode 100644
index 00000000..2107b338
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/full_description.txt
@@ -0,0 +1,14 @@
+يتيح لك كلاود ستريم -3 بث وتنزيل الأفلام والمسلسلات التلفزيونية والأنيمي. يأتي التطبيق بدون أي إعلانات وتحليلات. و يدعم العديد من مواقع البث الاولي(التريلر) والأفلام والمزيد. وتشمل الميزات:
+
+
+
+إشارات مرجعية
+
+
+قم بتنزيل ودفق الأفلام والبرامج التلفزيونية والأنيمي
+
+
+تنزيلات الترجمة
+
+
+دعم كروم كاست
diff --git a/fastlane/metadata/android/ar-SA/short_description.txt b/fastlane/metadata/android/ar-SA/short_description.txt
new file mode 100644
index 00000000..f396ff81
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/short_description.txt
@@ -0,0 +1 @@
+بث وتحميل الأفلام والأنمي والمسلسلات التلفزيونية.
diff --git a/fastlane/metadata/android/ar-SA/title.txt b/fastlane/metadata/android/ar-SA/title.txt
new file mode 100644
index 00000000..635e1390
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/title.txt
@@ -0,0 +1 @@
+كلاود ستريم
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index e01b7d03..07c5f3ae 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,14 +1,10 @@
-CloudStream-3 lets you stream and download Movies, TV-Series and Anime. The app comes without any ads and analytics. It supports multiple trailer & movie sites, and more. Features include:
-
+CloudStream-3 lets you stream and download Movies, TV-Series and Anime.
 
+The app comes without any ads and analytics and
+supports multiple trailer & movie sites, and more, e.g.
 
 Bookmarks
 
-
-Download and stream movies, tv-shows and anime
-
-
-subtitle downloads
-
+Subtitle downloads
 
 Chromecast support
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 83ee1066..73078f8d 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Stream and download Movies, TV-Series and Anime.
+Stream and download movies, TV-series and anime.
diff --git a/fastlane/metadata/android/no-NO/changelogs/2.txt b/fastlane/metadata/android/no-NO/changelogs/2.txt
new file mode 100644
index 00000000..6d66f546
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/2.txt
@@ -0,0 +1 @@
+- Endringslogg tillagt.
diff --git a/fastlane/metadata/android/no-NO/full_description.txt b/fastlane/metadata/android/no-NO/full_description.txt
new file mode 100644
index 00000000..ac0c64c3
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/full_description.txt
@@ -0,0 +1,8 @@
+CloudStream-3 lar deg strømme og laste ned filmer, TV-serier, og anime. Programmet er reklamefritt, og det utføres ingen analyse. Flere førfilmer og filmsteder støttes, med mer.
+Noen av funksjonene.
+
+Bokmerker
+
+Nedlasting av undertekster
+
+Chromecast-støtte
diff --git a/fastlane/metadata/android/no-NO/short_description.txt b/fastlane/metadata/android/no-NO/short_description.txt
new file mode 100644
index 00000000..80290325
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/short_description.txt
@@ -0,0 +1 @@
+Se filmer, TV-serier og anime direkte eller last ned
diff --git a/fastlane/metadata/android/no-NO/title.txt b/fastlane/metadata/android/no-NO/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/pl-PL/short_description.txt b/fastlane/metadata/android/pl-PL/short_description.txt
new file mode 100644
index 00000000..1c561b6e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/short_description.txt
@@ -0,0 +1 @@
+Streamuj i pobieraj filmy, seriale telewizyjne i anime.
diff --git a/fastlane/metadata/android/pl-PL/title.txt b/fastlane/metadata/android/pl-PL/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/uk/changelogs/2.txt b/fastlane/metadata/android/uk/changelogs/2.txt
new file mode 100644
index 00000000..2c8d9f7e
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/2.txt
@@ -0,0 +1 @@
+- Додано журнал змін!
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
new file mode 100644
index 00000000..554b08ac
--- /dev/null
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -0,0 +1,14 @@
+CloudStream-3 дозволяє транслювати та завантажувати фільми, серіали та аніме. Застосунок не містить реклами та аналітики. Підтримує безліч сайтів з трейлерами та фільмами тощо. Особливості застосунку:
+
+
+
+Закладки
+
+
+Завантаження та трансляція фільмів, серіалів та аніме
+
+
+завантаження субтитрів
+
+
+Підтримка Chromecast
diff --git a/fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
new file mode 100644
index 00000000..b54cc950
--- /dev/null
+++ b/fastlane/metadata/android/uk/short_description.txt
@@ -0,0 +1 @@
+Трансляція та завантаження фільмів, серіалів та аніме.
diff --git a/fastlane/metadata/android/uk/title.txt b/fastlane/metadata/android/uk/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/uk/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/zh-CN/changelogs/2.txt b/fastlane/metadata/android/zh-CN/changelogs/2.txt
new file mode 100644
index 00000000..5512f16c
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/2.txt
@@ -0,0 +1 @@
+- 添加了更新日志！
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
index 1f437a99..56519df6 100644
--- a/fastlane/metadata/android/zh-CN/full_description.txt
+++ b/fastlane/metadata/android/zh-CN/full_description.txt
@@ -1,14 +1,9 @@
 CloudStream-3可以让你串流和下载电影、剧集和动漫。这款应用没有任何广告和分析。它支持多个预告片和电影网站等。特点包括：
 
-
-
 书签
 
-
 下载和串流电影、电视节目和动漫
 
-
 下载字幕
 
-
 支持投屏
diff --git a/fastlane/metadata/android/zh-CN/title.txt b/fastlane/metadata/android/zh-CN/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/gradle.properties b/gradle.properties
index 143de3dd..b8aa1f91 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,7 @@ 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
\ No newline at end of file
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file