diff --git a/.github/images/download-cloudstream-pre.png b/.github/images/download-cloudstream-pre.png
deleted file mode 100644
index db1f90552..000000000
Binary files a/.github/images/download-cloudstream-pre.png and /dev/null differ
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 433816e0f..8f5c62866 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -26,11 +26,6 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: false
 
-    - name: Ensure binary compatibility
-      # This is to ensure that your code is backwards compatible.
-      # If this fails you need to add a @Prerelease annotation to new code.
-      run: ./gradlew library:checkKotlinAbi
-
     - name: Run Gradle
       run: ./gradlew assemblePrereleaseDebug lint check
 
diff --git a/COMPOSE.md b/COMPOSE.md
deleted file mode 100644
index 8d83a50ae..000000000
--- a/COMPOSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Migration guide to Compose
-
-### 1. MVI instead of MVVM 
-
-The current design of CloudStream loosely uses the MVVM architecture.
-
-This means that the UI invokes the viewmodel with function calls, and it responds with LiveData fields that are observed. While this has worked, it generates a lot of boilerplate and has created some friction.
-
-To make it easier to work with Compose, the new architecture will be based on MVI. In short this means that the viewmodel exposes a singular immutable class that is observed, and receives all UI events with a singular event that is a sealed class. All the UI should be able to be recreated based on this singular state class, and all interactions should be able to be replayed using only the event callback.
-
-For a more detailed overview, see: https://www.youtube.com/watch?v=b2z1jvD4VMQ
-
-This is part of the effort to make CloudStream cross platform, as it allows us to decouple UI and logic.
-
-### 2. KMP-compatible libraries
-
-We plan to leverage Kotlin's KMP project to compile our code to different architectures. However, this requires us to only use KMP-compatible libraries, no Java. Therefore any pull requests must ensure that they use KMP-compatible libraries only.
-
-### 3. UI Changes
-
-While migrating to the new compose UI, you also have the opportunity to change the UI. However, this should only be to freshen up the UI, not completely redesign it. It is also important to stress that this process should not lose any features of the old UI, and be very conservative with adding new features.
\ No newline at end of file
diff --git a/README.md b/README.md
index 237d7d8fc..c2492c5d8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # CloudStream
 
 **⚠️ Warning: By default, this app doesn't provide any video sources; you have to install extensions to add functionality to the app.**
-<p align="left"><a href="https://github.com/recloudstream/cloudstream/releases/download/pre-release/app-prerelease-release.apk"><img src=".github/images/download-cloudstream-pre.png" alt="Download Cloudstream Pre-Release" width=430/></a></p>
 
 [![Discord](https://invidget.switchblade.xyz/5Hus6fM)](https://discord.gg/5Hus6fM)
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c714368ee..75a9698c8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,8 +9,6 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.compose.multiplatform)
-    alias(libs.plugins.compose.compiler)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
@@ -278,8 +276,6 @@ dependencies {
     implementation(libs.jackson.module.kotlin) // JSON Parser
     implementation(libs.zipline)
 
-    // Temp/deprecated; will be removed once extensions have time to migrate from using it
-    implementation("com.google.code.gson:gson:2.11.0")
     // Deprecated; will be removed once extensions have time to migrate from using it
     implementation("me.xdrop:fuzzywuzzy:1.4.0")
 
@@ -290,12 +286,7 @@ dependencies {
     implementation(libs.work.runtime.ktx)
     implementation(libs.nicehttp) // HTTP Lib
 
-    implementation(libs.bundles.compose)
-    implementation(libs.activity.compose)
-    implementation(libs.kotlinx.io.core) // Logcat parser
-
     implementation(project(":library"))
-    implementation(project(":shared"))
 }
 
 tasks.register<Jar>("androidSourcesJar") {
@@ -332,9 +323,11 @@ tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
         jvmDefault.set(JvmDefaultMode.ENABLE)
+        freeCompilerArgs.add("-Xannotation-default-target=param-property")
         optIn.addAll(
             "com.lagradost.cloudstream3.InternalAPI",
             "com.lagradost.cloudstream3.Prerelease",
+            "kotlin.uuid.ExperimentalUuidApi",
         )
     }
 }
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
new file mode 100644
index 000000000..15ad532f8
--- /dev/null
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
@@ -0,0 +1,157 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import android.net.Uri
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KeepGeneratedSerializer
+import kotlinx.serialization.Serializable
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = NonEmptyData.Serializer::class)
+data class NonEmptyData(
+    val title: String = "",
+    val tags: List<String> = emptyList(),
+    val meta: Map<String, String> = emptyMap(),
+    val name: String = "hello",
+) {
+    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = WriteOnlyData.Serializer::class)
+data class WriteOnlyData(
+    val fieldA: String = "",
+    val fieldB: String = "",
+) {
+    object Serializer : WriteOnlySerializer<WriteOnlyData>(
+        WriteOnlyData.generatedSerializer(),
+        setOf("fieldB"),
+    )
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = MultiWriteOnly.Serializer::class)
+data class MultiWriteOnly(
+    val fieldA: String = "",
+    val fieldB: String = "",
+    val fieldC: String = "",
+) {
+    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
+        MultiWriteOnly.generatedSerializer(),
+        setOf("fieldB", "fieldC"),
+    )
+}
+
+@Serializable
+data class UriData(
+    @Serializable(with = UriSerializer::class)
+    val uri: Uri = Uri.EMPTY,
+)
+
+class SerializerTest {
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyStrings() {
+        val data = NonEmptyData(title = "", name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("title"))
+        assertTrue(result.contains("name"))
+    }
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyLists() {
+        val data = NonEmptyData(tags = emptyList(), name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("tags"))
+    }
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyMaps() {
+        val data = NonEmptyData(meta = emptyMap(), name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("meta"))
+    }
+
+    @Test
+    fun nonEmptySerializerKeepsNonEmptyFields() {
+        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
+        val result = data.toJson()
+        assertTrue(result.contains("title"))
+        assertTrue(result.contains("tags"))
+        assertTrue(result.contains("meta"))
+    }
+
+    @Test
+    fun nonEmptySerializerDoesNotAffectDeserialization() {
+        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
+        val result = parseJson<NonEmptyData>(input)
+        assertEquals("hello", result.title)
+        assertEquals(listOf("a"), result.tags)
+        assertEquals(mapOf("k" to "v"), result.meta)
+        assertEquals("world", result.name)
+    }
+
+    @Test
+    fun writeOnlySerializerOmitsFieldOnSerialize() {
+        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
+        val result = data.toJson()
+        assertTrue(result.contains("fieldA"))
+        assertFalse(result.contains("fieldB"))
+    }
+
+    @Test
+    fun writeOnlySerializerDeserializesNormally() {
+        val input = """{"fieldA":"hello","fieldB":"secret"}"""
+        val result = parseJson<WriteOnlyData>(input)
+        assertEquals("hello", result.fieldA)
+        assertEquals("secret", result.fieldB)
+    }
+
+    @Test
+    fun writeOnlySerializerDeserializesMissingAsDefault() {
+        val input = """{"fieldA":"hello"}"""
+        val result = parseJson<WriteOnlyData>(input)
+        assertEquals("hello", result.fieldA)
+        assertEquals("", result.fieldB)
+    }
+
+    @Test
+    fun writeOnlySerializerHandlesMultipleKeys() {
+        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
+        val result = data.toJson()
+        assertTrue(result.contains("fieldA"))
+        assertFalse(result.contains("fieldB"))
+        assertFalse(result.contains("fieldC"))
+    }
+
+    @Test
+    fun uriSerializerSerializesUriToString() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val result = data.toJson()
+        assertTrue(result.contains("https://example.com/path?query=1"))
+    }
+
+    @Test
+    fun uriSerializerDeserializesStringToUri() {
+        val input = """{"uri":"https://example.com/path?query=1"}"""
+        val result = parseJson<UriData>(input)
+        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
+    }
+
+    @Test
+    fun uriSerializerRoundtripsCorrectly() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val encoded = data.toJson()
+        val decoded = parseJson<UriData>(encoded)
+        assertEquals(data.uri, decoded.uri)
+    }
+}
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/UriSerializerTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/UriSerializerTest.kt
deleted file mode 100644
index 3ffd37124..000000000
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/UriSerializerTest.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import android.net.Uri
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-@Serializable
-data class UriData(
-    @Serializable(with = UriSerializer::class)
-    @SerialName("uri") val uri: Uri = Uri.EMPTY,
-)
-
-class UriSerializerTest {
-
-    @Test
-    fun uriSerializerSerializesUriToString() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val result = data.toJson()
-        assertTrue(result.contains("https://example.com/path?query=1"))
-    }
-
-    @Test
-    fun uriSerializerDeserializesStringToUri() {
-        val input = """{"uri":"https://example.com/path?query=1"}"""
-        val result = parseJson<UriData>(input)
-        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
-    }
-
-    @Test
-    fun uriSerializerRoundtripsCorrectly() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val encoded = data.toJson()
-        val decoded = parseJson<UriData>(encoded)
-        assertEquals(data.uri, decoded.uri)
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1012efb56..ee4c978f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -253,10 +253,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver
-            android:name=".receivers.PackageInstallerStatusReceiver"
-            android:exported="false" />
-
         <service
             android:name=".services.VideoDownloadService"
             android:enabled="true"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
index 6ff3ab54d..a9cd9c01e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
@@ -113,7 +113,7 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
             get() = _context?.get()
             private set(value) {
                 _context = WeakReference(value)
-                setContext(value)
+                setContext(WeakReference(value))
             }
 
         fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {
@@ -170,11 +170,11 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
         }
 
         /** Will fall back to WebView if in TV or emulator layout. */
-        fun openBrowser(url: String, activity: Activity?) {
+        fun openBrowser(url: String, activity: FragmentActivity?) {
             openBrowser(
                 url,
                 isLayout(TV or EMULATOR),
-                (activity as? FragmentActivity)?.supportFragmentManager?.fragments?.lastOrNull()
+                activity?.supportFragmentManager?.fragments?.lastOrNull()
             )
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 253f10237..7db33284e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -179,7 +179,6 @@ import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
 import com.lagradost.cloudstream3.utils.txt
-import com.lagradost.cloudstream4.theme.CloudStreamTheme
 import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
@@ -1216,7 +1215,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
         safe {
             val appVer = BuildConfig.VERSION_NAME
-            val lastAppAutoBackup: String = getKey<String>("VERSION_NAME") ?: ""
+            val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
             if (appVer != lastAppAutoBackup) {
                 setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
                 if (lastAppAutoBackup.isEmpty()) return@safe
@@ -1298,14 +1297,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 padRight = false,
                 padTop = false
             )
-
-            composeView.apply {
-                setContent {
-                    CloudStreamTheme {
-                        MainActivityScreen.Content()
-                    }
-                }
-            }
         }
 
         // overscan
@@ -1989,7 +1980,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         handleAppIntent(intent)
 
         ioSafe {
-            runAutoUpdate() // TODO remove this when we update the updater autosearch
+            runAutoUpdate()
         }
 
         FcastManager().init(this, false)
@@ -2027,7 +2018,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
 
         try {
-            if (getKey<Boolean>(HAS_DONE_SETUP_KEY, false) != true) {
+            if (getKey(HAS_DONE_SETUP_KEY, false) != true) {
                 navController.navigate(R.id.navigation_setup_language)
                 // If no plugins bring up extensions screen
             } else if (PluginManager.getPluginsOnline().isEmpty()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivityScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivityScreen.kt
deleted file mode 100644
index 28553b320..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivityScreen.kt
+++ /dev/null
@@ -1,250 +0,0 @@
-package com.lagradost.cloudstream3
-
-import android.text.format.Formatter.formatFileSize
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.LocalActivity
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.lagradost.cloudstream3.mvvm.getStackTracePretty
-import com.lagradost.cloudstream3.ui.settings.APK_CONTENT_TYPE
-import com.lagradost.cloudstream3.ui.settings.APK_PRERELEASE
-import com.lagradost.cloudstream3.ui.settings.APK_REPOSITORY
-import com.lagradost.cloudstream3.ui.settings.APK_USERNAME
-import com.lagradost.cloudstream3.ui.settings.ApkUpdater
-import com.lagradost.cloudstream3.ui.settings.GithubAction
-import com.lagradost.cloudstream3.ui.settings.GithubAction.AutoSearchForUpdate
-import com.lagradost.cloudstream3.ui.settings.GithubAction.Dismiss
-import com.lagradost.cloudstream3.ui.settings.GithubAction.SearchForUpdate
-import com.lagradost.cloudstream3.ui.settings.GithubAction.SkipUpdate
-import com.lagradost.cloudstream3.ui.settings.GithubAction.Update
-import com.lagradost.cloudstream3.ui.settings.GithubState
-import com.lagradost.cloudstream3.ui.settings.GithubUpdateDialogState
-import com.lagradost.cloudstream3.ui.settings.GithubViewModel
-import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
-import com.lagradost.cloudstream4.compose.BlackButton
-import com.lagradost.cloudstream4.compose.Screen
-import com.lagradost.cloudstream4.compose.WhiteButton
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.material.padding
-
-object MainActivityScreen : Screen {
-    @Composable
-    fun githubViewModel(): GithubViewModel? {
-        // By having the ComponentActivity as the owner we can have a singleton viewmodel
-        val activity = LocalActivity.current as? ComponentActivity ?: return null
-        val settings = rememberAppSettings()
-        return viewModel(viewModelStoreOwner = activity) {
-            GithubViewModel(
-                remoteUserName = APK_USERNAME,
-                remoteRepository = APK_REPOSITORY,
-                remotePrereleaseTag = APK_PRERELEASE,
-                remoteContentType = APK_CONTENT_TYPE,
-                versionName = BuildConfig.VERSION_NAME,
-                isPrerelease = BuildConfig.FLAVOR == "prerelease",
-                isDebug = BuildConfig.DEBUG,
-                buildSha = activity.currentCommitHash(),
-                settings = settings,
-                updater = ApkUpdater
-            )/*.apply {
-                onAction(AutoSearchForUpdate) // Remove this for now
-            }*/
-        }
-    }
-
-    @Composable
-    override fun Content() {
-        GithubView()
-    }
-
-    @Composable
-    fun GithubView() {
-        val updateViewModel = githubViewModel() ?: return
-        val state by updateViewModel.state.collectAsState()
-        GithubState(state, updateViewModel::onAction)
-    }
-
-    @Composable
-    fun GithubState(updaterState: GithubState, onAction: (GithubAction) -> Unit) {
-        if (updaterState.dialog == null) {
-            return
-        }
-
-        val title: String
-        val body: @Composable () -> Unit
-        val confirmButton: @Composable () -> Unit
-        val dismissButton: @Composable () -> Unit
-        val cancelable: Boolean
-
-        when (val state = updaterState.dialog.state) {
-            is GithubUpdateDialogState.Error -> {
-                // Only show error if it is initialized by the user
-                if (!updaterState.dialog.isFromUser) return
-
-                cancelable = true
-                title = stringResource(R.string.download_failed)
-                body = { Text(text = state.error.getStackTracePretty()) }
-                confirmButton = {
-                    WhiteButton(text = stringResource(R.string.check_for_update), onClick = {
-                        onAction(SearchForUpdate)
-                    })
-                }
-                dismissButton = {
-                    BlackButton(text = stringResource(R.string.ok), onClick = {
-                        onAction(Dismiss)
-                    })
-                }
-            }
-
-            GithubUpdateDialogState.Loading -> {
-                // Only show loading if it is initialized by the user
-                if (!updaterState.dialog.isFromUser) return
-
-                cancelable = true
-                title = stringResource(R.string.loading)
-                body = {
-                    LinearProgressIndicator(
-                        modifier = Modifier.fillMaxWidth(),
-                        color = MaterialTheme.colorScheme.onBackground,
-                        trackColor = MaterialTheme.colorScheme.surfaceVariant,
-                    )
-                }
-                confirmButton = {}
-                dismissButton = {
-                    BlackButton(text = stringResource(R.string.cancel), onClick = {
-                        onAction(Dismiss)
-                    })
-                }
-            }
-
-            GithubUpdateDialogState.NoUpdateFound -> {
-                // Only show error if it is initialized by the user
-                if (!updaterState.dialog.isFromUser) return
-
-                cancelable = true
-                title = stringResource(R.string.no_update_found)
-                body = {}
-                confirmButton = {
-                    WhiteButton(text = stringResource(R.string.ok), onClick = {
-                        onAction(Dismiss)
-                    })
-                }
-                dismissButton = {}
-            }
-
-            is GithubUpdateDialogState.UpdateFound -> {
-                cancelable = true
-                title = stringResource(
-                    R.string.new_update_format,
-                    (state.oldSha ?: BuildConfig.VERSION_NAME),
-                    (state.newSha ?: state.file.displayName)
-                )
-                body = { Text(text = state.file.changeLog) }
-                confirmButton = {
-                    WhiteButton(text = stringResource(R.string.update), onClick = {
-                        onAction(Update(state.file))
-                    })
-                }
-                dismissButton = {
-                    BlackButton(text = stringResource(R.string.skip_update), onClick = {
-                        onAction(SkipUpdate(state.file))
-                        onAction(Dismiss)
-                    })
-                    BlackButton(text = stringResource(R.string.cancel), onClick = {
-                        onAction(Dismiss)
-                    })
-                }
-            }
-
-            is GithubUpdateDialogState.DownloadProgress -> {
-                cancelable = false
-                title = stringResource(R.string.update_notification_downloading)
-                body = {
-                    if (state.total != null) {
-                        val progress =
-                            (state.progress.toFloat() / state.total.toFloat()).coerceIn(0.0f, 1.0f)
-                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                            Text(
-                                color = MaterialTheme.colorScheme.onBackground,
-                                style = MaterialTheme.typography.bodyMedium,
-                                textAlign = TextAlign.Center,
-                                // Round down the progress to avoid 100%
-                                text = "${(progress * 100.0f).toInt()}% (${
-                                    formatFileSize(
-                                        LocalContext.current,
-                                        state.progress
-                                    )
-                                } / ${
-                                    formatFileSize(
-                                        LocalContext.current,
-                                        state.total
-                                    )
-                                })"
-                            )
-                            Spacer(modifier = Modifier.height(MaterialTheme.padding.medium))
-                            LinearProgressIndicator(
-                                modifier = Modifier.fillMaxWidth(),
-                                color = MaterialTheme.colorScheme.onBackground,
-                                trackColor = MaterialTheme.colorScheme.surfaceVariant,
-                                progress = { progress }
-                            )
-                        }
-                    } else {
-                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                            Text(
-                                color = MaterialTheme.colorScheme.onBackground,
-                                style = MaterialTheme.typography.bodyMedium,
-                                textAlign = TextAlign.Center,
-                                text = formatFileSize(
-                                    LocalContext.current,
-                                    state.progress
-                                )
-                            )
-                            Spacer(modifier = Modifier.height(MaterialTheme.padding.medium))
-                            LinearProgressIndicator(
-                                modifier = Modifier.fillMaxWidth(),
-                                color = MaterialTheme.colorScheme.onBackground,
-                                trackColor = MaterialTheme.colorScheme.surfaceVariant,
-                            )
-                        }
-                    }
-                }
-                confirmButton = {}
-                dismissButton = {
-                    BlackButton(text = stringResource(R.string.cancel), onClick = {
-                        onAction(Dismiss)
-                    })
-                }
-            }
-        }
-
-        AlertDialog(
-            properties = DialogProperties(usePlatformDefaultWidth = false),
-            containerColor = MaterialTheme.colorScheme.background,
-            onDismissRequest = {
-                if (cancelable) {
-                    onAction(Dismiss)
-                }
-            },
-            title = { Text(text = title) },
-            text = body,
-            confirmButton = confirmButton,
-            dismissButton = dismissButton
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
index 0fdccb476..f4e8768d8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
@@ -98,7 +98,7 @@ object VideoClickActionHolder {
             ?.second
     }
 
-    fun getPlayers(context: Context? = null) = allVideoClickActions.filter { it.isPlayer && it.shouldShowSafe(context, null) }
+    fun getPlayers(activity: Activity? = null) = allVideoClickActions.filter { it.isPlayer && it.shouldShowSafe(activity, null) }
 }
 
 abstract class VideoClickAction {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
index b6478b1d9..46b46a2c2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
@@ -60,7 +60,7 @@ open class VlcPackage: OpenInAppAction(
         intent.putExtra("secure_uri", true)
         intent.putExtra("title", video.name)
 
-        val subsLang = getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+        val subsLang = getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         result.subs.firstOrNull {
             subsLang == it.languageCode
         }?.let {
@@ -74,4 +74,4 @@ open class VlcPackage: OpenInAppAction(
         Log.d("VLC", "Position: $position, Duration: $duration")
         updateDurationAndPosition(position, duration)
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
index e49245904..6234297d0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -22,6 +22,7 @@ fun Requests.initClient(context: Context) {
 }
 
 /** Only use ignoreSSL if you know what you are doing*/
+@Prerelease
 fun Requests.initClient(context: Context, ignoreSSL: Boolean = false) {
     this.baseClient = buildDefaultClient(context, ignoreSSL)
 }
@@ -33,11 +34,12 @@ fun buildDefaultClient(context: Context): OkHttpClient {
 }
 
 /** Only use ignoreSSL if you know what you are doing*/
+@Prerelease
 fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClient {
     safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-    val dns = settingsManager.getInt(context.getString(R.string.dns_key), 0)
+    val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
     val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
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 6054bbfaf..829d871d2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -176,11 +176,11 @@ object PluginManager {
 
 
     fun getPluginsOnline(): Array<PluginData> {
-        return getKey<Array<PluginData>>(PLUGINS_KEY) ?: emptyArray()
+        return getKey(PLUGINS_KEY) ?: emptyArray()
     }
 
     fun getPluginsLocal(): Array<PluginData> {
-        return getKey<Array<PluginData>>(PLUGINS_KEY_LOCAL) ?: emptyArray()
+        return getKey(PLUGINS_KEY_LOCAL) ?: emptyArray()
     }
 
     private val CLOUD_STREAM_FOLDER =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index 3879ddca4..5868146c7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -98,7 +98,7 @@ data class PluginWrapper(
 object RepositoryManager {
     const val ONLINE_PLUGINS_FOLDER = "Extensions"
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
-        getKey<Array<RepositoryData>>("PREBUILT_REPOSITORIES") ?: emptyArray()
+        getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
     private val GH_REGEX =
         Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
@@ -141,19 +141,11 @@ object RepositoryManager {
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
             safeAsync {
-                if (fixedUrl.startsWith("!")) {
-                    val response = app.get("https://py.md/${fixedUrl.removePrefix("!")}", allowRedirects = false)
-                    val url = response.headers["Location"] ?: return@safeAsync null
-                    if (url.startsWith("https://py.md/404")) return@safeAsync null
-                    if (url.removeSuffix("/") == "https://py.md") return@safeAsync null
-                    return@safeAsync url
-                } else {
-                    val response = app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false)
-                    val url = response.headers["Location"] ?: return@safeAsync null
-                    if (url.startsWith("https://cutt.ly/404")) return@safeAsync null
-                    if (url.removeSuffix("/") == "https://cutt.ly") return@safeAsync null
-                    return@safeAsync url
-                }
+                val response = app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false)
+                val url = response.headers["Location"] ?: return@safeAsync null
+                if (url.startsWith("https://cutt.ly/404")) return@safeAsync null
+                if (url.removeSuffix("/") == "https://cutt.ly") return@safeAsync null
+                return@safeAsync url
             }
         } else null
     }
@@ -240,7 +232,7 @@ object RepositoryManager {
     }
 
     fun getRepositories(): Array<RepositoryData> {
-        return getKey<Array<RepositoryData>>(REPOSITORIES_KEY) ?: emptyArray()
+        return getKey(REPOSITORIES_KEY) ?: emptyArray()
     }
 
     // Don't want to read before we write in another thread
diff --git a/app/src/main/java/com/lagradost/cloudstream3/receivers/PackageInstallerStatusReceiver.kt b/app/src/main/java/com/lagradost/cloudstream3/receivers/PackageInstallerStatusReceiver.kt
deleted file mode 100644
index 1739b8147..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/receivers/PackageInstallerStatusReceiver.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.lagradost.cloudstream3.receivers
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import com.lagradost.cloudstream3.utils.getSafeParcelableExtra
-
-/** https://medium.com/@solrudev/painless-building-of-an-android-package-installer-app-d5a09b5df432 */
-class PackageInstallerStatusReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -1)) {
-            PackageInstaller.STATUS_PENDING_USER_ACTION -> {
-                intent.getSafeParcelableExtra<Intent>(Intent.EXTRA_INTENT)?.let { userAction->
-                    userAction.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    context.startActivity(userAction)
-                }
-            }
-            PackageInstaller.STATUS_SUCCESS -> {
-                // do something on success
-            }
-            else -> {
-                val message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
-                println("PackageInstallerStatusReceiver: status=$status, message=$message")
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
index c0f0e4a03..60e41e8b3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
@@ -6,12 +6,13 @@ import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.base64Encode
-import com.lagradost.cloudstream3.splitUrlParameters
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
+import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonNames
+import java.net.URI
 import java.security.SecureRandom
 
 data class AuthLoginPage(
@@ -171,8 +172,10 @@ abstract class AuthAPI {
             get() = unixTimeMS
 
         fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
-            return splitUrlParameters(
-                redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
+            return splitQuery(
+                URI(
+                    redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
+                ).toURL()
             )
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
index a57ec6716..075c08bb8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
@@ -2,11 +2,11 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import androidx.annotation.StringRes
 import androidx.core.net.toUri
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
@@ -32,12 +32,7 @@ import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
-import com.lagradost.cloudstream3.utils.serializers.NonEmptySerializer
 import com.lagradost.cloudstream3.utils.txt
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.math.BigInteger
 import java.security.SecureRandom
 import java.text.SimpleDateFormat
@@ -50,18 +45,22 @@ import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
 class SimklApi : SyncAPI() {
-    override val name = "Simkl"
+    override var name = "Simkl"
     override val idPrefix = "simkl"
 
+    val key = "simkl-key"
     override val redirectUrlIdentifier = "simkl"
     override val hasOAuth2 = true
     override val hasPin = true
     override var requireLibraryRefresh = true
-    override val mainUrl = "https://api.simkl.com"
+    override var mainUrl = "https://api.simkl.com"
     override val icon = R.drawable.simkl_logo
     override val createAccountUrl = "$mainUrl/signup"
     override val syncIdName = SyncIdName.Simkl
 
+    /** Automatically adds simkl auth headers */
+    // private val interceptor = HeaderInterceptor()
+
     /**
      * This is required to override the reported last activity as simkl activites
      * may not always update based on testing.
@@ -70,99 +69,63 @@ class SimklApi : SyncAPI() {
 
     private object SimklCache {
         private const val SIMKL_CACHE_KEY = "SIMKL_API_CACHE"
+
         enum class CacheTimes(val value: String) {
             OneMonth("30d"),
             ThirtyMinutes("30m")
         }
 
-        @Serializable
-        private data class MediaObjectCacheEntry(
-            @JsonProperty("obj") @SerialName("obj") val obj: MediaObject?,
-            @JsonProperty("validUntil") @SerialName("validUntil") val validUntil: Long,
-            @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long = APIHolder.unixTime,
-        )
+        private class SimklCacheWrapper<T>(
+            @JsonProperty("obj") val obj: T?,
+            @JsonProperty("validUntil") val validUntil: Long,
+            @JsonProperty("cacheTime") val cacheTime: Long = APIHolder.unixTime,
+        ) {
+            /** Returns true if cache is newer than cacheDays */
+            fun isFresh(): Boolean {
+                return validUntil > APIHolder.unixTime
+            }
 
-        @Serializable
-        private data class EpisodesCacheEntry(
-            @JsonProperty("obj") @SerialName("obj") val obj: Array<EpisodeMetadata>?,
-            @JsonProperty("validUntil") @SerialName("validUntil") val validUntil: Long,
-            @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long = APIHolder.unixTime,
-        )
-
-        /**
-         * Minimal class used only to peek at an entry's expiry, without caring which of the
-         * concrete entry types above actually produced it.
-         */
-        @Serializable
-        private data class CacheFreshness(
-            @JsonProperty("validUntil") @SerialName("validUntil") val validUntil: Long,
-        )
-
-        private fun Long.isFresh(): Boolean = this > APIHolder.unixTime
-
-        private fun Long.remaining(): Duration {
-            val unixTime = APIHolder.unixTime
-            return if (this > unixTime) {
-                (this - unixTime).toDuration(DurationUnit.SECONDS)
-            } else {
-                Duration.ZERO
+            fun remainingTime(): Duration {
+                val unixTime = APIHolder.unixTime
+                return if (validUntil > unixTime) {
+                    (validUntil - unixTime).toDuration(DurationUnit.SECONDS)
+                } else {
+                    Duration.ZERO
+                }
             }
         }
 
         fun cleanOldCache() {
             getKeys(SIMKL_CACHE_KEY)?.forEach {
-                val isOld = getKey<CacheFreshness>(it)?.validUntil?.isFresh() == false
-                if (isOld) removeKey(it)
-            }
-        }
-
-        fun setMediaObject(path: String, value: MediaObject, cacheTime: Duration) {
-            debugPrint { "Set cache: $SIMKL_CACHE_KEY/$path for ${cacheTime.inWholeDays} days or ${cacheTime.inWholeSeconds} seconds." }
-            setKey(
-                SIMKL_CACHE_KEY,
-                path,
-                MediaObjectCacheEntry(value, APIHolder.unixTime + cacheTime.inWholeSeconds).toJson(),
-            )
-        }
-
-        /** Gets the cached [MediaObject], if it's not fresh returns null and removes it from cache */
-        fun getMediaObject(path: String): MediaObject? {
-            val cache = getKey<String>(SIMKL_CACHE_KEY, path)?.let {
-                tryParseJson<MediaObjectCacheEntry>(it)
-            }
-
-            return if (cache?.validUntil?.isFresh() == true) {
-                debugPrint {
-                    "Cache hit at: $SIMKL_CACHE_KEY/$path. " +
-                        "Remains fresh for ${cache.validUntil.remaining().inWholeDays} days or ${cache.validUntil.remaining().inWholeSeconds} seconds."
+                val isOld = CloudStreamApp.getKey<SimklCacheWrapper<Any>>(it)?.isFresh() == false
+                if (isOld) {
+                    removeKey(it)
                 }
-                cache.obj
-            } else {
-                debugPrint { "Cache miss at: $SIMKL_CACHE_KEY/$path" }
-                removeKey(SIMKL_CACHE_KEY, path)
-                null
             }
         }
 
-        fun setEpisodes(path: String, value: Array<EpisodeMetadata>, cacheTime: Duration) {
+        fun <T> setKey(path: String, value: T, cacheTime: Duration) {
             debugPrint { "Set cache: $SIMKL_CACHE_KEY/$path for ${cacheTime.inWholeDays} days or ${cacheTime.inWholeSeconds} seconds." }
             setKey(
                 SIMKL_CACHE_KEY,
                 path,
-                EpisodesCacheEntry(value, APIHolder.unixTime + cacheTime.inWholeSeconds).toJson(),
+                // Storing as plain sting is required to make generics work.
+                SimklCacheWrapper(value, APIHolder.unixTime + cacheTime.inWholeSeconds).toJson()
             )
         }
 
-        /** Gets the cached episode list, if it's not fresh returns null and removes it from cache */
-        fun getEpisodes(path: String): Array<EpisodeMetadata>? {
+        /**
+         * Gets cached object, if object is not fresh returns null and removes it from cache
+         */
+        inline fun <reified T : Any> getKey(path: String): T? {
             val cache = getKey<String>(SIMKL_CACHE_KEY, path)?.let {
-                tryParseJson<EpisodesCacheEntry>(it)
+                tryParseJson<SimklCacheWrapper<T>>(it)
             }
 
-            return if (cache?.validUntil?.isFresh() == true) {
+            return if (cache?.isFresh() == true) {
                 debugPrint {
                     "Cache hit at: $SIMKL_CACHE_KEY/$path. " +
-                        "Remains fresh for ${cache.validUntil.remaining().inWholeDays} days or ${cache.validUntil.remaining().inWholeSeconds} seconds."
+                            "Remains fresh for ${cache.remainingTime().inWholeDays} days or ${cache.remainingTime().inWholeSeconds} seconds."
                 }
                 cache.obj
             } else {
@@ -206,7 +169,7 @@ class SimklApi : SyncAPI() {
                         )
                     )
                 )
-            } catch (_: Exception) {
+            } catch (e: Exception) {
                 null
             }
         }
@@ -222,7 +185,7 @@ class SimklApi : SyncAPI() {
         enum class SimklListStatusType(
             var value: Int,
             @StringRes val stringRes: Int,
-            val originalName: String?,
+            val originalName: String?
         ) {
             Watching(0, R.string.type_watching, "watching"),
             Completed(1, R.string.type_completed, "completed"),
@@ -241,92 +204,83 @@ class SimklApi : SyncAPI() {
             }
         }
 
+        // -------------------
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = TokenRequest.Serializer::class)
         data class TokenRequest(
-            @JsonProperty("code") @SerialName("code") val code: String,
-            @JsonProperty("client_id") @SerialName("client_id") val clientId: String = CLIENT_ID,
-            @JsonProperty("client_secret") @SerialName("client_secret") val clientSecret: String = CLIENT_SECRET,
-            @JsonProperty("redirect_uri") @SerialName("redirect_uri") val redirectUri: String = "$APP_STRING://simkl",
-            @JsonProperty("grant_type") @SerialName("grant_type") val grantType: String = "authorization_code",
-        ) {
-            object Serializer : NonEmptySerializer<TokenRequest>(TokenRequest.generatedSerializer())
-        }
+            @JsonProperty("code") val code: String,
+            @JsonProperty("client_id") val clientId: String = CLIENT_ID,
+            @JsonProperty("client_secret") val clientSecret: String = CLIENT_SECRET,
+            @JsonProperty("redirect_uri") val redirectUri: String = "$APP_STRING://simkl",
+            @JsonProperty("grant_type") val grantType: String = "authorization_code"
+        )
 
-        @Serializable
         data class TokenResponse(
             /** No expiration date */
-            @JsonProperty("access_token") @SerialName("access_token") val accessToken: String,
-            @JsonProperty("token_type") @SerialName("token_type") val tokenType: String,
-            @JsonProperty("scope") @SerialName("scope") val scope: String,
+            @JsonProperty("access_token") val accessToken: String,
+            @JsonProperty("token_type") val tokenType: String,
+            @JsonProperty("scope") val scope: String
         )
+        // -------------------
 
         /** https://simkl.docs.apiary.io/#reference/users/settings/receive-settings */
-        @Serializable
         data class SettingsResponse(
-            @JsonProperty("user") @SerialName("user") val user: User,
-            @JsonProperty("account") @SerialName("account") val account: Account,
+            @JsonProperty("user")
+            val user: User,
+            @JsonProperty("account")
+            val account: Account,
         ) {
-            @Serializable
             data class User(
-                @JsonProperty("name") @SerialName("name") val name: String,
-                @JsonProperty("avatar") @SerialName("avatar") val avatar: String, // Url
+                @JsonProperty("name")
+                val name: String,
+                /** Url */
+                @JsonProperty("avatar")
+                val avatar: String
             )
 
-            @Serializable
             data class Account(
-                @JsonProperty("id") @SerialName("id") val id: Int,
+                @JsonProperty("id")
+                val id: Int,
             )
         }
 
-        @Serializable
         data class PinAuthResponse(
-            @JsonProperty("result") @SerialName("result") val result: String,
-            @JsonProperty("device_code") @SerialName("device_code") val deviceCode: String,
-            @JsonProperty("user_code") @SerialName("user_code") val userCode: String,
-            @JsonProperty("verification_url") @SerialName("verification_url") val verificationUrl: String,
-            @JsonProperty("expires_in") @SerialName("expires_in") val expiresIn: Int,
-            @JsonProperty("interval") @SerialName("interval") val interval: Int,
+            @JsonProperty("result") val result: String,
+            @JsonProperty("device_code") val deviceCode: String,
+            @JsonProperty("user_code") val userCode: String,
+            @JsonProperty("verification_url") val verificationUrl: String,
+            @JsonProperty("expires_in") val expiresIn: Int,
+            @JsonProperty("interval") val interval: Int,
         )
 
-        @Serializable
         data class PinExchangeResponse(
-            @JsonProperty("result") @SerialName("result") val result: String,
-            @JsonProperty("message") @SerialName("message") val message: String? = null,
-            @JsonProperty("access_token") @SerialName("access_token") val accessToken: String? = null,
+            @JsonProperty("result") val result: String,
+            @JsonProperty("message") val message: String? = null,
+            @JsonProperty("access_token") val accessToken: String? = null,
         )
 
-        @Serializable
+        // -------------------
         data class ActivitiesResponse(
-            @JsonProperty("all") @SerialName("all") val all: String?,
-            @JsonProperty("tv_shows") @SerialName("tv_shows") val tvShows: UpdatedAt,
-            @JsonProperty("anime") @SerialName("anime") val anime: UpdatedAt,
-            @JsonProperty("movies") @SerialName("movies") val movies: UpdatedAt,
+            @JsonProperty("all") val all: String?,
+            @JsonProperty("tv_shows") val tvShows: UpdatedAt,
+            @JsonProperty("anime") val anime: UpdatedAt,
+            @JsonProperty("movies") val movies: UpdatedAt,
         ) {
-            @Serializable
             data class UpdatedAt(
-                @JsonProperty("all") @SerialName("all") val all: String?,
-                @JsonProperty("removed_from_list") @SerialName("removed_from_list") val removedFromList: String?,
-                @JsonProperty("rated_at") @SerialName("rated_at") val ratedAt: String?,
+                @JsonProperty("all") val all: String?,
+                @JsonProperty("removed_from_list") val removedFromList: String?,
+                @JsonProperty("rated_at") val ratedAt: String?,
             )
         }
 
         /** https://simkl.docs.apiary.io/#reference/tv/episodes/get-tv-show-episodes */
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = EpisodeMetadata.Serializer::class)
         data class EpisodeMetadata(
-            @JsonProperty("title") @SerialName("title") val title: String?,
-            @JsonProperty("description") @SerialName("description") val description: String?,
-            @JsonProperty("season") @SerialName("season") val season: Int?,
-            @JsonProperty("episode") @SerialName("episode") val episode: Int,
-            @JsonProperty("img") @SerialName("img") val img: String?,
+            @JsonProperty("title") val title: String?,
+            @JsonProperty("description") val description: String?,
+            @JsonProperty("season") val season: Int?,
+            @JsonProperty("episode") val episode: Int,
+            @JsonProperty("img") val img: String?
         ) {
-            object Serializer : NonEmptySerializer<EpisodeMetadata>(EpisodeMetadata.generatedSerializer())
-
             companion object {
                 fun convertToEpisodes(list: List<EpisodeMetadata>?): List<MediaObject.Season.Episode>? {
                     return list?.map {
@@ -346,58 +300,40 @@ class SimklApi : SyncAPI() {
 
         /**
          * https://simkl.docs.apiary.io/#introduction/about-simkl-api/standard-media-objects
-         * Useful for finding shows from metadata.
+         * Useful for finding shows from metadata
          */
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = MediaObject.Serializer::class)
-        data class MediaObject(
-            @JsonProperty("title") @SerialName("title") val title: String?,
-            @JsonProperty("year") @SerialName("year") val year: Int?,
-            @JsonProperty("ids") @SerialName("ids") val ids: Ids?,
-            @JsonProperty("total_episodes") @SerialName("total_episodes") val totalEpisodes: Int? = null,
-            @JsonProperty("status") @SerialName("status") val status: String? = null,
-            @JsonProperty("poster") @SerialName("poster") val poster: String? = null,
-            @JsonProperty("type") @SerialName("type") val type: String? = null,
-            @JsonProperty("seasons") @SerialName("seasons") val seasons: List<Season>? = null,
-            @JsonProperty("episodes") @SerialName("episodes") val episodes: List<Season.Episode>? = null,
+        open class MediaObject(
+            @JsonProperty("title") val title: String?,
+            @JsonProperty("year") val year: Int?,
+            @JsonProperty("ids") val ids: Ids?,
+            @JsonProperty("total_episodes") val totalEpisodes: Int? = null,
+            @JsonProperty("status") val status: String? = null,
+            @JsonProperty("poster") val poster: String? = null,
+            @JsonProperty("type") val type: String? = null,
+            @JsonProperty("seasons") val seasons: List<Season>? = null,
+            @JsonProperty("episodes") val episodes: List<Season.Episode>? = null
         ) {
-            object Serializer : NonEmptySerializer<MediaObject>(MediaObject.generatedSerializer())
-
             fun hasEnded(): Boolean {
                 return status == "released" || status == "ended"
             }
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
-            @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-            @KeepGeneratedSerializer
-            @Serializable(with = Season.Serializer::class)
             data class Season(
-                @JsonProperty("number") @SerialName("number") val number: Int,
-                @JsonProperty("episodes") @SerialName("episodes") val episodes: List<Episode>,
+                @JsonProperty("number") val number: Int,
+                @JsonProperty("episodes") val episodes: List<Episode>
             ) {
-                object Serializer : NonEmptySerializer<Season>(Season.generatedSerializer())
-
-                @Serializable
-                data class Episode(
-                    @JsonProperty("number") @SerialName("number") val number: Int,
-                )
+                data class Episode(@JsonProperty("number") val number: Int)
             }
 
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
-            @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-            @KeepGeneratedSerializer
-            @Serializable(with = Ids.Serializer::class)
             data class Ids(
-                @JsonProperty("simkl") @SerialName("simkl") val simkl: Int?,
-                @JsonProperty("imdb") @SerialName("imdb") val imdb: String? = null,
-                @JsonProperty("tmdb") @SerialName("tmdb") val tmdb: String? = null,
-                @JsonProperty("mal") @SerialName("mal") val mal: String? = null,
-                @JsonProperty("anilist") @SerialName("anilist") val anilist: String? = null,
+                @JsonProperty("simkl") val simkl: Int?,
+                @JsonProperty("imdb") val imdb: String? = null,
+                @JsonProperty("tmdb") val tmdb: String? = null,
+                @JsonProperty("mal") val mal: String? = null,
+                @JsonProperty("anilist") val anilist: String? = null,
             ) {
-                object Serializer : NonEmptySerializer<Ids>(Ids.generatedSerializer())
-
                 companion object {
                     fun fromMap(map: Map<SimklSyncServices, String>): Ids {
                         return Ids(
@@ -405,21 +341,20 @@ class SimklApi : SyncAPI() {
                             imdb = map[SimklSyncServices.Imdb],
                             tmdb = map[SimklSyncServices.Tmdb],
                             mal = map[SimklSyncServices.Mal],
-                            anilist = map[SimklSyncServices.AniList],
+                            anilist = map[SimklSyncServices.AniList]
                         )
                     }
                 }
             }
 
             fun toSyncSearchResult(): SyncAPI.SyncSearchResult? {
-                val currentIds = this.ids
                 return SyncAPI.SyncSearchResult(
                     this.title ?: return null,
                     "Simkl",
-                    currentIds?.simkl?.toString() ?: return null,
-                    getUrlFromId(currentIds.simkl),
+                    this.ids?.simkl?.toString() ?: return null,
+                    getUrlFromId(this.ids.simkl),
                     this.poster?.let { getPosterUrl(it) },
-                    if (this.type == "movie") TvType.Movie else TvType.TvSeries,
+                    if (this.type == "movie") TvType.Movie else TvType.TvSeries
                 )
             }
         }
@@ -434,7 +369,7 @@ class SimklApi : SyncAPI() {
                 private var addEpisodes: Pair<List<MediaObject.Season>?, List<MediaObject.Season.Episode>?>? = null,
                 private var removeEpisodes: Pair<List<MediaObject.Season>?, List<MediaObject.Season.Episode>?>? = null,
                 // Required for knowing if the status should be overwritten
-                private var onList: Boolean = false,
+                private var onList: Boolean = false
             ) {
                 fun token(token: AuthToken) = apply { this.headers = getHeaders(token) }
                 fun apiUrl(url: String) = apply { this.url = url }
@@ -448,7 +383,11 @@ class SimklApi : SyncAPI() {
                 fun status(newStatus: Int?, oldStatus: Int?) = apply {
                     onList = oldStatus != null
                     // Only set status if its new
-                    this.status = if (newStatus != oldStatus) newStatus else null
+                    if (newStatus != oldStatus) {
+                        this.status = newStatus
+                    } else {
+                        this.status = null
+                    }
                 }
 
                 fun episodes(
@@ -457,6 +396,7 @@ class SimklApi : SyncAPI() {
                     oldEpisodes: Int?,
                 ) = apply {
                     if (allEpisodes == null || newEpisodes == null) return@apply
+
                     fun getEpisodes(rawEpisodes: List<EpisodeMetadata>) =
                         if (rawEpisodes.any { it.season != null }) {
                             EpisodeMetadata.convertToSeasons(rawEpisodes) to null
@@ -467,12 +407,12 @@ class SimklApi : SyncAPI() {
                     // Do not add episodes if there is no change
                     if (newEpisodes > (oldEpisodes ?: 0)) {
                         this.addEpisodes = getEpisodes(allEpisodes.take(newEpisodes))
+
                         // Set to watching if episodes are added and there is no current status
                         if (!onList) {
                             status = SimklListStatusType.Watching.value
                         }
                     }
-
                     if ((oldEpisodes ?: 0) > newEpisodes) {
                         this.removeEpisodes = getEpisodes(allEpisodes.drop(newEpisodes))
                     }
@@ -484,17 +424,19 @@ class SimklApi : SyncAPI() {
                     return if (this.status == SimklListStatusType.None.value) {
                         app.post(
                             "$url/sync/history/remove",
-                            json = HistoryRequest(
+                            json = StatusRequest(
                                 shows = listOf(HistoryMediaObject(ids = ids)),
-                                movies = emptyList(),
+                                movies = emptyList()
                             ),
-                            headers = headers,
+                            headers = headers
                         ).isSuccessful
                     } else {
                         val statusResponse = this.status?.let { setStatus ->
-                            val newStatus = SimklListStatusType.entries.firstOrNull {
-                                it.value == setStatus
-                            }?.originalName ?: SimklListStatusType.Watching.originalName!!
+                            val newStatus =
+                                SimklListStatusType.entries
+                                    .firstOrNull { it.value == setStatus }?.originalName
+                                    ?: SimklListStatusType.Watching.originalName!!
+
                             app.post(
                                 "${this.url}/sync/add-to-list",
                                 json = StatusRequest(
@@ -504,40 +446,41 @@ class SimklApi : SyncAPI() {
                                             null,
                                             ids,
                                             newStatus,
-                                        ),
-                                    ),
-                                    movies = emptyList(),
+                                        )
+                                    ), movies = emptyList()
                                 ),
-                                headers = headers,
+                                headers = headers
                             ).isSuccessful
                         } ?: true
 
                         val episodeRemovalResponse = removeEpisodes?.let { (seasons, episodes) ->
                             app.post(
                                 "${this.url}/sync/history/remove",
-                                json = HistoryRequest(
+                                json = StatusRequest(
                                     shows = listOf(
                                         HistoryMediaObject(
                                             ids = ids,
                                             seasons = seasons,
-                                            episodes = episodes,
-                                        ),
+                                            episodes = episodes
+                                        )
                                     ),
-                                    movies = emptyList(),
+                                    movies = emptyList()
                                 ),
-                                headers = headers,
+                                headers = headers
                             ).isSuccessful
                         } ?: true
 
                         // You cannot rate if you are planning to watch it.
-                        val shouldRate = score != null && status != SimklListStatusType.Planning.value
+                        val shouldRate =
+                            score != null && status != SimklListStatusType.Planning.value
                         val realScore = if (shouldRate) score else null
+
                         val historyResponse =
                             // Only post if there are episodes or score to upload
                             if (addEpisodes != null || shouldRate) {
                                 app.post(
                                     "${this.url}/sync/history",
-                                    json = HistoryRequest(
+                                    json = StatusRequest(
                                         shows = listOf(
                                             HistoryMediaObject(
                                                 null,
@@ -547,33 +490,34 @@ class SimklApi : SyncAPI() {
                                                 addEpisodes?.second,
                                                 realScore,
                                                 realScore?.let { time },
-                                            ),
-                                        ),
-                                        movies = emptyList(),
+                                            )
+                                        ), movies = emptyList()
                                     ),
-                                    headers = headers,
+                                    headers = headers
                                 ).isSuccessful
-                            } else true
+                            } else {
+                                true
+                            }
+
                         statusResponse && episodeRemovalResponse && historyResponse
                     }
                 }
             }
         }
 
-        fun getHeaders(token: AuthToken): Map<String, String> = mapOf(
-            "Authorization" to "Bearer ${token.accessToken}",
-            "simkl-api-key" to CLIENT_ID,
-        )
+        fun getHeaders(token: AuthToken): Map<String, String> =
+            mapOf("Authorization" to "Bearer ${token.accessToken}", "simkl-api-key" to CLIENT_ID)
 
         suspend fun getEpisodes(
             simklId: Int?,
             type: String?,
             episodes: Int?,
-            hasEnded: Boolean?,
+            hasEnded: Boolean?
         ): Array<EpisodeMetadata>? {
             if (simklId == null) return null
+
             val cacheKey = "Episodes/$simklId"
-            val cache = SimklCache.getEpisodes(cacheKey)
+            val cache = SimklCache.getKey<Array<EpisodeMetadata>>(cacheKey)
 
             // Return cached result if its higher or equal the amount of episodes.
             if (cache != null && cache.size >= (episodes ?: 0)) {
@@ -590,7 +534,6 @@ class SimklApi : SyncAPI() {
                     }.toTypedArray()
                 }
             }
-
             val url = when (type) {
                 "anime" -> "https://api.simkl.com/anime/episodes/$simklId"
                 "tv" -> "https://api.simkl.com/tv/episodes/$simklId"
@@ -605,86 +548,57 @@ class SimklApi : SyncAPI() {
                         if (hasEnded == true) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value
 
                     // 1 Month cache
-                    SimklCache.setEpisodes(cacheKey, it, Duration.parse(cacheTime))
+                    SimklCache.setKey(cacheKey, it, Duration.parse(cacheTime))
                 }
         }
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = HistoryMediaObject.Serializer::class)
-        data class HistoryMediaObject(
-            @JsonProperty("title") @SerialName("title") val title: String? = null,
-            @JsonProperty("year") @SerialName("year") val year: Int? = null,
-            @JsonProperty("ids") @SerialName("ids") val ids: MediaObject.Ids? = null,
-            @JsonProperty("seasons") @SerialName("seasons") val seasons: List<MediaObject.Season>? = null,
-            @JsonProperty("episodes") @SerialName("episodes") val episodes: List<MediaObject.Season.Episode>? = null,
-            @JsonProperty("rating") @SerialName("rating") val rating: Int? = null,
-            @JsonProperty("rated_at") @SerialName("rated_at") val ratedAt: String? = null,
-        ) {
-            object Serializer : NonEmptySerializer<HistoryMediaObject>(HistoryMediaObject.generatedSerializer())
-        }
+        class HistoryMediaObject(
+            @JsonProperty("title") title: String? = null,
+            @JsonProperty("year") year: Int? = null,
+            @JsonProperty("ids") ids: Ids? = null,
+            @JsonProperty("seasons") seasons: List<Season>? = null,
+            @JsonProperty("episodes") episodes: List<Season.Episode>? = null,
+            @JsonProperty("rating") val rating: Int? = null,
+            @JsonProperty("rated_at") val ratedAt: String? = null,
+        ) : MediaObject(title, year, ids, seasons = seasons, episodes = episodes)
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = RatingMediaObject.Serializer::class)
-        data class RatingMediaObject(
-            @JsonProperty("title") @SerialName("title") val title: String? = null,
-            @JsonProperty("year") @SerialName("year") val year: Int? = null,
-            @JsonProperty("ids") @SerialName("ids") val ids: MediaObject.Ids? = null,
-            @JsonProperty("rating") @SerialName("rating") val rating: Int,
-            @JsonProperty("rated_at") @SerialName("rated_at") val ratedAt: String? = getDateTime(APIHolder.unixTime),
-        ) {
-            object Serializer : NonEmptySerializer<RatingMediaObject>(RatingMediaObject.generatedSerializer())
-        }
+        class RatingMediaObject(
+            @JsonProperty("title") title: String?,
+            @JsonProperty("year") year: Int?,
+            @JsonProperty("ids") ids: Ids?,
+            @JsonProperty("rating") val rating: Int,
+            @JsonProperty("rated_at") val ratedAt: String? = getDateTime(APIHolder.unixTime)
+        ) : MediaObject(title, year, ids)
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = StatusMediaObject.Serializer::class)
-        data class StatusMediaObject(
-            @JsonProperty("title") @SerialName("title") val title: String? = null,
-            @JsonProperty("year") @SerialName("year") val year: Int? = null,
-            @JsonProperty("ids") @SerialName("ids") val ids: MediaObject.Ids? = null,
-            @JsonProperty("to") @SerialName("to") val to: String,
-            @JsonProperty("watched_at") @SerialName("watched_at") val watchedAt: String? = getDateTime(APIHolder.unixTime),
-        ) {
-            object Serializer : NonEmptySerializer<StatusMediaObject>(StatusMediaObject.generatedSerializer())
-        }
+        class StatusMediaObject(
+            @JsonProperty("title") title: String?,
+            @JsonProperty("year") year: Int?,
+            @JsonProperty("ids") ids: Ids?,
+            @JsonProperty("to") val to: String,
+            @JsonProperty("watched_at") val watchedAt: String? = getDateTime(APIHolder.unixTime)
+        ) : MediaObject(title, year, ids)
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = StatusRequest.Serializer::class)
         data class StatusRequest(
-            @JsonProperty("movies") @SerialName("movies") val movies: List<StatusMediaObject>,
-            @JsonProperty("shows") @SerialName("shows") val shows: List<StatusMediaObject>,
-        ) {
-            object Serializer : NonEmptySerializer<StatusRequest>(StatusRequest.generatedSerializer())
-        }
-
-        /** Same shape as [StatusRequest], for the endpoints that post [HistoryMediaObject]s instead. */
-        @JsonInclude(JsonInclude.Include.NON_EMPTY)
-        @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @KeepGeneratedSerializer
-        @Serializable(with = HistoryRequest.Serializer::class)
-        data class HistoryRequest(
-            @JsonProperty("movies") @SerialName("movies") val movies: List<HistoryMediaObject>,
-            @JsonProperty("shows") @SerialName("shows") val shows: List<HistoryMediaObject>,
-        ) {
-            object Serializer : NonEmptySerializer<HistoryRequest>(HistoryRequest.generatedSerializer())
-        }
+            @JsonProperty("movies") val movies: List<MediaObject>,
+            @JsonProperty("shows") val shows: List<MediaObject>
+        )
 
         /** https://simkl.docs.apiary.io/#reference/sync/get-all-items/get-all-items-in-the-user's-watchlist */
-        @Serializable
         data class AllItemsResponse(
-            @JsonProperty("shows") @SerialName("shows") val shows: List<ShowMetadata> = emptyList(),
-            @JsonProperty("anime") @SerialName("anime") val anime: List<ShowMetadata> = emptyList(),
-            @JsonProperty("movies") @SerialName("movies") val movies: List<MovieMetadata> = emptyList(),
+            @JsonProperty("shows")
+            val shows: List<ShowMetadata> = emptyList(),
+            @JsonProperty("anime")
+            val anime: List<ShowMetadata> = emptyList(),
+            @JsonProperty("movies")
+            val movies: List<MovieMetadata> = emptyList(),
         ) {
             companion object {
                 fun merge(first: AllItemsResponse?, second: AllItemsResponse?): AllItemsResponse {
+
                     // Replace the first item with the same id, or add the new item
                     fun <T> MutableList<T>.replaceOrAddItem(newItem: T, predicate: (T) -> Boolean) {
                         for (i in this.indices) {
@@ -693,10 +607,10 @@ class SimklApi : SyncAPI() {
                                 return
                             }
                         }
-
                         this.add(newItem)
                     }
 
+                    //
                     fun <T : Metadata> merge(
                         first: List<T>?,
                         second: List<T>?
@@ -730,17 +644,15 @@ class SimklApi : SyncAPI() {
                 fun toLibraryItem(): SyncAPI.LibraryItem
             }
 
-            @Serializable
             data class MovieMetadata(
-                @JsonProperty("last_watched_at") @SerialName("last_watched_at") override val lastWatchedAt: String?,
-                @JsonProperty("status") @SerialName("status") override val status: String,
-                @JsonProperty("user_rating") @SerialName("user_rating") override val userRating: Int?,
-                @JsonProperty("last_watched") @SerialName("last_watched") override val lastWatched: String?,
-                @JsonProperty("watched_episodes_count") @SerialName("watched_episodes_count") override val watchedEpisodesCount: Int?,
-                @JsonProperty("total_episodes_count") @SerialName("total_episodes_count") override val totalEpisodesCount: Int?,
-                @JsonProperty("movie") @SerialName("movie") val movie: ShowMetadata.Show,
+                @JsonProperty("last_watched_at") override val lastWatchedAt: String?,
+                @JsonProperty("status") override val status: String,
+                @JsonProperty("user_rating") override val userRating: Int?,
+                @JsonProperty("last_watched") override val lastWatched: String?,
+                @JsonProperty("watched_episodes_count") override val watchedEpisodesCount: Int?,
+                @JsonProperty("total_episodes_count") override val totalEpisodesCount: Int?,
+                val movie: ShowMetadata.Show
             ) : Metadata {
-                @JsonIgnore
                 override fun getIds(): ShowMetadata.Show.Ids {
                     return this.movie.ids
                 }
@@ -760,22 +672,20 @@ class SimklApi : SyncAPI() {
                         null,
                         null,
                         this.movie.year?.toYear(),
-                        movie.ids.simkl,
+                        movie.ids.simkl
                     )
                 }
             }
 
-            @Serializable
             data class ShowMetadata(
-                @JsonProperty("last_watched_at") @SerialName("last_watched_at") override val lastWatchedAt: String?,
-                @JsonProperty("status") @SerialName("status") override val status: String,
-                @JsonProperty("user_rating") @SerialName("user_rating") override val userRating: Int?,
-                @JsonProperty("last_watched") @SerialName("last_watched") override val lastWatched: String?,
-                @JsonProperty("watched_episodes_count") @SerialName("watched_episodes_count") override val watchedEpisodesCount: Int?,
-                @JsonProperty("total_episodes_count") @SerialName("total_episodes_count") override val totalEpisodesCount: Int?,
-                @JsonProperty("show") @SerialName("show") val show: Show,
+                @JsonProperty("last_watched_at") override val lastWatchedAt: String?,
+                @JsonProperty("status") override val status: String,
+                @JsonProperty("user_rating") override val userRating: Int?,
+                @JsonProperty("last_watched") override val lastWatched: String?,
+                @JsonProperty("watched_episodes_count") override val watchedEpisodesCount: Int?,
+                @JsonProperty("total_episodes_count") override val totalEpisodesCount: Int?,
+                @JsonProperty("show") val show: Show
             ) : Metadata {
-                @JsonIgnore
                 override fun getIds(): Show.Ids {
                     return this.show.ids
                 }
@@ -795,30 +705,28 @@ class SimklApi : SyncAPI() {
                         null,
                         null,
                         this.show.year?.toYear(),
-                        show.ids.simkl,
+                        show.ids.simkl
                     )
                 }
 
-                @Serializable
                 data class Show(
-                    @JsonProperty("title") @SerialName("title") val title: String,
-                    @JsonProperty("poster") @SerialName("poster") val poster: String?,
-                    @JsonProperty("year") @SerialName("year") val year: Int?,
-                    @JsonProperty("ids") @SerialName("ids") val ids: Ids,
+                    @JsonProperty("title") val title: String,
+                    @JsonProperty("poster") val poster: String?,
+                    @JsonProperty("year") val year: Int?,
+                    @JsonProperty("ids") val ids: Ids,
                 ) {
-                    @Serializable
                     data class Ids(
-                        @JsonProperty("simkl") @SerialName("simkl") val simkl: Int,
-                        @JsonProperty("slug") @SerialName("slug") val slug: String?,
-                        @JsonProperty("imdb") @SerialName("imdb") val imdb: String?,
-                        @JsonProperty("zap2it") @SerialName("zap2it") val zap2it: String?,
-                        @JsonProperty("tmdb") @SerialName("tmdb") val tmdb: String?,
-                        @JsonProperty("offen") @SerialName("offen") val offen: String?,
-                        @JsonProperty("tvdb") @SerialName("tvdb") val tvdb: String?,
-                        @JsonProperty("mal") @SerialName("mal") val mal: String?,
-                        @JsonProperty("anidb") @SerialName("anidb") val anidb: String?,
-                        @JsonProperty("anilist") @SerialName("anilist") val anilist: String?,
-                        @JsonProperty("traktslug") @SerialName("traktslug") val traktslug: String?,
+                        @JsonProperty("simkl") val simkl: Int,
+                        @JsonProperty("slug") val slug: String?,
+                        @JsonProperty("imdb") val imdb: String?,
+                        @JsonProperty("zap2it") val zap2it: String?,
+                        @JsonProperty("tmdb") val tmdb: String?,
+                        @JsonProperty("offen") val offen: String?,
+                        @JsonProperty("tvdb") val tvdb: String?,
+                        @JsonProperty("mal") val mal: String?,
+                        @JsonProperty("anidb") val anidb: String?,
+                        @JsonProperty("anilist") val anilist: String?,
+                        @JsonProperty("traktslug") val traktslug: String?
                     ) {
                         fun matchesId(database: SimklSyncServices, id: String): Boolean {
                             return when (database) {
@@ -835,10 +743,27 @@ class SimklApi : SyncAPI() {
         }
     }
 
+    /**
+     * Appends api keys to the requests
+     **/
+    /*private inner class HeaderInterceptor : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): Response {
+            debugPrint { "${this@SimklApi.name} made request to ${chain.request().url}" }
+            return chain.proceed(
+                chain.request()
+                    .newBuilder()
+                    .addHeader("Authorization", "Bearer $token")
+                    .addHeader("simkl-api-key", CLIENT_ID)
+                    .build()
+            )
+        }
+    }*/
+
     private suspend fun getUser(token: AuthToken): SettingsResponse =
         app.post("$mainUrl/users/settings", headers = getHeaders(token))
             .parsed<SettingsResponse>()
 
+
     /**
      * Useful to get episodes on demand to prevent unnecessary requests.
      */
@@ -846,7 +771,7 @@ class SimklApi : SyncAPI() {
         private val simklId: Int?,
         private val type: String?,
         private val totalEpisodeCount: Int?,
-        private val hasEnded: Boolean?,
+        private val hasEnded: Boolean?
     ) {
         suspend fun getEpisodes(): Array<EpisodeMetadata>? {
             return getEpisodes(simklId, type, totalEpisodeCount, hasEnded)
@@ -861,12 +786,10 @@ class SimklApi : SyncAPI() {
         val episodeConstructor: SimklEpisodeConstructor,
         override var isFavorite: Boolean? = null,
         override var maxEpisodes: Int? = null,
-        /**
-         * Save seen episodes separately to know the change from old to new.
-         * Required to remove seen episodes if count decreases.
-         */
+        /** Save seen episodes separately to know the change from old to new.
+         * Required to remove seen episodes if count decreases */
         val oldEpisodes: Int,
-        val oldStatus: String?,
+        val oldStatus: String?
     ) : SyncAPI.AbstractSyncStatus()
 
     override suspend fun status(auth: AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
@@ -876,23 +799,22 @@ class SimklApi : SyncAPI() {
         // Key which assumes all ids are the same each time :/
         // This could be some sort of reference system to make multiple IDs
         // point to the same key.
-        val idKey = realIds.toList().map {
-            "${it.first.originalName}=${it.second}"
-        }.sorted().joinToString()
+        val idKey =
+            realIds.toList().map { "${it.first.originalName}=${it.second}" }.sorted().joinToString()
 
-        val cachedObject = SimklCache.getMediaObject(idKey)
+        val cachedObject = SimklCache.getKey<MediaObject>(idKey)
         val searchResult: MediaObject = cachedObject
             ?: (searchByIds(realIds)?.firstOrNull()?.also { result ->
                 val cacheTime =
                     if (result.hasEnded()) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value
-                SimklCache.setMediaObject(idKey, result, Duration.parse(cacheTime))
+                SimklCache.setKey(idKey, result, Duration.parse(cacheTime))
             }) ?: return null
 
         val episodeConstructor = SimklEpisodeConstructor(
             searchResult.ids?.simkl,
             searchResult.type,
             searchResult.totalEpisodes,
-            searchResult.hasEnded(),
+            searchResult.hasEnded()
         )
 
         val foundItem = getSyncListSmart(auth)?.let { list ->
@@ -907,16 +829,19 @@ class SimklApi : SyncAPI() {
             return SimklSyncStatus(
                 status = foundItem.status?.let {
                     SyncWatchType.fromInternalId(
-                        SimklListStatusType.fromString(it)?.value
+                        SimklListStatusType.fromString(
+                            it
+                        )?.value
                     )
-                } ?: return null,
+                }
+                    ?: return null,
                 score = Score.from10(foundItem.userRating),
                 watchedEpisodes = foundItem.watchedEpisodesCount,
                 maxEpisodes = searchResult.totalEpisodes,
                 episodeConstructor = episodeConstructor,
                 oldEpisodes = foundItem.watchedEpisodesCount ?: 0,
                 oldScore = foundItem.userRating,
-                oldStatus = foundItem.status,
+                oldStatus = foundItem.status
             )
         } else {
             return SimklSyncStatus(
@@ -927,7 +852,7 @@ class SimklApi : SyncAPI() {
                 episodeConstructor = episodeConstructor,
                 oldEpisodes = 0,
                 oldStatus = null,
-                oldScore = null,
+                oldScore = null
             )
         }
     }
@@ -935,11 +860,12 @@ class SimklApi : SyncAPI() {
     override suspend fun updateStatus(
         auth: AuthData?,
         id: String,
-        newStatus: AbstractSyncStatus,
+        newStatus: AbstractSyncStatus
     ): Boolean {
-        lastScoreTime = APIHolder.unixTime
         val parsedId = readIdFromString(id)
+        lastScoreTime = APIHolder.unixTime
         val simklStatus = newStatus as? SimklSyncStatus
+
         val builder = SimklScoreBuilder.Builder()
             .apiUrl(this.mainUrl)
             .score(newStatus.score?.toInt(10), simklStatus?.oldScore)
@@ -953,6 +879,7 @@ class SimklApi : SyncAPI() {
             .token(auth?.token ?: return false)
             .ids(MediaObject.Ids.fromMap(parsedId))
 
+
         // Get episodes only when required
         val episodes = simklStatus?.episodeConstructor?.getEpisodes()
 
@@ -965,19 +892,22 @@ class SimklApi : SyncAPI() {
             }
 
         builder.episodes(episodes?.toList(), watchedEpisodes, simklStatus?.oldEpisodes)
+
         requireLibraryRefresh = true
         return builder.execute()
     }
 
+
     /** See https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id */
     private suspend fun searchByIds(serviceMap: Map<SimklSyncServices, String>): Array<MediaObject>? {
         if (serviceMap.isEmpty()) return emptyArray()
+
         return app.get(
             "$mainUrl/search/id",
             params = mapOf("client_id" to CLIENT_ID) + serviceMap.map { (service, id) ->
                 service.originalName to id
             }
-        ).parsedSafe<Array<MediaObject>>()
+        ).parsedSafe()
     }
 
     override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
@@ -988,10 +918,12 @@ class SimklApi : SyncAPI() {
 
     override fun loginRequest(): AuthLoginPage? {
         val lastLoginState = BigInteger(130, SecureRandom()).toString(32)
-        val url = "https://simkl.com/oauth/authorize?response_type=code&client_id=$CLIENT_ID&redirect_uri=$APP_STRING://$redirectUrlIdentifier&state=$lastLoginState"
+        val url =
+            "https://simkl.com/oauth/authorize?response_type=code&client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrlIdentifier}&state=$lastLoginState"
+
         return AuthLoginPage(
             url = url,
-            payload = lastLoginState,
+            payload = lastLoginState
         )
     }
 
@@ -1006,12 +938,12 @@ class SimklApi : SyncAPI() {
         return app.get(
             "$mainUrl/sync/all-items/",
             params = params,
-            headers = getHeaders(auth.token),
-        ).parsedSafe<AllItemsResponse>()
+            headers = getHeaders(auth.token)
+        ).parsedSafe()
     }
 
     private suspend fun getActivities(token: AuthToken): ActivitiesResponse? {
-        return app.post("$mainUrl/sync/activities", headers = getHeaders(token)).parsedSafe<ActivitiesResponse>()
+        return app.post("$mainUrl/sync/activities", headers = getHeaders(token)).parsedSafe()
     }
 
     private fun getSyncListCached(auth: AuthData): AllItemsResponse? {
@@ -1025,13 +957,18 @@ class SimklApi : SyncAPI() {
         val lastRemoval = listOf(
             activities?.tvShows?.removedFromList,
             activities?.anime?.removedFromList,
-            activities?.movies?.removedFromList,
-        ).maxOf { getUnixTime(it) ?: -1 }
-        val lastRealUpdate = listOf(
-            activities?.tvShows?.all,
-            activities?.anime?.all,
-            activities?.movies?.all,
-        ).maxOf { getUnixTime(it) ?: -1 }
+            activities?.movies?.removedFromList
+        ).maxOf {
+            getUnixTime(it) ?: -1
+        }
+        val lastRealUpdate =
+            listOf(
+                activities?.tvShows?.all,
+                activities?.anime?.all,
+                activities?.movies?.all,
+            ).maxOf {
+                getUnixTime(it) ?: -1
+            }
 
         debugPrint { "Cache times: lastCacheUpdate=$lastCacheUpdate, lastRemoval=$lastRemoval, lastRealUpdate=$lastRealUpdate" }
         val list = if (lastCacheUpdate == null || lastCacheUpdate < lastRemoval) {
@@ -1043,33 +980,38 @@ class SimklApi : SyncAPI() {
             setKey(SIMKL_CACHED_LIST_TIME, userId, lastCacheUpdate)
             AllItemsResponse.merge(
                 getSyncListCached(auth),
-                getSyncListSince(auth, lastCacheUpdate),
+                getSyncListSince(auth, lastCacheUpdate)
             )
         } else {
             debugPrint { "Cached list update in ${this.name}." }
             getSyncListCached(auth)
         }
-
         debugPrint { "List sizes: movies=${list?.movies?.size}, shows=${list?.shows?.size}, anime=${list?.anime?.size}" }
+
         setKey(SIMKL_CACHED_LIST, userId, list)
+
         return list
     }
 
     override suspend fun library(auth: AuthData?): SyncAPI.LibraryMetadata? {
         val list = getSyncListSmart(auth ?: return null) ?: return null
-        val baseMap = SimklListStatusType.entries
-            .filter { it.value >= 0 && it.value != SimklListStatusType.ReWatching.value }
-            .associate {
-                it.stringRes to emptyList<SyncAPI.LibraryItem>()
-            }
+
+        val baseMap =
+            SimklListStatusType.entries
+                .filter { it.value >= 0 && it.value != SimklListStatusType.ReWatching.value }
+                .associate {
+                    it.stringRes to emptyList<SyncAPI.LibraryItem>()
+                }
 
         val syncMap = listOf(list.anime, list.movies, list.shows)
             .flatten()
-            .groupBy { it.status }
+            .groupBy {
+                it.status
+            }
             .mapNotNull { (status, list) ->
-                val stringRes = status?.let {
-                    SimklListStatusType.fromString(it)?.stringRes
-                } ?: return@mapNotNull null
+                val stringRes =
+                    status?.let { SimklListStatusType.fromString(it)?.stringRes }
+                        ?: return@mapNotNull null
                 val libraryList = list.map { it.toLibraryItem() }
                 stringRes to libraryList
             }.toMap()
@@ -1095,14 +1037,15 @@ class SimklApi : SyncAPI() {
 
     override suspend fun pinRequest(): AuthPinData? {
         val pinAuthResp = app.get(
-            "$mainUrl/oauth/pin?client_id=$CLIENT_ID&redirect_uri=$APP_STRING://$redirectUrlIdentifier"
+            "$mainUrl/oauth/pin?client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrlIdentifier}"
         ).parsedSafe<PinAuthResponse>() ?: return null
+
         return AuthPinData(
             deviceCode = pinAuthResp.deviceCode,
             userCode = pinAuthResp.userCode,
             verificationUrl = pinAuthResp.verificationUrl,
             expiresIn = pinAuthResp.expiresIn,
-            interval = pinAuthResp.interval,
+            interval = pinAuthResp.interval
         )
     }
 
@@ -1110,6 +1053,7 @@ class SimklApi : SyncAPI() {
         val pinAuthResp = app.get(
             "$mainUrl/oauth/pin/${payload.userCode}?client_id=$CLIENT_ID"
         ).parsedSafe<PinExchangeResponse>() ?: return null
+
         return AuthToken(
             accessToken = pinAuthResp.accessToken ?: return null,
         )
@@ -1125,6 +1069,7 @@ class SimklApi : SyncAPI() {
         val tokenResponse = app.post(
             "$mainUrl/oauth/token", json = TokenRequest(code)
         ).parsedSafe<TokenResponse>() ?: return null
+
         return AuthToken(
             accessToken = tokenResponse.accessToken,
         )
@@ -1135,7 +1080,7 @@ class SimklApi : SyncAPI() {
         return AuthUser(
             id = user.account.id,
             name = user.user.name,
-            profilePicture = user.user.avatar,
+            profilePicture = user.user.avatar
         )
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index f00fd8031..2aadfb13c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -12,7 +12,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.android.gms.cast.MediaLoadOptions
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
@@ -35,24 +34,35 @@ import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.CastHelper.awaitLinks
 import com.lagradost.cloudstream3.utils.CastHelper.getMediaInfo
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 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.serialization.SerialName
-import kotlinx.serialization.Serializable
 import org.json.JSONObject
 
+/*class SkipOpController(val view: ImageView) : UIController() {
+    init {
+        view.setImageResource(R.drawable.exo_controls_fastforward)
+        view.setOnClickListener {
+            remoteMediaClient?.let {
+                val options = MediaSeekOptions.Builder()
+                    .setPosition(it.approximateStreamPosition + 85000)
+                it.seek(options.build())
+            }
+        }
+    }
+}*/
+
 private fun RemoteMediaClient.getItemIndex(): Int? {
     return try {
         val index = this.mediaQueue.itemIds.indexOf(this.currentItem?.itemId ?: 0)
         if (index < 0) null else index
-    } catch (_: Exception) {
+    } catch (e: Exception) {
         null
     }
 }
@@ -79,41 +89,48 @@ class SkipNextEpisodeController(val view: ImageView) : UIController() {
     }
 }
 
-@Serializable
 data class MetadataHolder(
-    @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-    @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
-    @JsonProperty("title") @SerialName("title") val title: String?,
-    @JsonProperty("poster") @SerialName("poster") val poster: String?,
-    @JsonProperty("currentEpisodeIndex") @SerialName("currentEpisodeIndex") val currentEpisodeIndex: Int,
-    @JsonProperty("episodes") @SerialName("episodes") val episodes: List<ResultEpisode>,
-    @JsonProperty("currentLinks") @SerialName("currentLinks") val currentLinks: List<ExtractorLink>,
-    @JsonProperty("currentSubtitles") @SerialName("currentSubtitles") val currentSubtitles: List<SubtitleData>,
+    val apiName: String,
+    val isMovie: Boolean,
+    val title: String?,
+    val poster: String?,
+    val currentEpisodeIndex: Int,
+    val episodes: List<ResultEpisode>,
+    val currentLinks: List<ExtractorLink>,
+    val currentSubtitles: List<SubtitleData>
 )
 
-class SelectSourceController(val view: ImageView, val activity: ControllerActivity) : UIController() {
+class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
+    UIController() {
     init {
         view.setImageResource(R.drawable.ic_baseline_playlist_play_24)
         view.setOnClickListener {
+            //  lateinit var dialog: AlertDialog
             val holder = getCurrentMetaData()
+
             if (holder != null) {
                 val items = holder.currentLinks
                 if (items.isNotEmpty() && remoteMediaClient?.currentItem != null) {
-                    val subTracks = remoteMediaClient?.mediaInfo?.mediaTracks?.filter { it.type == MediaTrack.TYPE_TEXT }
-                        ?: ArrayList()
+                    val subTracks =
+                        remoteMediaClient?.mediaInfo?.mediaTracks?.filter { it.type == MediaTrack.TYPE_TEXT }
+                            ?: ArrayList()
 
-                    val bottomSheetDialogBuilder = AlertDialog.Builder(view.context, R.style.AlertDialogCustomBlack)
+                    val bottomSheetDialogBuilder =
+                        AlertDialog.Builder(view.context, R.style.AlertDialogCustomBlack)
                     bottomSheetDialogBuilder.setView(R.layout.sort_bottom_sheet)
-
                     val bottomSheetDialog = bottomSheetDialogBuilder.create()
                     bottomSheetDialog.show()
-
-                    val providerList = bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
-                    val subtitleList = bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
+                    //  bottomSheetDialog.setContentView(R.layout.sort_bottom_sheet)
+                    val providerList =
+                        bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
+                    val subtitleList =
+                        bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
                     if (subTracks.isEmpty()) {
-                        bottomSheetDialog.findViewById<LinearLayout>(R.id.sort_subtitles_holder)?.visibility = GONE
+                        bottomSheetDialog.findViewById<LinearLayout>(R.id.sort_subtitles_holder)?.visibility =
+                            GONE
                     } else {
-                        val arrayAdapter = ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
+                        val arrayAdapter =
+                            ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
                         arrayAdapter.add(view.context.getString(R.string.no_subtitles))
                         arrayAdapter.addAll(subTracks.mapNotNull { it.name })
 
@@ -121,8 +138,10 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         subtitleList.adapter = arrayAdapter
 
                         val currentTracks = remoteMediaClient?.mediaStatus?.activeTrackIds
-                        val subtitleIndex = if (currentTracks == null) 0 else subTracks.map { it.id }
-                            .indexOfFirst { currentTracks.contains(it) } + 1
+
+                        val subtitleIndex =
+                            if (currentTracks == null) 0 else subTracks.map { it.id }
+                                .indexOfFirst { currentTracks.contains(it) } + 1
 
                         subtitleList.setSelection(subtitleIndex)
                         subtitleList.setItemChecked(subtitleIndex, true)
@@ -134,7 +153,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 ChromecastSubtitlesFragment.getCurrentSavedStyle().apply {
                                     val font = TextTrackStyle()
                                     font.setFontFamily(fontFamily ?: "Google Sans")
-                                    fontGenericFamily?.let { font.fontGenericFamily = it }
+                                    fontGenericFamily?.let {
+                                        font.fontGenericFamily = it
+                                    }
                                     font.windowColor = windowColor
                                     font.backgroundColor = backgroundColor
 
@@ -151,7 +172,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                         if (!it.status.isSuccess) {
                                             Log.e(
                                                 "CHROMECAST", "Failed with status code:" +
-                                                    it.status.statusCode + " > " + it.status.statusMessage
+                                                        it.status.statusCode + " > " + it.status.statusMessage
                                             )
                                         }
                                     }
@@ -160,15 +181,17 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         }
                     }
 
-                    // https://developers.google.com/cast/docs/reference/web_receiver/cast.framework.messages.MediaInformation
+                    //https://developers.google.com/cast/docs/reference/web_receiver/cast.framework.messages.MediaInformation
                     val contentUrl = (remoteMediaClient?.currentItem?.media?.contentUrl
                         ?: remoteMediaClient?.currentItem?.media?.contentId)
 
-                    val sortingMethods = items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
-                        .toTypedArray()
+                    val sortingMethods =
+                        items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
+                            .toTypedArray()
                     val sotringIndex = items.indexOfFirst { it.url == contentUrl }
 
-                    val arrayAdapter = ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
+                    val arrayAdapter =
+                        ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
                     arrayAdapter.addAll(sortingMethods.toMutableList())
 
                     providerList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -178,8 +201,10 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
                     providerList.setOnItemClickListener { _, _, which, _ ->
                         val epData = holder.episodes[holder.currentEpisodeIndex]
+
                         fun loadMirror(index: Int) {
                             if (holder.currentLinks.size <= index) return
+
                             val mediaItem = getMediaInfo(
                                 epData,
                                 holder,
@@ -189,21 +214,25 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             )
 
                             val startAt = remoteMediaClient?.approximateStreamPosition ?: 0
+
+                            //remoteMediaClient.load(mediaItem, true, startAt)
                             try { // THIS IS VERY IMPORTANT BECAUSE WE NEVER WANT TO AUTOLOAD THE NEXT EPISODE
                                 val currentIdIndex = remoteMediaClient?.getItemIndex()
+
                                 val nextId = remoteMediaClient?.mediaQueue?.itemIds?.get(
                                     currentIdIndex?.plus(1) ?: 0
                                 )
-
                                 if (currentIdIndex == null && nextId != null) {
                                     awaitLinks(
                                         remoteMediaClient?.queueInsertAndPlayItem(
                                             MediaQueueItem.Builder(mediaItem).build(),
                                             nextId,
                                             startAt,
-                                            JSONObject(),
+                                            JSONObject()
                                         )
-                                    ) { loadMirror(index + 1) }
+                                    ) {
+                                        loadMirror(index + 1)
+                                    }
                                 } else {
                                     val mediaLoadOptions =
                                         MediaLoadOptions.Builder()
@@ -215,9 +244,11 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                             mediaItem,
                                             mediaLoadOptions
                                         )
-                                    ) { loadMirror(index + 1) }
+                                    ) {
+                                        loadMirror(index + 1)
+                                    }
                                 }
-                            } catch (_: Exception) {
+                            } catch (e: Exception) {
                                 val mediaLoadOptions =
                                     MediaLoadOptions.Builder()
                                         .setPlayPosition(startAt)
@@ -228,8 +259,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }
                             }
                         }
-
                         loadMirror(which)
+
                         bottomSheetDialog.dismissSafe(activity)
                     }
                 }
@@ -239,19 +270,23 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
     private fun getCurrentMetaData(): MetadataHolder? {
         return try {
-            val data = remoteMediaClient?.mediaInfo?.customData?.toString() ?: return null
-            parseJson<MetadataHolder>(data)
-        } catch (_: Exception) {
+            val data = remoteMediaClient?.mediaInfo?.customData?.toString()
+            data?.toKotlinObject()
+        } catch (e: Exception) {
             null
         }
     }
 
     var isLoadingMore = false
+
+
     override fun onMediaStatusUpdated() {
         super.onMediaStatusUpdated()
         val meta = getCurrentMetaData()
-        view.visibility = if ((meta?.currentLinks?.size ?: 0) > 1) VISIBLE else INVISIBLE
 
+        view.visibility = if ((meta?.currentLinks?.size
+                ?: 0) > 1
+        ) VISIBLE else INVISIBLE
         try {
             if (meta != null && meta.episodes.size > meta.currentEpisodeIndex + 1) {
                 val currentIdIndex = remoteMediaClient?.getItemIndex() ?: return
@@ -268,7 +303,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             currentPosition,
                             currentDuration,
                             epData,
-                            meta.episodes.getOrNull(index + 1),
+                            meta.episodes.getOrNull(index + 1)
                         )
                 } catch (t: Throwable) {
                     logError(t)
@@ -279,7 +314,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     ioSafe {
                         val currentLinks = mutableSetOf<ExtractorLink>()
                         val currentSubs = mutableSetOf<SubtitleData>()
+
                         val generator = RepoLinkGenerator(listOf(epData))
+
                         val isSuccessful = safeApiCall {
                             generator.generateLinks(
                                 clearCache = false,
@@ -292,7 +329,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                     currentSubs.add(it)
                                 },
                                 offset = 0,
-                                isCasting = true,
+                                isCasting = true
                             )
                         }
 
@@ -303,18 +340,32 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 val jsonCopy = meta.copy(
                                     currentLinks = sortedLinks,
                                     currentSubtitles = sortedSubs,
-                                    currentEpisodeIndex = index,
+                                    currentEpisodeIndex = index
                                 )
 
-                                val done = JSONObject(jsonCopy.toJson())
+                                val done =
+                                    JSONObject(jsonCopy.toJson())
+
                                 val mediaInfo = getMediaInfo(
                                     epData,
                                     jsonCopy,
                                     0,
                                     done,
-                                    sortedSubs,
+                                    sortedSubs
                                 )
 
+                                /*fun loadIndex(index: Int) {
+                                    println("LOAD INDEX::::: $index")
+                                    if (meta.currentLinks.size <= index) return
+                                    val info = getMediaInfo(
+                                        epData,
+                                        meta,
+                                        index,
+                                        done)
+                                    awaitLinks(remoteMediaClient?.load(info, true, 0)) {
+                                        loadIndex(index + 1)
+                                    }
+                                }*/
                                 activity.runOnUiThread {
                                     awaitLinks(
                                         remoteMediaClient?.queueAppendItem(
@@ -323,6 +374,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                         )
                                     ) {
                                         println("FAILED TO LOAD NEXT ITEM")
+                                        //  loadIndex(1)
                                     }
                                     isLoadingMore = false
                                 }
@@ -345,7 +397,10 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
 class SkipTimeController(val view: ImageView, forwards: Boolean) : UIController() {
     init {
+        //val settingsManager = PreferenceManager.getDefaultSharedPreferences()
+        //val time = settingsManager?.getInt("chromecast_tap_time", 30) ?: 30
         val time = 30
+        //view.setImageResource(if (forwards) R.drawable.netflix_skip_forward else R.drawable.netflix_skip_back)
         view.setImageResource(if (forwards) R.drawable.go_forward_30 else R.drawable.go_back_30)
         view.setOnClickListener {
             remoteMediaClient?.let {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
index f70458285..92d33d0f3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
@@ -1,8 +1,11 @@
 package com.lagradost.cloudstream3.ui.account
 
+import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import coil3.transform.RoundedCornersTransformation
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountListItemAddBinding
 import com.lagradost.cloudstream3.databinding.AccountListItemBinding
@@ -15,8 +18,6 @@ import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
-import android.util.TypedValue
-import android.view.View
 
 class AccountAdapter(
     private val accountSelectCallback: (DataStoreHelper.Account) -> Unit,
@@ -28,12 +29,6 @@ class AccountAdapter(
     companion object {
         const val VIEW_TYPE_SELECT_ACCOUNT = 0
         const val VIEW_TYPE_EDIT_ACCOUNT = 2
-
-        fun View.setRippleForeground() {
-            val outValue = TypedValue()
-            context.theme.resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true)
-            foreground = context.getDrawable(outValue.resourceId)
-        }
     }
 
 
@@ -52,25 +47,45 @@ class AccountAdapter(
         when (val binding = holder.view) {
             is AccountListItemBinding -> binding.apply {
                 val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
+
                 val isLastUsedAccount = item.keyIndex == DataStoreHelper.selectedKeyIndex
 
                 accountName.text = item.name
                 accountImage.loadImage(item.image)
                 lockIcon.isVisible = item.lockPin != null
-                root.isSelected = isLastUsedAccount
-                cardView.isSelected = isLastUsedAccount
+                outline.isVisible = !isTv && isLastUsedAccount
 
-                if (!isTv) cardView.setRippleForeground()
+                if (isTv) {
+                    // For emulator but this is fine on TV also
+                    root.isFocusableInTouchMode = true
+                    if (isLastUsedAccount) {
+                        root.requestFocus()
+                    }
 
-                if (!isTv) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        root.foreground = ContextCompat.getDrawable(
+                            root.context,
+                            R.drawable.outline_drawable
+                        )
+                    }
+                } else {
                     root.setOnLongClickListener {
                         showAccountEditDialog(
                             context = root.context,
                             account = item,
                             isNewAccount = false,
-                            accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                            accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
+                            accountEditCallback = { account ->
+                                accountEditCallback.invoke(
+                                    account
+                                )
+                            },
+                            accountDeleteCallback = { account ->
+                                accountDeleteCallback.invoke(
+                                    account
+                                )
+                            }
                         )
+
                         true
                     }
                 }
@@ -82,15 +97,30 @@ class AccountAdapter(
 
             is AccountListItemEditBinding -> binding.apply {
                 val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
+
                 val isLastUsedAccount = item.keyIndex == DataStoreHelper.selectedKeyIndex
 
                 accountName.text = item.name
-                accountImage.loadImage(item.image)
+                accountImage.loadImage(item.image) {
+                    RoundedCornersTransformation(10f)
+                }
                 lockIcon.isVisible = item.lockPin != null
-                root.isSelected = isLastUsedAccount
-                cardView.isSelected = isLastUsedAccount
+                outline.isVisible = !isTv && isLastUsedAccount
 
-                if (!isTv) cardView.setRippleForeground()
+                if (isTv) {
+                    // For emulator but this is fine on TV also
+                    root.isFocusableInTouchMode = true
+                    if (isLastUsedAccount) {
+                        root.requestFocus()
+                    }
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        root.foreground = ContextCompat.getDrawable(
+                            root.context,
+                            R.drawable.outline_drawable
+                        )
+                    }
+                }
 
                 root.setOnClickListener {
                     showAccountEditDialog(
@@ -98,7 +128,11 @@ class AccountAdapter(
                         account = item,
                         isNewAccount = false,
                         accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                        accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
+                        accountDeleteCallback = { account ->
+                            accountDeleteCallback.invoke(
+                                account
+                            )
+                        }
                     )
                 }
             }
@@ -108,9 +142,6 @@ class AccountAdapter(
     override fun onBindFooter(holder: ViewHolderState<Any>) {
         val binding = holder.view as? AccountListItemAddBinding ?: return
         binding.apply {
-            val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
-            if (!isTv) cardView.setRippleForeground()
-
             root.setOnClickListener {
                 val accounts = this@AccountAdapter.immutableCurrentList
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
index c88f70a73..7725bad91 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
@@ -41,10 +41,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
 import com.lagradost.cloudstream3.utils.UIHelper.showProgress
-import com.lagradost.cloudstream3.ui.account.AccountAdapter.Companion.setRippleForeground
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 
 object AccountHelper {
     fun showAccountEditDialog(
@@ -60,12 +56,6 @@ object AccountHelper {
 
         var currentEditAccount = account
         val dialog = builder.show()
-        binding.accountImageHolder.requestFocus()
-
-        if (!isLayout(TV or EMULATOR)) {
-            binding.accountImageHolder.setRippleForeground()
-            binding.editProfilePhotoButtonHolder.setRippleForeground()
-        }
 
         if (!isNewAccount) binding.title.setText(R.string.edit_account)
 
@@ -110,7 +100,7 @@ object AccountHelper {
 
         // Handle the profile picture and its interactions
         binding.accountImage.loadImage(account.image)
-        binding.accountImageHolder.setOnClickListener {
+        binding.accountImage.setOnClickListener {
             // Roll the image forwards once
             currentEditAccount = currentEditAccount.copy(customImage = null)
             currentEditAccount =
@@ -176,12 +166,11 @@ object AccountHelper {
 
         canSetPin = true
 
-        binding.editProfilePhotoButtonHolder.setOnClickListener {
-            val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
+        binding.editProfilePhotoButton.setOnClickListener {
+            val bottomSheetDialog = BottomSheetDialog(context)
             val sheetBinding = BottomInputDialogBinding.inflate(LayoutInflater.from(context))
-            builder.setView(sheetBinding.root)
-            val dialog = builder.create()
-            dialog.show()
+            bottomSheetDialog.setContentView(sheetBinding.root)
+            bottomSheetDialog.show()
 
             sheetBinding.apply {
                 text1.text = context.getString(R.string.edit_profile_image_title)
@@ -206,7 +195,7 @@ object AccountHelper {
                                     R.string.edit_profile_image_success,
                                     Toast.LENGTH_SHORT
                                 )
-                                dialog.dismissSafe()
+                                bottomSheetDialog.dismissSafe()
                             },
                             onError = { _, _ ->
                                 showToast(
@@ -223,7 +212,7 @@ object AccountHelper {
                     imageLoader.enqueue(request)
                 }
                 sheetBinding.cancelBtt.setOnClickListener {
-                    dialog.dismissSafe()
+                    bottomSheetDialog.dismissSafe()
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 28f5c15d8..ad323c7d1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -54,15 +54,10 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
             false
         )
 
-        val isFromMainActivity = intent.getBooleanExtra(
-            "isFromMainActivity",
-            false
-        )
-
         // Sometimes we start this activity when we have already logged in
         // For example when using cloudstreamsearch://
         // In those cases we want to just go to the main activity instantly
-        if (hasLoggedIn && !isEditingFromMainActivity && !isFromMainActivity) {
+        if (hasLoggedIn && !isEditingFromMainActivity) {
             navigateToMainActivity()
             return
         }
@@ -103,7 +98,7 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
         // Don't show account selection if there is only
         // one account that exists
-        if (!isFromMainActivity && !isEditingFromMainActivity && skipStartup) {
+        if (!isEditingFromMainActivity && skipStartup) {
             val currentAccount = accounts.firstOrNull { it.keyIndex == selectedKeyIndex }
             if (currentAccount?.lockPin != null) {
                 CommonActivity.init(this)
@@ -165,11 +160,6 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
                 // Scroll to current account (which is focused by default)
                 val layoutManager = recyclerView.layoutManager as GridLayoutManager
                 layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0)
-                if (isLayout(TV or EMULATOR)) {
-                    recyclerView.post {
-                        layoutManager.findViewByPosition(selectedKeyIndex)?.requestFocus()
-                    }
-                }
             }
 
             observe(accountViewModel.isEditing) { isEditing ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt
index 91e0caa2a..eb907b344 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt
@@ -8,7 +8,7 @@ class AccountSelectLinearItemDecoration(private val size: Int) : RecyclerView.It
     override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
         val layoutParams = view.layoutParams as RecyclerView.LayoutParams
         layoutParams.width = size
-        layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
+        layoutParams.height = size
         view.layoutParams = layoutParams
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
index 19c006b28..0d35d5670 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
@@ -10,7 +10,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.api.Log
-import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.isEpisodeBased
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -37,7 +36,6 @@ import com.lagradost.cloudstream3.utils.ResourceLiveData
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.deleteFilesAndUpdateSettings
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadDeleteEvent
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -69,17 +67,6 @@ class DownloadViewModel : ViewModel() {
     private val _selectedItemIds = ConsistentLiveData<Set<Int>?>(null)
     val selectedItemIds: LiveData<Set<Int>?> = _selectedItemIds
 
-    init {
-        // Keep the Downloads list in sync when a download is deleted/cancelled from
-        // anywhere in the app (result page button, queue, notification, etc.). See
-        // onDownloadDeleted for the rationale (issue #1227).
-        downloadDeleteEvent += ::onDownloadDeleted
-    }
-
-    override fun onCleared() {
-        downloadDeleteEvent -= ::onDownloadDeleted
-        super.onCleared()
-    }
 
     fun cancelSelection() {
         updateSelectedItems { null }
@@ -402,18 +389,6 @@ class DownloadViewModel : ViewModel() {
         postChildren(_childCards.success?.filter { it.data.id !in idsToRemove })
     }
 
-    /**
-     * Refreshes the Downloads screen in real time when a download is deleted/cancelled.
-     */
-    private fun onDownloadDeleted(id: Int) {
-        // Keep multi-select state consistent: forget the removed id if it was selected.
-        updateSelectedItems { it?.minus(id) }
-
-        val context = CloudStreamApp.context ?: return
-        updateHeaderList(context)
-        postChildren(_childCards.success?.filterNot { it.data.id == id })
-    }
-
     private fun updateStorageStats(visual: List<VisualDownloadCached.Header>) {
         try {
             val stat = StatFs(Environment.getExternalStorageDirectory().path)
@@ -609,4 +584,4 @@ class DownloadViewModel : ViewModel() {
         val names: List<String>,
         val parentName: String?
     )
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
index 450dc9a61..382a770cd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
@@ -164,11 +164,9 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
         }
     }
 
-    fun downloadDeleteEvent(data: Int) {
-        if (data == persistentId) {
-            resetView()
-        }
-    }
+    /*fun downloadDeleteEvent(data: Int) {
+
+    }*/
 
     /*fun downloadEvent(data: Pair<Int, VideoDownloadManager.DownloadActionType>) {
         val (id, action) = data
@@ -187,7 +185,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     override fun onAttachedToWindow() {
         VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent
-        VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
+        // VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
         // VideoDownloadManager.downloadEvent += ::downloadEvent
         VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent
 
@@ -202,7 +200,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     override fun onDetachedFromWindow() {
         VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent
-        VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
+        // VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
         // VideoDownloadManager.downloadEvent -= ::downloadEvent
         VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent
 
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 04f8b0b26..b68ef5962 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
@@ -18,22 +18,17 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
-import androidx.core.view.doOnLayout
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.chip.Chip
 import com.lagradost.api.Log
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.apis
-import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainAPI
@@ -48,7 +43,6 @@ 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.plugins.Plugin
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.BaseFragment
@@ -69,7 +63,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettin
 import com.lagradost.cloudstream3.utils.AppContextUtils.isNetworkAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
-import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
@@ -113,14 +106,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
         val errorProfilePic = errorProfilePics.random()
 
-        fun Context.getDisplayName(apiName: String?): String? {
-            return when (apiName) {
-                noneApi.name -> getString(R.string.none)
-                randomApi.name -> getString(R.string.home_random)
-                else -> apiName
-            }
-        }
-
         //fun Activity.loadHomepageList(
         //    item: HomePageList,
         //    deleteCallback: (() -> Unit)? = null,
@@ -439,30 +424,11 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             .inflate(R.layout.sort_bottom_single_provider_choice, parent, false)
                         val titleText = view.findViewById<TextView>(R.id.text1)
                         val pinIcon = view.findViewById<ImageView>(R.id.pinicon)
-                        val settingsIcon = view.findViewById<ImageView>(R.id.action_settings)
-
                         val name = getItem(position)
                         titleText?.text = name
-                        val providerApi = currentValidApis[position]
                         val isPinned =
-                            pinnedphashset.contains(providerApi.name)
+                            pinnedphashset.contains(currentValidApis[position].name)
                         pinIcon.visibility = if (isPinned) View.VISIBLE else View.GONE
-
-                        val pluginInstance = providerApi.sourcePlugin?.let { PluginManager.plugins[it] } as? Plugin
-                        val isDownloadedPluginWithSettings = pluginInstance?.openSettings != null && !isLayout(TV)
-
-                        settingsIcon.visibility = if (isDownloadedPluginWithSettings) View.VISIBLE else View.GONE
-                        if (isDownloadedPluginWithSettings) {
-                            settingsIcon.setOnClickListener {
-                                try {
-                                    val activityContext = it.context.getActivity() ?: it.context
-                                    pluginInstance.openSettings?.invoke(activityContext)
-                                } catch (e: Throwable) {
-                                    logError(e)
-                                }
-                            }
-                        }
-
                         return view
                     }
                 }
@@ -485,14 +451,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     arrayAdapter.clear()
                     val sortedApis = validAPIs
                         .filter {
-                            val isPinned = pinnedphashset.contains(it.name)
-
-                            // Hide pinned NSFW when NSFW not selected. NSFW is distracting when not chosen.
-                            if (isPinned && !preSelectedTypes.contains(TvType.NSFW)) {
-                                if (it.supportedTypes.all { type -> type == TvType.NSFW }) return@filter false
-                            }
-
-                            it.hasMainPage && (isPinned || it.supportedTypes.any(
+                            it.hasMainPage && (pinnedphashset.contains(it.name) || it.supportedTypes.any(
                                 preSelectedTypes::contains
                             ))
                         }
@@ -514,10 +473,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                         addAll(remainingApis)
                     }
 
-                    val names = currentValidApis.map {
-                        val displayName = getDisplayName(it.name)
-                        if (isMultiLang) "${getFlagFromIso(it.lang)?.plus(" ") ?: ""}$displayName" else displayName
-                    }
+                    val names =
+                        currentValidApis.map { if (isMultiLang) "${getFlagFromIso(it.lang)?.plus(" ") ?: ""}${it.name}" else it.name }
                     val index = currentValidApis.map { it.name }.indexOf(currentApiName)
                     listView?.setItemChecked(index, true)
                     arrayAdapter.addAll(names)
@@ -708,6 +665,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     fromUI = true
                 )
                 showToast(R.string.action_reload, Toast.LENGTH_SHORT)
+                true
             }
 
             homePreviewSearchButton.setOnClickListener { _ ->
@@ -715,38 +673,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                 homeViewModel.queryTextSubmit("")
             }
 
-            homePreviewSettingsButton.setOnClickListener { view ->
-                val apiName = homeViewModel.apiName.value
-                val plugin = APIHolder.getApiFromNameNull(apiName)
-                    ?.sourcePlugin?.let { PluginManager.plugins[it] } as? Plugin
-                val openSettings = plugin?.openSettings
-                if (openSettings != null) {
-                    try {
-                        val activityContext = view.context.getActivity() ?: view.context
-                        openSettings.invoke(activityContext)
-                    } catch (e: Throwable) {
-                        logError(e)
-                    }
-                }
-            }
-
-            // Load value for toggling Tv layout real time clock. Hide by default at startup
-            // set visibility first, to apply a scroll effect later
-            context?.let {
-                if (isLayout(TV)) {
-                    val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
-                    val toggleClock =
-                        settingsManager.getBoolean(
-                            getString(R.string.tv_layout_clock_key),
-                            false
-                        )
-                    binding.homeClock.isVisible = toggleClock
-                } else {
-                    binding.homeClock.isVisible = false
-                }
-            }
-
-
             homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     if (isLayout(PHONE)) {
@@ -786,26 +712,12 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             view.getLocationInWindow(rect)
                             scrollParent.isVisible = true
                             scrollParent.translationY = rect[1].toFloat() - 60.toPx
-
-                            // Move the TV layout real time clock out of the way too
-                            // We check if we have the correct layout and if the clock is enabled
-                            if(isLayout(TV) && binding.homeClock.isVisible) {
-                                val scrollParent = binding.homeClock
-
-                                val rect = IntArray(2)
-                                view.getLocationInWindow(rect)
-                                scrollParent.isVisible = true
-                                scrollParent.translationY = rect[1].toFloat() - 60.toPx
-                            }
                         }
                     }
                     super.onScrolled(recyclerView, dx, dy)
-                    updateTvRailFocus()
                 }
             })
 
-            homeMasterRecycler.doOnLayout { updateTvRailFocus() }
-
         }
 
         //Load value for toggling Random button. Hide at startup
@@ -822,10 +734,9 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
-            val displayApiName = context?.getDisplayName(apiName) ?: apiName
             binding.apply {
-                homeApiFab.text = displayApiName
-                homeChangeApi.text = displayApiName
+                homeApiFab.text = apiName
+                homeChangeApi.text = apiName
                 homePreviewReloadProvider.isGone = (apiName == noneApi.name)
                 homePreviewSearchButton.isGone = (apiName == noneApi.name)
             }
@@ -833,12 +744,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
         observe(homeViewModel.page) { data ->
             binding.apply {
-                if (isLayout(TV or EMULATOR)) {
-                    val plugin = APIHolder.getApiFromNameNull(homeViewModel.apiName.value)
-                        ?.sourcePlugin?.let { PluginManager.plugins[it] } as? Plugin
-                    homePreviewSettingsButton.isGone = plugin?.openSettings == null
-                }
-                
                 when (data) {
                     is Resource.Success -> {
                         val d = data.value
@@ -854,7 +759,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                         homeLoadingError.isVisible = false
                         homeMasterRecycler.isVisible = true
                         homeLoadingShimmer.stopShimmer()
-
                         //home_loaded?.isVisible = true
                         if (toggleRandomButton) {
                             val distinct = d.values
@@ -875,16 +779,26 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             homeRandomButtonTv.isGone = true
                         }
                     }
-                    //Open browser directly, without a menu.
+
                     is Resource.Failure -> {
                         homeLoadingShimmer.stopShimmer()
                         homeReloadConnectionerror.setOnClickListener(apiChangeClickListener)
-                        homeReloadConnectionOpenInBrowser.setOnClickListener {
-                            val currentApi = currentApiName?.let { getApiFromNameNull(it) }
-                                ?: homeViewModel.apiName.value?.let { getApiFromNameNull(it) }
-                            val mainUrl = currentApi?.mainUrl
-                            if (!mainUrl.isNullOrBlank()) {
-                                context?.openBrowser(mainUrl)
+                        homeReloadConnectionOpenInBrowser.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 = validAPIs[itemId].mainUrl.toUri()
+                                    startActivity(i)
+                                } catch (e: Exception) {
+                                    logError(e)
+                                }
                             }
                         }
 
@@ -979,29 +893,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
         }*/
     }
 
-    private fun updateTvRailFocus() {
-        if (!isLayout(TV or EMULATOR)) return
-        // home_api_holder is glued to the header row's top by the mirror logic in
-        // the scroll listener above. Only target the provider button while the
-        // holder is actually on screen; once the header scrolls off (y < 0) let
-        // the rail fall back to default focus search so RIGHT enters content rows
-        val holder = binding?.homeApiHolder
-        val target =
-            if (holder != null && holder.isVisible && holder.y >= 0f) R.id.home_change_api
-            else View.NO_ID
-        val rail = activity?.findViewById<View>(R.id.nav_rail_view) ?: return
-        rail.nextFocusRightId = target
-        for (focusView in arrayOf(
-            R.id.navigation_downloads,
-            R.id.navigation_home,
-            R.id.navigation_search,
-            R.id.navigation_library,
-            R.id.navigation_settings,
-        )) {
-            rail.findViewById<View>(focusView)?.nextFocusRightId = target
-        }
-    }
-
     private fun handleTvBackPress(helper: BackPressedCallbackHelper.CallbackHelper) {
         // Only apply custom behavior on TV interface
         if (!isLayout(TV)) {
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 1f721ee20..6bdd1bf49 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
@@ -159,7 +159,7 @@ open class ParentItemAdapter(
             })
 
             //(recyclerView.adapter as HomeChildItemAdapter).notifyDataSetChanged()
-            if (isLayout(PHONE or EMULATOR)) {
+            if (isLayout(PHONE)) {
                 homeChildMoreInfo.setOnClickListener {
                     moreInfoClickCallback.invoke(item)
                 }
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 1020205ac..e42e774b5 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
@@ -58,7 +58,7 @@ class HomeScrollAdapter(
 
         when (binding) {
             is HomeScrollViewBinding -> {
-                binding.homeScrollPreview.loadImage(posterUrl, item.posterHeaders)
+                binding.homeScrollPreview.loadImage(posterUrl)
                 binding.homeScrollPreviewTags.apply {
                     text = item.tags?.joinToString(" • ") ?: ""
                     isGone = item.tags.isNullOrEmpty()
@@ -79,8 +79,8 @@ class HomeScrollAdapter(
                 binding.homeScrollPreview.setOnClickListener { view ->
                     callback.invoke(view ?: return@setOnClickListener, position, item)
                 }
-                binding.homeScrollPreview.loadImage(posterUrl, item.posterHeaders)
+                binding.homeScrollPreview.loadImage(posterUrl)
             }
         }
     }
-}
+}
\ 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 9c5685c68..d7e10c814 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
@@ -108,7 +108,6 @@ import com.lagradost.cloudstream3.utils.PLAYREADY_DRM_UUID
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
 import com.lagradost.cloudstream3.utils.WIDEVINE_DRM_UUID
 import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
-import com.lagradost.cloudstream4.AppSettings
 import kotlinx.coroutines.delay
 import okhttp3.Interceptor
 import org.chromium.net.CronetEngine
@@ -720,7 +719,7 @@ class CS3IPlayer : IPlayer {
          **/
         var preferredAudioTrackLanguage: String? = null
             get() {
-                return field ?: getKey<String>(
+                return field ?: getKey(
                     "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY",
                     field
                 )?.also {
@@ -1390,17 +1389,10 @@ class CS3IPlayer : IPlayer {
             context.getString(if (context.isUsingMobileData()) R.string.quality_pref_mobile_data_key else R.string.quality_pref_key),
             Int.MAX_VALUE
         )
-        val settings = AppSettings(context)
 
         try {
             hasUsedFirstRender = false
 
-            val playWhenReady = if (settings.player.startPaused.get()) {
-                false
-            } else {
-                isPlaying // this keep the current state of the player
-            }
-
             // ye this has to be a val for whatever reason
             // this makes no sense
             exoPlayer = buildExoPlayer(
@@ -1412,7 +1404,7 @@ class CS3IPlayer : IPlayer {
                 playBackSpeed,
                 cacheSize = cacheSize,
                 videoBufferMs = videoBufferMs,
-                playWhenReady = playWhenReady,
+                playWhenReady = isPlaying, // this keep the current state of the player
                 subtitleOffset = currentSubtitleOffset,
                 maxVideoHeight = maxVideoHeight,
                 audioSources = audioSources,
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 f38a9ab99..20c37dcf4 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
@@ -102,12 +102,12 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
     private var hideControlsNames = false
     protected var subtitleDelay
         set(value) = try {
-            player.setSubtitleOffset(value)
+            player.setSubtitleOffset(-value)
         } catch (e: Exception) {
             logError(e)
         }
         get() = try {
-            player.getSubtitleOffset()
+            -player.getSubtitleOffset()
         } catch (e: Exception) {
             logError(e)
             0L
@@ -307,7 +307,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 playerVideoTitleRez,
                 playerVideoInfo,
                 playerGoBackHolder,
-                playerVideoClock,
             ).forEach {
                 it.animateY(titleMove)
             }
@@ -527,7 +526,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
 
                     // Scroll to the first active subtitle
                     val playerPosition = player.getPosition() ?: 0
-                    val totalPosition = playerPosition + currentOffset
+                    val totalPosition = playerPosition - currentOffset
                     subtitleAdapter?.updateTime(totalPosition)
 
                     subtitleAdapter?.getLatestActiveItem(totalPosition)
@@ -537,11 +536,11 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
 
                     val str = when {
                         time > 0L -> {
-                            txt(R.string.subtitle_offset_extra_hint_before_format, time)
+                            txt(R.string.subtitle_offset_extra_hint_later_format, time)
                         }
 
                         time < 0L -> {
-                            txt(R.string.subtitle_offset_extra_hint_later_format, -time)
+                            txt(R.string.subtitle_offset_extra_hint_before_format, -time)
                         }
 
                         else -> {
@@ -559,12 +558,12 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             subtitleOffsetRecyclerview.isVisible = subtitles.isNotEmpty()
             noSubtitlesLoadedNotice.isVisible = subtitles.isEmpty()
 
-            val initialSubtitlePosition = (player.getPosition() ?: 0) + currentOffset
+            val initialSubtitlePosition = (player.getPosition() ?: 0) - currentOffset
             subtitleAdapter =
                 SubtitleOffsetItemAdapter(initialSubtitlePosition) { subtitleCue ->
                     val playerPosition = player.getPosition() ?: 0
                     subtitleOffsetInput.text = Editable.Factory.getInstance()
-                        ?.newEditable((subtitleCue.startTimeMs - playerPosition).toString())
+                        ?.newEditable((playerPosition - subtitleCue.startTimeMs).toString())
                 }.apply {
                     submitList(subtitles)
                 }
@@ -773,7 +772,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             val showPlayerEpisodes = !isGone && isThereEpisodes()
             playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
             playerEpisodesButton.isVisible = showPlayerEpisodes
-            playerVideoTitleHolder.isGone = togglePlayerTitleGone || playerVideoTitle.text.isBlank()
+            playerVideoTitleHolder.isGone = togglePlayerTitleGone
             playerVideoTitleRez.isGone = isGone || playerVideoTitleRez.text.isBlank()
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone
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 e4616c93b..91e3ff970 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
@@ -8,7 +8,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
-import android.graphics.Typeface
 import android.os.Build
 import android.os.Bundle
 import android.text.Spanned
@@ -80,7 +79,6 @@ import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioT
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForcedEncoding
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
 import com.lagradost.cloudstream3.ui.player.source_priority.LinkSource
-import com.lagradost.cloudstream3.ui.player.source_priority.ProfileSettings
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
@@ -101,7 +99,6 @@ import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageTagIETF
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragmentDialog2
 import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
@@ -135,7 +132,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
-import java.lang.ref.WeakReference
 import java.util.Calendar
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -514,7 +510,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         showDownloadProgress(DownloadEvent(0, 0, 0, null))
 
         // uiReset() // Removed due to UX
-
+        
         currentSelectedLink = link
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         setPlayerDimen(null)
@@ -1047,7 +1043,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.subtitleSettingsBtt.setOnClickListener {
                     safe {
-                        val subtitlesFragment = SubtitlesFragmentDialog2()
+                        val subtitlesFragment = SubtitlesFragment()
                         subtitlesFragment.systemBarsAddPadding = true
                         subtitlesFragment.show(this.parentFragmentManager, "SubtitleSettings")
                     }
@@ -1116,29 +1112,21 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 var sourceIndex = 0
                 var startSource = 0
-                // Filtered and sorted links
-                var currentHiddenFooter: View? = null
-                var filteredLinks: List<DisplayLink> = emptyList()
+                var sortedUrls = emptyList<Pair<ExtractorLink?, ExtractorUri?>>()
 
                 fun refreshLinks(qualityProfile: Int) {
-                    val currentLinkUsed = currentSelectedLink
-                    // Always display current linkFooter
-                    val sortedLinks = viewModel.state.sortLinks(qualityProfile)
-
-                    filteredLinks = sortedLinks.filter { it.shouldUseLink || it.link == currentLinkUsed }
-
-                    if (sortedLinks.isEmpty()) {
+                    sortedUrls = viewModel.state.sortLinks(qualityProfile)
+                    if (sortedUrls.isEmpty()) {
                         sourceDialog.findViewById<LinearLayout>(R.id.sort_sources_holder)?.isGone =
                             true
                     } else {
-                        startSource = filteredLinks.indexOfFirst { it.link == currentLinkUsed }
+                        startSource = sortedUrls.indexOf(currentSelectedLink)
                         sourceIndex = startSource
 
                         val sourcesArrayAdapter =
                             ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-                        sourcesArrayAdapter.addAll(filteredLinks.map { displayLink ->
-                            val (link, uri) = displayLink.link
+                        sourcesArrayAdapter.addAll(sortedUrls.map { (link, uri) ->
                             val name = link?.name ?: uri?.name ?: "NULL"
                             "$name ${Qualities.getStringByInt(link?.quality)}"
                         })
@@ -1154,7 +1142,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
 
                         providerList.setOnItemLongClickListener { _, _, position, _ ->
-                            sortedLinks.getOrNull(position)?.link?.first?.url?.let {
+                            sortedUrls.getOrNull(position)?.first?.url?.let {
                                 clipboardHelper(
                                     txt(R.string.video_source),
                                     it
@@ -1162,25 +1150,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                             }
                             true
                         }
-
-                        val hiddenLinks = sortedLinks.size - filteredLinks.size
-                        providerList.removeFooterView(currentHiddenFooter)
-
-                        if (hiddenLinks > 0) {
-                            val hiddenLinksFooter: TextView = layoutInflater.inflate(
-                                R.layout.sort_bottom_footer_add_choice, null
-                            ) as TextView
-
-                            providerList.addFooterView(hiddenLinksFooter, null, false)
-                            currentHiddenFooter = hiddenLinksFooter
-
-                            val hiddenLinksText =
-                                ctx.resources.getQuantityString(R.plurals.links_hidden, hiddenLinks)
-                                    .format(hiddenLinks)
-                            hiddenLinksFooter.text = hiddenLinksText
-                            hiddenLinksFooter.setCompoundDrawables(null, null, null, null)
-                            hiddenLinksFooter.setTypeface(null, Typeface.ITALIC)
-                        }
                     }
                 }
 
@@ -1394,8 +1363,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                     if (init) {
-                        filteredLinks.getOrNull(sourceIndex)?.let {
-                            loadLink(it.link, true)
+                        sortedUrls.getOrNull(sourceIndex)?.let {
+                            loadLink(it, true)
                         }
                     }
                     sourceDialog.dismissSafe(activity)
@@ -1563,10 +1532,6 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun playerError(exception: Throwable) {
-        currentSelectedLink?.let { link ->
-            viewModel.modifyState { this.addError(link) }
-        }
-
         val currentUrl =
             currentSelectedLink?.let { it.first?.url ?: it.second?.uri?.toString() } ?: "unknown"
         val headers = currentSelectedLink?.first?.headers?.toString() ?: "none"
@@ -1589,22 +1554,8 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private fun noLinksFound() {
         viewModel.forceClearCache = true
-        val hiddenLinks = viewModel.state.sortLinks(currentQualityProfile).count { !it.shouldUseLink }
-
-        context?.let { ctx ->
-            // Display that there are hidden links to the user.
-            if (hiddenLinks > 0) {
-                val noLinksString = ctx.getString(R.string.no_links_found_toast)
-                val hiddenString =
-                    ctx.resources.getQuantityString(R.plurals.links_hidden, hiddenLinks)
-                        .format(hiddenLinks)
-                val toastText = "$noLinksString\n($hiddenString)"
-                showToast(toastText, Toast.LENGTH_SHORT)
-            } else {
-                showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
-            }
-        }
 
+        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
         activity?.popCurrentPage()
     }
 
@@ -1615,9 +1566,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         val links = viewModel.state.sortLinks(currentQualityProfile)
-
-        val firstAvailableLink = links.firstOrNull { it.shouldUseLink }?.link
-        if (firstAvailableLink == null) {
+        if (links.isEmpty()) {
             noLinksFound()
             return
         }
@@ -1625,7 +1574,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (!isPlayerActive.compareAndSet(false, true)) {
             return
         }
-        loadLink(firstAvailableLink, false)
+        loadLink(links.first(), false)
         showPlayerMetadata()
     }
 
@@ -1692,26 +1641,25 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    private fun getNextLink(): DisplayLink? {
-        val links = viewModel.state.sortLinks(currentQualityProfile)
-        val currentIndex = links.indexOfFirst { it.link == currentSelectedLink }
-        val nextPotentialLink =
-            links.withIndex().firstOrNull { it.index > currentIndex && it.value.shouldUseLink }
-        return nextPotentialLink?.value
-    }
-
     override fun hasNextMirror(): Boolean {
-        return getNextLink() != null
+        val links = viewModel.state.sortLinks(currentQualityProfile)
+        return links.isNotEmpty() && links.indexOf(currentSelectedLink) + 1 < links.size
     }
 
     override fun nextMirror() {
-        val nextLink = getNextLink()
-        if (nextLink == null) {
+        val links = viewModel.state.sortLinks(currentQualityProfile)
+        if (links.isEmpty()) {
             noLinksFound()
             return
         }
 
-        loadLink(nextLink.link, true)
+        val newIndex = links.indexOf(currentSelectedLink) + 1
+        if (newIndex >= links.size) {
+            noLinksFound()
+            return
+        }
+
+        loadLink(links[newIndex], true)
     }
 
     override fun onDestroy() {
@@ -2218,7 +2166,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         isPlayerActive.set(false)
         binding?.overlayLoadingSkipButton?.isVisible = false
         binding?.playerLoadingOverlay?.isVisible = true
-        viewModel.modifyState { setError(emptyList()) }
         uiReset()
     }
 
@@ -2272,14 +2219,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                     fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
                 } ?: listOf()
             }
-
-            // Set up TV clock visibility
-            if (isLayout(TV)) {
-                val showTvClock = settingsManager.getBoolean(ctx.getString(R.string.tv_layout_clock_key), false)
-                playerBinding?.playerVideoClock?.isVisible = showTvClock
-            } else {
-                playerBinding?.playerVideoClock?.isVisible = false
-            }
         }
 
         unwrapBundle(savedInstanceState)
@@ -2358,23 +2297,19 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentLinks) { (_, instance) ->
+        observe(viewModel.currentLinks) { (links, instance) ->
             if (instance != viewModel.state.instance) return@observe // Outdated observe
 
-            val sortedLinks = viewModel.state.sortLinks(currentQualityProfile)
-            val usableLinks = sortedLinks.count { link -> link.shouldUseLink }
-
-            val turnVisible = usableLinks > 0 && viewModel.generator?.canSkipLoading == true
+            val turnVisible = links.isNotEmpty() && viewModel.generator?.canSkipLoading == true
             val wasGone = binding.overlayLoadingSkipButton.isGone
 
             binding.overlayLoadingSkipButton.apply {
                 isVisible = turnVisible
-
-                if (usableLinks == 0) {
+                if (links.isEmpty()) {
                     setText(R.string.skip_loading)
                 } else {
                     @SuppressLint("SetTextI18n")
-                    text = "${context.getString(R.string.skip_loading)} (${usableLinks})"
+                    text = "${context.getString(R.string.skip_loading)} (${links.size})"
                 }
             }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index cb8cf8bff..e3c390d50 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -10,8 +10,6 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.ui.player.source_priority.ProfileSettings
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -42,20 +40,12 @@ data class GeneratorState(
     val id: Int?,
 )
 
-data class DisplayLink(
-    val link: VideoLink,
-    // If the link should be displayed and used by the player
-    val shouldUseLink: Boolean,
-    val priority: Int
-)
-
 /** Immutable state of all current links relevant to displaying the video */
 // @MustUseReturnValues
 // @Immutable
 data class VideoState(
     val subtitles: PersistentSet<SubtitleData> = persistentSetOf(),
     val links: PersistentSet<VideoLink> = persistentSetOf(),
-    val erroredLinks: PersistentSet<VideoLink> = persistentSetOf(),
     val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
     val loading: Resource<Unit> = Resource.Loading(),
     val generatorState: GeneratorState? = null,
@@ -66,52 +56,19 @@ data class VideoState(
      *
      * sortedBy is not exactly expensive, but each hasNextMirror does it again, so this alleviates unnecessary recomputation
      * */
-    private val sortedLinks: ConcurrentHashMap<Int, List<DisplayLink>> = ConcurrentHashMap()
+    private val sortedLinks: ConcurrentHashMap<Int, List<VideoLink>> = ConcurrentHashMap()
 
-    /**
-     * The cache is guaranteed to be up to date link-wise due to the immutable links.
-     * However, hideNegativeSources and hideErrorSources could be updated, which requires clearing the cache.
-     */
     fun clearSortedLinksCache() = sortedLinks.clear()
 
-    private fun hasLinkErrored(link: VideoLink): Boolean {
-        return erroredLinks.any { it == link }
-    }
-
-    private fun VideoLink.toDisplayLink(
-        qualityProfile: Int,
-        hideNegativeSources: Boolean,
-        hideErrorSources: Boolean
-    ): DisplayLink {
-        val priority = getLinkPriority(qualityProfile, this.first)
-        val shouldHideLink =
-            (hideNegativeSources && priority < 0) || (hideErrorSources && hasLinkErrored(this))
-        val displayLink = DisplayLink(this, !shouldHideLink, priority)
-
-        return displayLink
-    }
-
     // Modifying sortedLinks is not considered a "visible" side effect, and rerunning it does not change the result
     // It is by all standards, idempotent and by extension also pure as it has no "visible" side effect
     /** Returns .links in the sorted order according to the qualityProfile.
      * Use .links if order is not needed */
     @Contract(pure = true)
-    fun sortLinks(qualityProfile: Int): List<DisplayLink> {
-        sortedLinks[qualityProfile]?.let {
-            return it
-        }
-
-        val hideNegativeSources =
-            QualityDataHelper.getProfileSetting(qualityProfile, ProfileSettings.HideNegativeSources)
-        val hideErrorSources =
-            QualityDataHelper.getProfileSetting(qualityProfile, ProfileSettings.HideErrorSources)
-
-        return links.map { link ->
+    fun sortLinks(qualityProfile: Int): List<VideoLink> {
+        return sortedLinks[qualityProfile] ?: links.sortedBy { link ->
             // negative because we want to sort highest quality first
-            link.toDisplayLink(qualityProfile, hideNegativeSources, hideErrorSources)
-        }.sortedBy {
-            // negative because we want to sort highest quality first
-            -it.priority
+            -getLinkPriority(qualityProfile, link.first)
         }.also { value -> sortedLinks[qualityProfile] = value }
     }
 
@@ -156,12 +113,6 @@ data class VideoState(
     @JvmName("setVideoSkipStamp")
     @Contract(pure = true)
     fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
-
-    @Contract(pure = true)
-    fun addError(item: VideoLink): VideoState = copy(erroredLinks = erroredLinks.add(item))
-
-    @Contract(pure = true)
-    fun setError(items: Collection<VideoLink>): VideoState = copy(erroredLinks = items.toPersistentSet())
 }
 
 data class VideoLive<T>(
@@ -190,8 +141,9 @@ class PlayerGeneratorViewModel : ViewModel() {
     var state = VideoState(instance = 0)
         private set
 
-    private val _currentLinks = MutableLiveData<VideoLive<Set<VideoLink>>>(null)
-    val currentLinks: LiveData<VideoLive<Set<VideoLink>>> = _currentLinks
+    private val _currentLinks =
+        MutableLiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>>(null)
+    val currentLinks: LiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>> = _currentLinks
 
     private val _currentSubtitles = MutableLiveData<VideoLive<Set<SubtitleData>>>(null)
     val currentSubtitles: LiveData<VideoLive<Set<SubtitleData>>> = _currentSubtitles
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
index f62bad58d..ee6170aa5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
@@ -8,14 +8,11 @@ import androidx.annotation.OptIn
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.SubtitleView
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 enum class SubtitleStatus {
     IS_ACTIVE,
@@ -35,19 +32,17 @@ enum class SubtitleOrigin {
  * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend id
  * @param headers if empty it will use the base onlineDataSource headers else only the specified headers
  * @param languageCode usually, tags such as "en", "es-mx", or "zh-hant-TW". But it could be something like "English 4"
- */
-@Serializable
+ * */
 data class SubtitleData(
-    @SerialName("originalName") val originalName: String,
-    @SerialName("nameSuffix") val nameSuffix: String,
-    @SerialName("url") val url: String,
-    @SerialName("origin") val origin: SubtitleOrigin,
-    @SerialName("mimeType") val mimeType: String,
-    @SerialName("headers") val headers: Map<String, String>,
-    @SerialName("languageCode") val languageCode: String?,
+    val originalName: String,
+    val nameSuffix: String,
+    val url: String,
+    val origin: SubtitleOrigin,
+    val mimeType: String,
+    val headers: Map<String, String>,
+    val languageCode: String?,
 ) {
-    /** Internal ID for media3, unique for each link. */
-    @JsonIgnore
+    /** Internal ID for exoplayer, unique for each link*/
     fun getId(): String {
         return if (origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) url
         else "$url|$name"
@@ -59,22 +54,22 @@ data class SubtitleData(
     }
 
     /** Tries hard to figure out a valid IETF tag based on language code and name. Will return null if not found. */
-    @JsonIgnore
     fun getIETF_tag(): String? {
         return fromLanguageToTagIETF(this.languageCode) ?: fromLanguageToTagIETF(this.originalName, halfMatch = true)
     }
 
-    @SerialName("name") val name = "$originalName $nameSuffix"
+    val name = "$originalName $nameSuffix"
 
     /**
      * Gets the URL, but tries to fix it if it is malformed.
      */
-    @JsonIgnore
     fun getFixedUrl(): String {
         // Some extensions fail to include the protocol, this helps with that.
         val fixedSubUrl = if (this.url.startsWith("//")) {
             "https:${this.url}"
-        } else this.url
+        } else {
+            this.url
+        }
         return fixedSubUrl
     }
 }
@@ -147,4 +142,4 @@ class PlayerSubtitleHelper {
             setSubStyle(it)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
index 7e5d04eb0..2e554f75e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
@@ -9,8 +9,6 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import torrServer.TorrServer
 import java.io.File
 import java.net.ConnectException
@@ -34,14 +32,14 @@ object Torrent {
 
     /** Returns true if the server is up */
     private suspend fun echo(): Boolean {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             return false
         }
         return try {
             app.get(
                 "$TORRENT_SERVER_URL/echo",
             ).text.isNotEmpty()
-        } catch (_: ConnectException) {
+        } catch (e: ConnectException) {
             // `Failed to connect to /127.0.0.1:8090` if the server is down
             false
         } catch (t: Throwable) {
@@ -54,7 +52,7 @@ object Torrent {
     /** Gracefully shutdown the server.
      * should not be used because I am unable to start it again, and the stopTorrentServer() crashes the app */
     suspend fun shutdown(): Boolean {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             return false
         }
         return try {
@@ -70,7 +68,7 @@ object Torrent {
     /** Lists all torrents by the server */
     @Throws
     private suspend fun list(): Array<TorrentStatus> {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             throw ErrorLoadingException("Not initialized")
         }
         return app.post(
@@ -85,7 +83,7 @@ object Torrent {
 
     /** Drops a single torrent, (I think) this means closing the stream. Returns returns if it is successful */
     private suspend fun drop(hash: String): Boolean {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             return false
         }
         return try {
@@ -106,7 +104,7 @@ object Torrent {
 
     /** Removes a single torrent from the server registry */
     private suspend fun rem(hash: String): Boolean {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             return false
         }
         return try {
@@ -128,7 +126,7 @@ object Torrent {
 
     /** Removes all torrents from the server, and returns if it is successful */
     suspend fun clearAll(): Boolean {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             return true
         }
         return try {
@@ -166,8 +164,10 @@ object Torrent {
     /** Gets all the metadata of a torrent, will throw if that hash does not exists
      * https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L126 */
     @Throws
-    suspend fun get(hash: String): TorrentStatus {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+    suspend fun get(
+        hash: String,
+    ): TorrentStatus {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             throw ErrorLoadingException("Not initialized")
         }
         return app.post(
@@ -184,7 +184,7 @@ object Torrent {
     /** Adds a torrent to the server, this is needed for us to get the hash for further modification, as well as start streaming it*/
     @Throws
     private suspend fun add(url: String): TorrentStatus {
-        if (TORRENT_SERVER_URL.isEmpty()) {
+        if(TORRENT_SERVER_URL.isEmpty()) {
             throw ErrorLoadingException("Not initialized")
         }
         return app.post(
@@ -204,7 +204,7 @@ object Torrent {
             return true
         }
         val port = TorrServer.startTorrentServer(dir, 0)
-        if (port < 0) {
+        if(port < 0) {
             return false
         }
         TORRENT_SERVER_URL = "http://127.0.0.1:$port"
@@ -278,55 +278,94 @@ object Torrent {
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L18
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/main/web/api/route.go#L7
-    @Serializable
     data class TorrentRequest(
-        @JsonProperty("action") @SerialName("action") val action: String,
-        @JsonProperty("hash") @SerialName("hash") val hash: String = "",
-        @JsonProperty("link") @SerialName("link") val link: String = "",
-        @JsonProperty("title") @SerialName("title") val title: String = "",
-        @JsonProperty("poster") @SerialName("poster") val poster: String = "",
-        @JsonProperty("data") @SerialName("data") val data: String = "",
-        @JsonProperty("save_to_db") @SerialName("save_to_db") val saveToDB: Boolean = false,
+        @JsonProperty("action")
+        val action: String,
+        @JsonProperty("hash")
+        val hash: String = "",
+        @JsonProperty("link")
+        val link: String = "",
+        @JsonProperty("title")
+        val title: String = "",
+        @JsonProperty("poster")
+        val poster: String = "",
+        @JsonProperty("data")
+        val data: String = "",
+        @JsonProperty("save_to_db")
+        val saveToDB: Boolean = false,
     )
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/torr/state/state.go#L33
     // omitempty = nullable
-    @Serializable
     data class TorrentStatus(
-        @JsonProperty("title") @SerialName("title") var title: String,
-        @JsonProperty("poster") @SerialName("poster") var poster: String,
-        @JsonProperty("data") @SerialName("data") var data: String?,
-        @JsonProperty("timestamp") @SerialName("timestamp") var timestamp: Long,
-        @JsonProperty("name") @SerialName("name") var name: String?,
-        @JsonProperty("hash") @SerialName("hash") var hash: String?,
-        @JsonProperty("stat") @SerialName("stat") var stat: Int,
-        @JsonProperty("stat_string") @SerialName("stat_string") var statString: String,
-        @JsonProperty("loaded_size") @SerialName("loaded_size") var loadedSize: Long?,
-        @JsonProperty("torrent_size") @SerialName("torrent_size") var torrentSize: Long?,
-        @JsonProperty("preloaded_bytes") @SerialName("preloaded_bytes") var preloadedBytes: Long?,
-        @JsonProperty("preload_size") @SerialName("preload_size") var preloadSize: Long?,
-        @JsonProperty("download_speed") @SerialName("download_speed") var downloadSpeed: Double?,
-        @JsonProperty("upload_speed") @SerialName("upload_speed") var uploadSpeed: Double?,
-        @JsonProperty("total_peers") @SerialName("total_peers") var totalPeers: Int?,
-        @JsonProperty("pending_peers") @SerialName("pending_peers") var pendingPeers: Int?,
-        @JsonProperty("active_peers") @SerialName("active_peers") var activePeers: Int?,
-        @JsonProperty("connected_seeders") @SerialName("connected_seeders") var connectedSeeders: Int?,
-        @JsonProperty("half_open_peers") @SerialName("half_open_peers") var halfOpenPeers: Int?,
-        @JsonProperty("bytes_written") @SerialName("bytes_written") var bytesWritten: Long?,
-        @JsonProperty("bytes_written_data") @SerialName("bytes_written_data") var bytesWrittenData: Long?,
-        @JsonProperty("bytes_read") @SerialName("bytes_read") var bytesRead: Long?,
-        @JsonProperty("bytes_read_data") @SerialName("bytes_read_data") var bytesReadData: Long?,
-        @JsonProperty("bytes_read_useful_data") @SerialName("bytes_read_useful_data") var bytesReadUsefulData: Long?,
-        @JsonProperty("chunks_written") @SerialName("chunks_written") var chunksWritten: Long?,
-        @JsonProperty("chunks_read") @SerialName("chunks_read") var chunksRead: Long?,
-        @JsonProperty("chunks_read_useful") @SerialName("chunks_read_useful") var chunksReadUseful: Long?,
-        @JsonProperty("chunks_read_wasted") @SerialName("chunks_read_wasted") var chunksReadWasted: Long?,
-        @JsonProperty("pieces_dirtied_good") @SerialName("pieces_dirtied_good") var piecesDirtiedGood: Long?,
-        @JsonProperty("pieces_dirtied_bad") @SerialName("pieces_dirtied_bad") var piecesDirtiedBad: Long?,
-        @JsonProperty("duration_seconds") @SerialName("duration_seconds") var durationSeconds: Double?,
-        @JsonProperty("bit_rate") @SerialName("bit_rate") var bitRate: String?,
-        @JsonProperty("file_stats") @SerialName("file_stats") var fileStats: List<TorrentFileStat>?,
-        @JsonProperty("trackers") @SerialName("trackers") var trackers: List<String>?,
+        @JsonProperty("title")
+        var title: String,
+        @JsonProperty("poster")
+        var poster: String,
+        @JsonProperty("data")
+        var data: String?,
+        @JsonProperty("timestamp")
+        var timestamp: Long,
+        @JsonProperty("name")
+        var name: String?,
+        @JsonProperty("hash")
+        var hash: String?,
+        @JsonProperty("stat")
+        var stat: Int,
+        @JsonProperty("stat_string")
+        var statString: String,
+        @JsonProperty("loaded_size")
+        var loadedSize: Long?,
+        @JsonProperty("torrent_size")
+        var torrentSize: Long?,
+        @JsonProperty("preloaded_bytes")
+        var preloadedBytes: Long?,
+        @JsonProperty("preload_size")
+        var preloadSize: Long?,
+        @JsonProperty("download_speed")
+        var downloadSpeed: Double?,
+        @JsonProperty("upload_speed")
+        var uploadSpeed: Double?,
+        @JsonProperty("total_peers")
+        var totalPeers: Int?,
+        @JsonProperty("pending_peers")
+        var pendingPeers: Int?,
+        @JsonProperty("active_peers")
+        var activePeers: Int?,
+        @JsonProperty("connected_seeders")
+        var connectedSeeders: Int?,
+        @JsonProperty("half_open_peers")
+        var halfOpenPeers: Int?,
+        @JsonProperty("bytes_written")
+        var bytesWritten: Long?,
+        @JsonProperty("bytes_written_data")
+        var bytesWrittenData: Long?,
+        @JsonProperty("bytes_read")
+        var bytesRead: Long?,
+        @JsonProperty("bytes_read_data")
+        var bytesReadData: Long?,
+        @JsonProperty("bytes_read_useful_data")
+        var bytesReadUsefulData: Long?,
+        @JsonProperty("chunks_written")
+        var chunksWritten: Long?,
+        @JsonProperty("chunks_read")
+        var chunksRead: Long?,
+        @JsonProperty("chunks_read_useful")
+        var chunksReadUseful: Long?,
+        @JsonProperty("chunks_read_wasted")
+        var chunksReadWasted: Long?,
+        @JsonProperty("pieces_dirtied_good")
+        var piecesDirtiedGood: Long?,
+        @JsonProperty("pieces_dirtied_bad")
+        var piecesDirtiedBad: Long?,
+        @JsonProperty("duration_seconds")
+        var durationSeconds: Double?,
+        @JsonProperty("bit_rate")
+        var bitRate: String?,
+        @JsonProperty("file_stats")
+        var fileStats: List<TorrentFileStat>?,
+        @JsonProperty("trackers")
+        var trackers: List<String>?,
     ) {
         fun streamUrl(url: String): String {
             val fileName =
@@ -342,10 +381,12 @@ object Torrent {
         }
     }
 
-    @Serializable
     data class TorrentFileStat(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("path") @SerialName("path") val path: String?,
-        @JsonProperty("length") @SerialName("length") val length: Long?,
+        @JsonProperty("id")
+        val id: Int?,
+        @JsonProperty("path")
+        val path: String?,
+        @JsonProperty("length")
+        val length: Long?,
     )
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt
index d8d47bd10..02470484e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt
@@ -12,16 +12,12 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import java.util.EnumMap
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.also
 import kotlin.math.abs
 
 object QualityDataHelper {
     private const val VIDEO_SOURCE_PRIORITY = "video_source_priority"
     private const val VIDEO_PROFILE_NAME = "video_profile_name"
     private const val VIDEO_QUALITY_PRIORITY = "video_quality_priority"
-    const val VIDEO_PROFILE_SETTINGS = "video_profile_settings"
 
     // Old key only supporting one type per profile
     @Deprecated("Changed to support multiple types per profile")
@@ -57,21 +53,13 @@ object QualityDataHelper {
         val types: Set<QualityProfileType>
     )
 
-
-    // Map profile and name to priority
-    val sourcePriorityCache: ConcurrentHashMap<Int, HashMap<String, Int>> = ConcurrentHashMap()
-
     fun getSourcePriority(profile: Int, name: String?): Int {
         if (name == null) return DEFAULT_SOURCE_PRIORITY
-
-        return sourcePriorityCache[profile]?.get(name) ?: (getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile",
             name,
             DEFAULT_SOURCE_PRIORITY
-        ) ?: DEFAULT_SOURCE_PRIORITY).also {
-            sourcePriorityCache.getOrPut(profile) { hashMapOf() }
-            sourcePriorityCache[profile]?.set(name, it)
-        }
+        ) ?: DEFAULT_SOURCE_PRIORITY
     }
 
     fun getAllSourcePriorityNames(profile: Int): List<String> {
@@ -89,8 +77,6 @@ object QualityDataHelper {
         } else {
             setKey(folder, name, priority)
         }
-
-        sourcePriorityCache[profile]?.set(name, priority)
     }
 
     fun setProfileName(profile: Int, name: String?) {
@@ -107,17 +93,12 @@ object QualityDataHelper {
             ?: txt(R.string.profile_number, profile)
     }
 
-    // Map profile and quality to priority
-    val qualityPriorityCache: ConcurrentHashMap<Int, EnumMap<Qualities, Int>> = ConcurrentHashMap()
     fun getQualityPriority(profile: Int, quality: Qualities): Int {
-        return qualityPriorityCache[profile]?.get(quality) ?: (getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_QUALITY_PRIORITY/$profile",
             quality.value.toString(),
             quality.defaultPriority
-        )?.also {
-            qualityPriorityCache.getOrPut(profile) { EnumMap(Qualities::class.java) }
-            qualityPriorityCache[profile]?.set(quality, it)
-        }) ?: quality.defaultPriority
+        ) ?: quality.defaultPriority
     }
 
     fun setQualityPriority(profile: Int, quality: Qualities, priority: Int) {
@@ -126,24 +107,8 @@ object QualityDataHelper {
             quality.value.toString(),
             priority
         )
-        qualityPriorityCache[profile]?.set(quality, priority)
     }
 
-    fun <T> setProfileSetting(profile: Int, setting: ProfileSettings<T>, value: T) {
-        val folder = "$currentAccount/$VIDEO_PROFILE_SETTINGS/$profile"
-        // Prevent unnecessary keys
-        if (value == setting.defaultValue) {
-            removeKey(folder, setting.key)
-        } else {
-            setKey(folder, setting.key, value)
-        }
-    }
-
-    inline fun <reified T : Any> getProfileSetting(profile: Int, setting: ProfileSettings<T>): T {
-        val folder = "$currentAccount/$VIDEO_PROFILE_SETTINGS/$profile"
-        val value = getKey<T>(folder, setting.key)
-        return value ?: setting.defaultValue
-    }
 
     @Suppress("DEPRECATION")
     fun getQualityProfileTypes(profile: Int): Set<QualityProfileType> {
@@ -258,9 +223,4 @@ object QualityDataHelper {
         if (target == null) return Qualities.Unknown
         return Qualities.entries.minBy { abs(it.value - target) }
     }
-}
-
-sealed class ProfileSettings<T>(val key: String, val defaultValue: T) {
-    object HideErrorSources : ProfileSettings<Boolean>("hide_error_sources", false)
-    object HideNegativeSources : ProfileSettings<Boolean>("hide_negative_sources", false)
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
index e1b8ad479..6a0f12e9a 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,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
-import android.app.Activity
 import android.app.Dialog
 import androidx.annotation.StyleRes
 import androidx.core.view.isVisible
@@ -27,7 +26,7 @@ data class LinkSource(
 
 
 class QualityProfileDialog private constructor(
-    val activity: Activity,
+    val activity: FragmentActivity,
     @StyleRes val themeRes: Int,
     private val links: List<LinkSource>,
     private val usedProfile: Int?,
@@ -35,7 +34,7 @@ class QualityProfileDialog private constructor(
     private val useProfileSelection: Boolean
 ) : Dialog(activity, themeRes) {
     constructor(
-        activity: Activity,
+        activity: FragmentActivity,
         @StyleRes themeRes: Int,
         links: List<LinkSource>,
         usedProfile: Int,
@@ -43,7 +42,7 @@ class QualityProfileDialog private constructor(
     ) : this(activity, themeRes, links, usedProfile, profileSelectionCallback, true)
 
     constructor(
-        activity: Activity,
+        activity: FragmentActivity,
         @StyleRes themeRes: Int,
         links: List<LinkSource>
     ) : this(activity, themeRes, links, null, null, false)
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 604ec3149..c8ac96ebb 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
@@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SourcePriorityDialog(
     val ctx: Context,
-    @StyleRes val themeRes: Int,
+    @StyleRes themeRes: Int,
     val links: List<LinkSource>,
     private val profile: QualityDataHelper.QualityProfile,
     /**
@@ -28,79 +28,76 @@ class SourcePriorityDialog(
             PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
         setContentView(binding.root)
         fixSystemBarsPadding(binding.root)
+        val sourcesRecyclerView = binding.sortSources
+        val qualitiesRecyclerView = binding.sortQualities
+        val profileText = binding.profileTextEditable
+        val saveBtt = binding.saveBtt
+        val exitBtt = binding.closeBtt
+        val helpBtt = binding.helpBtt
 
-        binding.apply {
-            profileTextEditable.setText(
-                QualityDataHelper.getProfileName(profile.id).asString(context)
-            )
-            profileTextEditable.hint = txt(R.string.profile_number, profile.id).asString(context)
+        profileText.setText(QualityDataHelper.getProfileName(profile.id).asString(context))
+        profileText.hint = txt(R.string.profile_number, profile.id).asString(context)
 
-            sortSources.adapter = PriorityAdapter<Nothing?>(
-            ).apply {
-                val sortedLinks = links.map { link ->
-                    SourcePriority(
-                        null,
-                        link.source,
-                        QualityDataHelper.getSourcePriority(profile.id, link.source)
-                    )
-                }.distinctBy { it.name }.sortedBy { -it.priority }
-
-                submitList(sortedLinks)
-            }
-
-            sortQualities.adapter = PriorityAdapter<Qualities>(
-            ).apply {
-                submitList(Qualities.entries.mapNotNull {
-                    SourcePriority(
-                        it,
-                        Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null },
-                        QualityDataHelper.getQualityPriority(profile.id, it)
-                    )
-                }.sortedBy { -it.priority })
-            }
-
-            @Suppress("UNCHECKED_CAST") // We know the types
-            saveBtt.setOnClickListener {
-                val qualityAdapter = sortQualities.adapter as? PriorityAdapter<Qualities>
-                val sourcesAdapter = sortSources.adapter as? PriorityAdapter<Nothing?>
-
-                val qualities = qualityAdapter?.immutableCurrentList ?: emptyList()
-                val sources = sourcesAdapter?.immutableCurrentList ?: emptyList()
-
-                qualities.forEach {
-                    QualityDataHelper.setQualityPriority(profile.id, it.data, it.priority)
-                }
-
-                sources.forEach {
-                    QualityDataHelper.setSourcePriority(profile.id, it.name, it.priority)
-                }
-
-                qualityAdapter?.submitList(qualities.sortedBy { -it.priority })
-                sourcesAdapter?.submitList(sources.sortedBy { -it.priority })
-
-                val savedProfileName = profileTextEditable.text.toString()
-                if (savedProfileName.isBlank()) {
-                    QualityDataHelper.setProfileName(profile.id, null)
-                } else {
-                    QualityDataHelper.setProfileName(profile.id, savedProfileName)
-                }
-                updatedCallback.invoke()
-            }
-
-            closeBtt.setOnClickListener {
-                dismissSafe()
-            }
-
-            helpBtt.setOnClickListener {
-                AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
-                    setMessage(R.string.quality_profile_help)
-                }.show()
-            }
-
-            settingsBtt.setOnClickListener {
-                SourceProfileSettingsDialog(ctx, themeRes, profile.id).show()
-            }
+        sourcesRecyclerView.adapter = PriorityAdapter<Nothing?>(
+        ).apply {
+            submitList(links.map { link ->
+                SourcePriority(
+                    null,
+                    link.source,
+                    QualityDataHelper.getSourcePriority(profile.id, link.source)
+                )
+            }.distinctBy { it.name }.sortedBy { -it.priority })
         }
+
+        qualitiesRecyclerView.adapter = PriorityAdapter<Qualities>(
+        ).apply {
+            submitList(Qualities.entries.mapNotNull {
+                SourcePriority(
+                    it,
+                    Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null },
+                    QualityDataHelper.getQualityPriority(profile.id, it)
+                )
+            }.sortedBy { -it.priority })
+        }
+
+        @Suppress("UNCHECKED_CAST") // We know the types
+        saveBtt.setOnClickListener {
+            val qualityAdapter = qualitiesRecyclerView.adapter as? PriorityAdapter<Qualities>
+            val sourcesAdapter = sourcesRecyclerView.adapter as? PriorityAdapter<Nothing?>
+
+            val qualities = qualityAdapter?.immutableCurrentList ?: emptyList()
+            val sources = sourcesAdapter?.immutableCurrentList ?: emptyList()
+
+            qualities.forEach {
+                QualityDataHelper.setQualityPriority(profile.id, it.data, it.priority)
+            }
+
+            sources.forEach {
+                QualityDataHelper.setSourcePriority(profile.id, it.name, it.priority)
+            }
+
+            qualityAdapter?.submitList(qualities.sortedBy { -it.priority })
+            sourcesAdapter?.submitList(sources.sortedBy { -it.priority })
+
+            val savedProfileName = profileText.text.toString()
+            if (savedProfileName.isBlank()) {
+                QualityDataHelper.setProfileName(profile.id, null)
+            } else {
+                QualityDataHelper.setProfileName(profile.id, savedProfileName)
+            }
+            updatedCallback.invoke()
+        }
+
+        exitBtt.setOnClickListener {
+            this.dismissSafe()
+        }
+
+        helpBtt.setOnClickListener {
+            AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
+                setMessage(R.string.quality_profile_help)
+            }.show()
+        }
+
         super.show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourceProfileSettingsDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourceProfileSettingsDialog.kt
deleted file mode 100644
index c26955b5e..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourceProfileSettingsDialog.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.lagradost.cloudstream3.ui.player.source_priority
-
-import android.app.Dialog
-import android.content.Context
-import android.view.LayoutInflater
-import androidx.annotation.StyleRes
-import com.lagradost.cloudstream3.databinding.SourceProfileSettingsDialogBinding
-import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-
-class SourceProfileSettingsDialog(
-    val ctx: Context,
-    @StyleRes themeRes: Int,
-    val profile: Int
-) : Dialog(ctx, themeRes) {
-     override fun show() {
-         val binding =
-             SourceProfileSettingsDialogBinding.inflate(LayoutInflater.from(ctx), null, false)
-         setContentView(binding.root)
-         fixSystemBarsPadding(binding.root)
-
-         binding.apply {
-             var hideErrorSources = QualityDataHelper.getProfileSetting(profile, ProfileSettings.HideErrorSources)
-             var hideNegativeSources = QualityDataHelper.getProfileSetting(profile, ProfileSettings.HideNegativeSources)
-
-             profileHideErrorSources.isChecked = hideErrorSources
-             profileHideErrorSources.setOnCheckedChangeListener { _, bool ->
-                 hideErrorSources = bool
-             }
-
-             profileHideNegativeSources.isChecked = hideNegativeSources
-             profileHideNegativeSources.setOnCheckedChangeListener { _, bool ->
-                 hideNegativeSources = bool
-             }
-
-             applyBtt.setOnClickListener {
-                 QualityDataHelper.setProfileSetting(profile, ProfileSettings.HideErrorSources, hideErrorSources)
-                 QualityDataHelper.setProfileSetting(profile, ProfileSettings.HideNegativeSources, hideNegativeSources)
-                 dismissSafe()
-             }
-
-             cancelBtt.setOnClickListener {
-                 dismissSafe()
-             }
-         }
-         super.show()
-     }
-}
\ No newline at end of file
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 71909c5d3..cbf94fd97 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
@@ -21,8 +21,6 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UiImage
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -36,32 +34,33 @@ enum class VideoWatchState {
     Watched
 }
 
-@Serializable
 data class ResultEpisode(
-    @SerialName("headerName") val headerName: String,
-    @SerialName("name") val name: String?,
-    @SerialName("poster") val poster: String?,
-    @SerialName("episode") val episode: Int,
-    @SerialName("seasonIndex") val seasonIndex: Int?, // this is the "season" index used season names
-    @SerialName("season") val season: Int?, // this is the display
-    @SerialName("data") val data: String,
-    @SerialName("apiName") val apiName: String,
-    @SerialName("id") val id: Int,
-    @SerialName("index") val index: Int,
-    @SerialName("position") val position: Long, // time in MS
-    @SerialName("duration") val duration: Long, // duration in MS
-    @SerialName("score") val score: Score?,
-    @SerialName("description") val description: String?,
-    @SerialName("isFiller") val isFiller: Boolean?,
-    @SerialName("tvType") val tvType: TvType,
-    @SerialName("parentId") val parentId: Int,
-    /** Conveys if the episode itself is marked as watched. */
-    @SerialName("videoWatchState") val videoWatchState: VideoWatchState,
-    /** Sum of all previous season episode counts + episode. */
-    @SerialName("totalEpisodeIndex") val totalEpisodeIndex: Int? = null,
-    @SerialName("airDate") val airDate: Long? = null,
-    @SerialName("runTime") val runTime: Int? = null,
-    @SerialName("seasonData") val seasonData: SeasonData? = null,
+    val headerName: String,
+    val name: String?,
+    val poster: String?,
+    val episode: Int,
+    val seasonIndex: Int?,  // this is the "season" index used season names
+    val season: Int?, // this is the display
+    val data: String,
+    val apiName: String,
+    val id: Int,
+    val index: Int,
+    val position: Long, // time in MS
+    val duration: Long, // duration in MS
+    val score: Score?,
+    val description: String?,
+    val isFiller: Boolean?,
+    val tvType: TvType,
+    val parentId: Int,
+    /**
+     * Conveys if the episode itself is marked as watched
+     **/
+    val videoWatchState: VideoWatchState,
+    /** Sum of all previous season episode counts + episode */
+    val totalEpisodeIndex: Int? = null,
+    val airDate: Long? = null,
+    val runTime: Int? = null,
+    val seasonData: SeasonData? = null,
 )
 
 fun ResultEpisode.getRealPosition(): Long {
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 c316fae17..cfbacc5d1 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
@@ -874,9 +874,10 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                         resultMetaRating.setText(d.ratingText)
                         resultMetaStatus.setText(d.onGoingText)
                         resultMetaContentRating.setText(d.contentRatingText)
+                        resultCastText.setText(d.actorsText)
                         resultNextAiring.setText(d.nextAiringEpisode)
                         resultNextAiringTime.setText(d.nextAiringDate)
-                        resultPoster.loadImage(d.posterImage, headers = d.posterHeaders)
+                        resultPoster.loadImage(d.posterImage)
 
                         var isExpanded = false
                         resultDescription.apply {
@@ -909,7 +910,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                             R.drawable.profile_bg_teal
                         ).random()
 
-                        backgroundPoster.loadImage(d.posterBackgroundImage, headers = d.posterHeaders) {
+                        backgroundPoster.loadImage(d.posterBackgroundImage) {
                             error { getImageFromDrawable(context ?: return@error null, error) }
                         }
 
@@ -931,7 +932,6 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                             true
                         )
 
-                        resultCastText.setText(if (showCast) d.actorsText else null)
                         resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
                         (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
 
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 dd5b97711..5f5b064b5 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
@@ -149,7 +149,6 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
 
     override fun onResume() {
         super.onResume()
-        searchViewModel.clearSuggestions()
         afterPluginsLoadedEvent += ::reloadRepos
     }
 
@@ -168,7 +167,6 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
      **/
     fun search(query: String?) {
         if (query == null) return
-        searchViewModel.clearSuggestions()
         // don't resume state from prev search
         (binding?.searchMasterRecycler?.adapter as? BaseAdapter<*, *>)?.clearState()
         context?.let { ctx ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/ApkUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/ApkUpdater.kt
deleted file mode 100644
index 08e279b49..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/ApkUpdater.kt
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import android.os.Build
-import androidx.core.content.FileProvider
-import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.CommonActivity
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.receivers.PackageInstallerStatusReceiver
-import com.lagradost.cloudstream4.AppSettings
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.InputStream
-import java.io.OutputStream
-import java.security.DigestException
-import java.security.MessageDigest
-
-object ApkUpdater : AppUpdater {
-    private const val APP_UPDATE_NAME = "CloudStream"
-    private const val APP_UPDATE_SUFFIX = "apk"
-
-    @Throws
-    override suspend fun update(
-        settings: AppSettings,
-        url: String,
-        digest: DigestPair?,
-        downloadProgress: (Long, Long?) -> Unit
-    ) {
-        val activity = CommonActivity.activity ?: throw ErrorLoadingException("No activity found")
-        clearOldFiles(activity)
-
-        val request = app.get(url)
-        val length = request.size
-        val body = request.body
-        body.use { body ->
-            val length = length ?: body.contentLength()
-            val readStream = body.byteStream()
-
-            when (settings.updates.apkInstaller.get()) {
-                0 -> {
-                    packageInstallerDownloader(
-                        activity,
-                        readStream,
-                        length,
-                        digest,
-                        downloadProgress
-                    )
-                }
-
-                else -> {
-                    legacyDownloader(activity, readStream, length, digest, downloadProgress)
-                }
-            }
-        }
-    }
-
-    fun clearOldFiles(activity: Activity) {
-        // Delete old files
-        activity.cacheDir.listFiles()?.filter {
-            it.name.startsWith(APP_UPDATE_NAME) && it.extension == APP_UPDATE_SUFFIX
-        }?.forEach {
-            deleteFileOnExit(it)
-        }
-    }
-
-    /** https://medium.com/@solrudev/painless-building-of-an-android-package-installer-app-d5a09b5df432 */
-    @SuppressLint("RequestInstallPackagesPolicy")
-    @Throws
-    suspend fun packageInstallerDownloader(
-        activity: Activity,
-        readStream: InputStream,
-        length: Long?,
-        digest: DigestPair?,
-        downloadProgress: (Long, Long?) -> Unit,
-    ) = withContext(Dispatchers.IO) {
-        var sessionId: Int? = null
-        val packageInstaller = activity.packageManager.packageInstaller
-        try {
-            val installParams =
-                PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                installParams.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
-            }
-            if (length != null) {
-                installParams.setSize(length)
-            }
-
-            sessionId = packageInstaller.createSession(installParams)
-            val session = packageInstaller.openSession(sessionId)
-
-            // We do not need to buffer this because transfer has large writes
-            session.openWrite(activity.packageName, 0, length ?: -1L)
-                .use { writeStream ->
-                    transfer(writeStream, readStream, length, downloadProgress, digest)
-                    session.fsync(writeStream)
-                }
-
-            val receiverIntent = Intent(activity, PackageInstallerStatusReceiver::class.java)
-            val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            } else {
-                PendingIntent.FLAG_UPDATE_CURRENT
-            }
-            val receiverPendingIntent =
-                PendingIntent.getBroadcast(activity, 0, receiverIntent, flags)
-
-            // Avoid delayed updates, and just commit instantly
-            session.commit(receiverPendingIntent.intentSender)
-            session.close()
-        } catch (t: Throwable) {
-            sessionId?.let { sessionId ->
-                packageInstaller.abandonSession(sessionId)
-            }
-            throw t
-        }
-    }
-
-    /**
-     * Write the "readStream" to the "writeStream", while notifying the "downloadProgress" and
-     * calculating the digest
-     *
-     * ------------------------------------------------------------------------------------------
-     *
-     * throws a DigestException if the Digest can be calculated (non-null + correct algorithm),
-     * and is mismatched
-     *
-     * throws a CancellationException if canceled, but may not be "instant" if the read is blocking
-     *
-     * throws IOException and similar for reading
-     *
-     * ------------------------------------------------------------------------------------------
-     *
-     * In case of crashes from the digest, we ignore it as we do not want to "block" someone from
-     * updating if they got a broken OS without the desired algorithm or implementation.
-     *
-     * This is because a malicious CDN should not be able to "crash" the algorithm, but a broken
-     * OS will. And recovering from a broken OS by ignoring it is better than refusing it.
-     * */
-    @Throws
-    suspend fun transfer(
-        writeStream: OutputStream,
-        readStream: InputStream,
-        length: Long?,
-        downloadProgress: (Long, Long?) -> Unit,
-        digest: DigestPair?,
-    ) = withContext(Dispatchers.IO) {
-        val md = digest?.algorithm?.let { digestAlgorithm ->
-            safe {
-                MessageDigest.getInstance(digestAlgorithm)
-            }
-        }
-
-        val context = currentCoroutineContext()
-        val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
-        var read: Int
-        var transferred: Long = 0
-        while ((readStream.read(buffer, 0, DEFAULT_BUFFER_SIZE)
-                .also { read = it }) >= 0
-        ) {
-            writeStream.write(buffer, 0, read)
-
-            safe {
-                md?.update(buffer, 0, read)
-            }
-
-            transferred += read.toLong()
-            downloadProgress(transferred, length)
-            context.ensureActive()
-        }
-        writeStream.flush()
-
-        val check = safe { md?.digest() }
-        if (check != null && !check.contentEquals(digest?.digest)) {
-            throw DigestException("Mismatched digest on transfer ${digest?.algorithm} : ${check.toHexString()} / ${digest?.digest?.toHexString()}")
-        }
-    }
-
-    @Throws
-    suspend fun legacyDownloader(
-        activity: Activity,
-        readStream: InputStream,
-        length: Long?,
-        digest: DigestPair?,
-        downloadProgress: (Long, Long?) -> Unit
-    ) = withContext(Dispatchers.IO) {
-        val downloadedFile = File.createTempFile(APP_UPDATE_NAME, ".$APP_UPDATE_SUFFIX")
-
-        // We do not need to buffer this because transfer has large writes
-        downloadedFile.outputStream().use { writeStream ->
-            transfer(writeStream, readStream, length, downloadProgress, digest)
-        }
-
-        openApk(activity, downloadedFile)
-    }
-
-    fun openApk(context: Context, file: File) {
-        val contentUri = FileProvider.getUriForFile(
-            context, BuildConfig.APPLICATION_ID + ".provider", file
-        )
-        val installIntent = Intent(Intent.ACTION_VIEW).apply {
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
-            data = contentUri
-        }
-        context.startActivity(installIntent)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubReleases.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubReleases.kt
deleted file mode 100644
index 94e0ebf4a..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubReleases.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import androidx.compose.runtime.Immutable
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.app
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlin.jvm.Throws
-
-object GithubReleases {
-    @Serializable
-    private data class GithubAsset(
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("size") @SerialName("size") val size: Int, // Size in bytes
-        @JsonProperty("browser_download_url") @SerialName("browser_download_url") val browserDownloadUrl: String,
-        @JsonProperty("content_type") @SerialName("content_type") val contentType: String, // application/vnd.android.package-archive
-        @JsonProperty("digest") @SerialName("digest") val digest: String? = null, // sha256:..., may be null
-    )
-
-    @Serializable
-    private data class GithubRelease(
-        @JsonProperty("tag_name") @SerialName("tag_name") val tagName: String, // Version code
-        @JsonProperty("body") @SerialName("body") val body: String, // Description
-        @JsonProperty("assets") @SerialName("assets") val assets: List<GithubAsset>,
-        @JsonProperty("target_commitish") @SerialName("target_commitish") val targetCommitish: String, // Branch
-        @JsonProperty("prerelease") @SerialName("prerelease") val prerelease: Boolean,
-        @JsonProperty("node_id") @SerialName("node_id") val nodeId: String,
-        @JsonProperty("created_at") @SerialName("created_at") val createdAt: String, // YYYY-MM-DDTHH:MM:SSZ
-    )
-
-    @Serializable
-    private data class GithubObject(
-        @JsonProperty("sha") @SerialName("sha") val sha: String, // SHA-256 hash
-        //@JsonProperty("type") @SerialName("type") val type: String,
-        ///@JsonProperty("url") @SerialName("url") val url: String,
-    )
-
-    @Serializable
-    private data class GithubTag(
-        //@JsonProperty("node_id") @SerialName("node_id") val nodeId: String,
-        @JsonProperty("object") @SerialName("object") val githubObject: GithubObject,
-    )
-
-    /** GitHub file update package */
-    @Immutable
-    data class GithubFile(
-        /** File digest, sha:xxx */
-        val digest: String?,
-        /** File url for download */
-        val downloadUrl: String,
-        /** Filename without the extension */
-        val displayName: String,
-        /** Changelog, aka the commit message */
-        val changeLog: String,
-        /** Name of the tag, aka unique release name like vX.X.X or pre-release */
-        val tagName: String,
-        /** Unique node id */
-        val nodeId: String,
-    )
-
-    private val defaultHeaders = mapOf("Accept" to "application/vnd.github.v3+json")
-
-    @Throws
-    suspend fun getShaFromTag(
-        userName: String,
-        repository: String,
-        tag: String,
-    ): String {
-        return app.get(
-            url = "https://api.github.com/repos/$userName/$repository/git/ref/tags/$tag",
-            headers = defaultHeaders
-        ).parsed<GithubTag>().githubObject.sha
-    }
-
-    @Throws
-    suspend fun getLatestReleaseFile(
-        userName: String,
-        repository: String,
-        prerelease: Boolean,
-        prereleaseTag: String,
-        contentType: String,
-    ): GithubFile? {
-        val latestReleaseUrl = if (prerelease) {
-            // Find the release object
-            // https://docs.github.com/en/rest/releases/releases?apiVersion=2026-03-10#get-a-release-by-tag-name
-            "https://api.github.com/repos/$userName/$repository/releases/tags/$prereleaseTag"
-        } else {
-            // Just get the latest release
-            // https://docs.github.com/en/rest/releases/releases?apiVersion=2026-03-10#get-the-latest-release
-            // The latest release is the most recent non-prerelease, non-draft release, sorted by the created_at attribute
-            "https://api.github.com/repos/$userName/$repository/releases/latest"
-        }
-
-        val latestRelease = app.get(
-            url = latestReleaseUrl,
-            headers = defaultHeaders
-        ).parsed<GithubRelease>()
-
-        // Find the first correct asset, given that we might have other binaries we release in the same version
-        val foundAsset = latestRelease.assets.firstOrNull { asset ->
-            asset.contentType == contentType
-        }
-
-        if (foundAsset == null) {
-            return null
-        }
-
-        return GithubFile(
-            digest = foundAsset.digest,
-            downloadUrl = foundAsset.browserDownloadUrl,
-            displayName = foundAsset.name.substringBeforeLast("."),
-            changeLog = latestRelease.body,
-            tagName = latestRelease.tagName,
-            nodeId = latestRelease.nodeId
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubViewModel.kt
deleted file mode 100644
index 99236ab71..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubViewModel.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import androidx.compose.runtime.Immutable
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.compose.ActionHandler
-import com.lagradost.cloudstream4.compose.DefaultStateContainer
-import com.lagradost.cloudstream4.compose.SingleActiveQuery
-import com.lagradost.cloudstream4.compose.StateContainer
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import java.io.FileNotFoundException
-
-@Immutable
-data class GithubState(
-    val dialog: GithubDialog? = null,
-)
-
-@Immutable
-sealed class GithubUpdateDialogState {
-    data class Error(val error: Throwable) : GithubUpdateDialogState()
-    data class DownloadProgress(val progress: Long, val total: Long?) : GithubUpdateDialogState()
-    object Loading : GithubUpdateDialogState()
-    object NoUpdateFound : GithubUpdateDialogState()
-    data class UpdateFound(
-        val file: GithubReleases.GithubFile,
-        val newSha: String?,
-        val oldSha: String?,
-    ) : GithubUpdateDialogState()
-}
-
-@Immutable
-data class GithubDialog(
-    val isPrerelease: Boolean,
-    val isFromUser: Boolean,
-    val state: GithubUpdateDialogState,
-)
-
-@Immutable
-sealed class GithubAction {
-    object AutoSearchForUpdate : GithubAction()
-    object SearchForUpdate : GithubAction()
-    object Dismiss : GithubAction()
-    data class SkipThisUpdate(val file: GithubReleases.GithubFile) : GithubAction()
-    data class Update(val file: GithubReleases.GithubFile) : GithubAction()
-    data class SkipUpdate(val file: GithubReleases.GithubFile) : GithubAction()
-}
-
-const val APK_USERNAME = "recloudstream"
-const val APK_REPOSITORY = "cloudstream"
-const val APK_PRERELEASE = "pre-release"
-const val APK_CONTENT_TYPE = "application/vnd.android.package-archive"
-
-interface AppUpdater {
-    @Throws
-    suspend fun update(
-        settings: AppSettings,
-        url: String,
-        digest: DigestPair?,
-        downloadProgress: (Long, Long?) -> Unit,
-    )
-}
-
-/** The digest pair to verify that a file is correctly downloaded */
-data class DigestPair(
-    val algorithm : String,
-    val digest : ByteArray,
-) {
-    companion object {
-        // "sha256:XXXX" or "sha256-XXXX" -> "sha256", bytearray(XXXX)
-        fun parse(digestPair: String?) : DigestPair? {
-            if(digestPair == null) return null
-
-            var split = digestPair.split(":", limit = 2)
-            if(split.size != 2) {
-                split = digestPair.split("-", limit = 2)
-            }
-            if(split.size != 2) {
-                return null
-            }
-
-            val digestAlgorithm = split.getOrNull(0) ?: return null
-            val digestByteArray = safe { split.getOrNull(1)?.hexToByteArray() } ?: return null
-
-            return DigestPair(digestAlgorithm, digestByteArray)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        val other = other as? DigestPair ?: return false
-
-        if (algorithm != other.algorithm) return false
-        if (!digest.contentEquals(other.digest)) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = algorithm.hashCode()
-        result = 31 * result + digest.contentHashCode()
-        return result
-    }
-}
-
-/**
- * Cross-platform downloader for updates served by GitHub.
- *
- * To allow this Cross-platform behavior work we split up the UI from the Viewmodel,
- * and the Viewmodel from the installer.
- * ```
- * UI:          Renders the current viewmodel state
- * Viewmodel:   Searches for updates on GitHub
- * AppUpdater:  Installs the update from the raw GitHub url
- *
- * UI -(onAction)-> Viewmodel -(invokes)-> AppUpdater
- *   <---(state)---/        <--(callback)--/
- * ```
- * */
-class GithubViewModel(
-    val remoteUserName: String,
-    val remoteRepository: String,
-    val remotePrereleaseTag: String,
-    val remoteContentType: String,
-    val versionName: String,
-    val isPrerelease: Boolean,
-    val isDebug: Boolean,
-    val buildSha: String,
-    val settings: AppSettings,
-    val updater: AppUpdater,
-) : ViewModel(), StateContainer<GithubState> by DefaultStateContainer(GithubState()),
-    ActionHandler<GithubAction> {
-    private val updateDispatcher = SingleActiveQuery(Dispatchers.IO)
-
-    override fun onAction(action: GithubAction) {
-        when (action) {
-            GithubAction.SearchForUpdate -> {
-                ioSafe {
-                    searchForUpdate(prerelease = isPrerelease, fromUser = true)
-                }
-            }
-
-            GithubAction.Dismiss -> {
-                viewModelScope.launch {
-                    updateDispatcher.cancel()
-                    updateState { copy(dialog = null) }
-                }
-            }
-
-            is GithubAction.SkipThisUpdate -> {
-                settings.updates.skipUpdate.set(action.file.nodeId)
-            }
-
-            GithubAction.AutoSearchForUpdate -> {
-                if (!isDebug && settings.updates.showAppUpdates.get()) {
-                    ioSafe {
-                        searchForUpdate(prerelease = isPrerelease, fromUser = false)
-                    }
-                }
-            }
-
-            is GithubAction.SkipUpdate -> {
-                settings.updates.skipUpdate.set(action.file.nodeId)
-            }
-
-            is GithubAction.Update -> {
-                ioSafe {
-                    installUpdate(action.file.downloadUrl, action.file.digest)
-                }
-            }
-        }
-    }
-
-    /** Cancel the old update, and catch possible errors from the block and show as a new state */
-    private suspend fun dispatchUpdate(block: /* @Throws */ suspend () -> Unit) {
-        updateDispatcher.launch {
-            try {
-                block()
-            } catch (t: Throwable) {
-                // If it was canceled ignore it as we probably launched another update check
-                if (!isActive) {
-                    return@launch
-                }
-                // Otherwise we display the error
-                updateState {
-                    copy(dialog = dialog?.copy(state = GithubUpdateDialogState.Error(t)))
-                }
-            }
-        }
-    }
-
-    private suspend fun installUpdate(url: String, digestPair: String?) = dispatchUpdate {
-        updater.update(
-            settings = settings,
-            url = url,
-            digest = DigestPair.parse(digestPair),
-        ) { progress, total ->
-            updateState {
-                copy(
-                    dialog = dialog?.copy(
-                        state = GithubUpdateDialogState.DownloadProgress(
-                            progress = progress,
-                            total = total
-                        )
-                    )
-                )
-            }
-        }
-        updateState {
-            copy(
-                dialog = null
-            )
-        }
-    }
-
-    private suspend fun searchForUpdate(
-        prerelease: Boolean,
-        fromUser: Boolean,
-    ) = dispatchUpdate {
-        val baseDialog = GithubDialog(
-            isPrerelease = prerelease,
-            isFromUser = fromUser,
-            state = GithubUpdateDialogState.Loading
-        )
-
-        updateState {
-            copy(dialog = baseDialog)
-        }
-
-        // If on pre-release check if the sha matches, as we do not look at the version
-        var oldSha: String? = null
-        var newSha: String? = null
-        if (prerelease) {
-            val sha = getSha(remotePrereleaseTag)
-            oldSha = buildSha.take(7)
-            newSha = sha.take(7)
-
-            // Only match the first 7 chars, as that is what is saved
-            if (oldSha == newSha) {
-                updateState {
-                    copy(dialog = baseDialog.copy(state = GithubUpdateDialogState.NoUpdateFound))
-                }
-                return@dispatchUpdate
-            }
-        }
-
-        val release = getRelease(prerelease)
-
-        // If on stable, only check that the display name matches
-        if (!prerelease && release.displayName == versionName) {
-            updateState {
-                copy(dialog = baseDialog.copy(state = GithubUpdateDialogState.NoUpdateFound))
-            }
-            return@dispatchUpdate
-        }
-
-        // If this was automated, and we have pressed "skip this update" then check the node-id
-        if (!fromUser && release.nodeId == settings.updates.skipUpdate.get()) {
-            updateState {
-                copy(dialog = baseDialog.copy(state = GithubUpdateDialogState.NoUpdateFound))
-            }
-            return@dispatchUpdate
-        }
-
-        updateState {
-            copy(
-                dialog = baseDialog.copy(
-                    state = GithubUpdateDialogState.UpdateFound(
-                        file = release,
-                        newSha = newSha,
-                        oldSha = oldSha
-                    )
-                )
-            )
-        }
-    }
-
-    @Throws
-    private suspend fun getRelease(prerelease: Boolean) =
-        GithubReleases.getLatestReleaseFile(
-            prerelease = prerelease,
-            userName = remoteUserName,
-            repository = remoteRepository,
-            prereleaseTag = remotePrereleaseTag,
-            contentType = remoteContentType
-        ) ?: throw FileNotFoundException()
-
-    @Throws
-    private suspend fun getSha(tag: String) =
-        GithubReleases.getShaFromTag(
-            tag = tag,
-            userName = remoteUserName,
-            repository = remoteRepository,
-        )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
index 70fd2a19d..93e469a4d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
@@ -1,18 +1,19 @@
 package com.lagradost.cloudstream3.ui.settings
 
+import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.os.Build
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream4.compose.DeviceLayout.Companion.isAutoTv
 
 object Globals {
     var beneneCount = 0
 
-    const val PHONE: Int = 0b00001
-    const val TV: Int = 0b00010
-    const val EMULATOR: Int = 0b00100
+    const val PHONE : Int = 0b001
+    const val TV : Int = 0b010
+    const val EMULATOR : Int = 0b100
     private const val INVALID = -1
     private var layoutId = INVALID
 
@@ -21,9 +22,18 @@ object Globals {
         return settingsManager.getInt(this.getString(R.string.app_layout_key), -1)
     }
 
-    fun Context.updateTv() {
-        layoutId = when (getLayoutInt()) {
-            -1 -> if (isAutoTv(this)) TV else PHONE
+    private fun Context.isAutoTv(): Boolean {
+        val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as UiModeManager?
+        // AFT = Fire TV
+        val model = Build.MODEL.lowercase()
+        return uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION || Build.MODEL.contains(
+            "AFT"
+        ) || model.contains("firestick") || model.contains("fire tv") || model.contains("chromecast")
+    }
+
+    private fun Context.layoutIntCorrected(): Int {
+        return when(getLayoutInt()) {
+            -1 -> if (isAutoTv()) TV else PHONE
             0 -> PHONE
             1 -> TV
             2 -> EMULATOR
@@ -31,10 +41,14 @@ object Globals {
         }
     }
 
+    fun Context.updateTv() {
+        layoutId = layoutIntCorrected()
+    }
+
     /** Returns true if the current orientation is landscape. */
     fun isLandscape(): Boolean =
         isLayout(TV or EMULATOR) ||
-                Resources.getSystem().configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+            Resources.getSystem().configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
     /** Returns true if the layout is any of the flags,
      * so isLayout(TV or EMULATOR) is a valid statement for checking if the layout is in the emulator
@@ -42,7 +56,7 @@ object Globals {
      *
      * Valid flags are: PHONE, TV, EMULATOR
      * */
-    fun isLayout(flags: Int): Boolean {
+    fun isLayout(flags: Int) : Boolean {
         return (layoutId and flags) != 0
     }
 }
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 6f67ab826..75ba55674 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -14,6 +13,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreference
 import androidx.recyclerview.widget.RecyclerView
@@ -29,8 +29,8 @@ import com.lagradost.cloudstream3.databinding.DeviceAuthBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlApi
@@ -42,8 +42,8 @@ import com.lagradost.cloudstream3.syncproviders.SubtitleRepo
 import com.lagradost.cloudstream3.syncproviders.SyncRepo
 import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
@@ -76,7 +76,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
         /** Used by nginx plugin too */
         @SuppressLint("StringFormatInvalid")
         fun showLoginInfo(
-            activity: Activity?,
+            activity: FragmentActivity?,
             api: AuthRepo,
             info: AuthUser?,
             index: Int,
@@ -121,7 +121,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
             }
         }
 
-        private fun showAccountSwitch(activity: Activity, api: AuthRepo) {
+        private fun showAccountSwitch(activity: FragmentActivity, api: AuthRepo) {
             val accounts = api.accounts
             val binding: AccountSwitchBinding =
                 AccountSwitchBinding.inflate(activity.layoutInflater, null, false)
@@ -153,7 +153,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
 
 
         @UiThread
-        fun showPin(activity: Activity, api: AuthRepo) {
+        fun showPin(activity: FragmentActivity, api: AuthRepo) {
             val binding: DeviceAuthBinding =
                 DeviceAuthBinding.inflate(activity.layoutInflater, null, false)
 
@@ -273,7 +273,8 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
         }
 
 
-        fun showAppLogin(activity: Activity, api: AuthRepo) {
+        fun showAppLogin(activity: FragmentActivity, api: AuthRepo) {
+
             val binding: AddAccountInputBinding =
                 AddAccountInputBinding.inflate(activity.layoutInflater, null, false)
             val builder =
@@ -314,7 +315,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
             binding.createAccount.setOnClickListener {
                 openBrowser(
                     api.createAccountUrl ?: return@setOnClickListener,
-                    activity,
+                    activity
                 )
                 dialog.dismissSafe()
             }
@@ -390,7 +391,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
         }
 
         @UiThread
-        fun addAccount(activity: Activity, api: AuthRepo) {
+        fun addAccount(activity: FragmentActivity, api: AuthRepo) {
             try {
                 if (api.hasPin && !isLayout(PHONE)) {
                     showPin(activity, api)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount2.kt
deleted file mode 100644
index 0185370ce..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsAccount2 : BaseComposeFragment(), SearchableSettings by SettingsAccountScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccountScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccountScreen.kt
deleted file mode 100644
index 97890bbfa..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccountScreen.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.content.Context
-import androidx.activity.compose.LocalActivity
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.fragment.app.FragmentActivity
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlApi
-import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
-import com.lagradost.cloudstream3.syncproviders.SubtitleRepo
-import com.lagradost.cloudstream3.syncproviders.SyncRepo
-import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.addAccount
-import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.showLoginInfo
-import com.lagradost.cloudstream3.utils.AppContextUtils.html
-import com.lagradost.cloudstream3.utils.BackupUtils
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.authCallback
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.biometricPrompt
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.deviceHasPasswordPinLock
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isAuthEnabled
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAuthentication
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogText
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.compose.PHONE
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-
-object SettingsAccountScreen : SearchableSettings, BiometricAuthenticator.BiometricCallback {
-    val syncApis = persistentListOf(
-        SyncRepo(malApi),
-        SyncRepo(kitsuApi),
-        SyncRepo(aniListApi),
-        SyncRepo(simklApi),
-        SubtitleRepo(openSubtitlesApi),
-        SubtitleRepo(subDlApi),
-        PlainAuthRepo(animeSkipApi),
-    )
-    private fun updateAuthPreference(context: Context, enabled: Boolean) {
-        val settings = AppSettings(context)
-        settings.security.biometrics.set(enabled)
-    }
-
-    override fun onAuthenticationError() {
-        val context = activity ?: return
-        updateAuthPreference(context, !isAuthEnabled(context))
-    }
-
-    override fun onAuthenticationSuccess() {
-        val context = activity ?: return
-
-        if (isAuthEnabled(context)) {
-            updateAuthPreference(context, true)
-            BackupUtils.backup(context)
-            context.showBottomDialogText(
-                context.getString(R.string.biometric_setting),
-                context.getString(R.string.biometric_warning).html()
-            ) { onDialogDismissedEvent }
-        } else {
-            updateAuthPreference(context, false)
-        }
-    }
-
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_account)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-        val activity = LocalActivity.current
-        val context = LocalContext.current
-        val hasSecurity = remember(context) {
-            try {
-                deviceHasPasswordPinLock(context)
-            } catch (_ : Throwable) {
-                // e.g preview
-                false
-            }
-        }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_accounts),
-                preferenceItems = syncApis.map { api ->
-                    Preference.PreferenceItem.TextPreference(
-                        title = api.name,
-                        icon = api.icon?.let { painterResource(it) },
-                        onClick = {
-                            val activity = activity ?: return@TextPreference
-                            val info = api.authUser()
-                            val index =
-                                api.accounts.indexOfFirst { account -> account.user.id == info?.id }
-                            if (api.accounts.isNotEmpty()) {
-                                showLoginInfo(activity, api, info, index)
-                            } else {
-                                addAccount(activity, api)
-                            }
-                        })
-                } + Preference.PreferenceItem.SwitchPreference(
-                    preference = settings.security.skipAccountSelection,
-                    title = stringResource(R.string.skip_startup_account_select_pref),
-                    icon = painterResource(R.drawable.ic_outline_account_circle_24)
-                ),
-            ), Preference.PreferenceGroup(
-                enabled = hasSecurity && isLayout(PHONE),
-                title = stringResource(R.string.pref_category_security),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.security.biometrics,
-                        title = stringResource(R.string.biometric_setting),
-                        subtitle = stringResource(R.string.biometric_setting_summary),
-                        icon = painterResource(R.drawable.ic_fingerprint),
-                        onValueChanged = { _ ->
-                            val activity =
-                                activity as? FragmentActivity ?: return@SwitchPreference false
-
-                            if (deviceHasPasswordPinLock(activity)) {
-                                startBiometricAuthentication(
-                                    activity, R.string.biometric_authentication_title, false
-                                )
-                                promptInfo?.let {
-                                    authCallback = this
-                                    biometricPrompt?.authenticate(it)
-                                }
-                            }
-
-                            return@SwitchPreference true
-                        })
-                )
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index 6943e5cf4..e41109b59 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
@@ -249,7 +249,7 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
 
         val appVersion = BuildConfig.VERSION_NAME
         val commitHash = activity?.currentCommitHash() ?: ""
-        val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM,
+        val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
             Locale.getDefault()
         ).apply { timeZone = TimeZone.getTimeZone("UTC")
         }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")
@@ -262,4 +262,4 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
             true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment2.kt
deleted file mode 100644
index 24867b898..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment2.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.lagradost.cloudstream4.compose.Screen
-
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsFragment2 : BaseComposeFragment(), Screen by SettingsFragmentScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragmentScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragmentScreen.kt
deleted file mode 100644
index c906b0982..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragmentScreen.kt
+++ /dev/null
@@ -1,444 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldDefaults
-import androidx.compose.material3.rememberSearchBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.NonRestartableComposable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
-import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.DataStoreHelper.profileImages
-import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
-import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.txt
-import com.lagradost.cloudstream4.compose.Screen
-import com.lagradost.cloudstream4.compose.TV
-import com.lagradost.cloudstream4.compose.circleBorder
-import com.lagradost.cloudstream4.compose.focusOutline
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import com.mihon.material.padding
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.SettingSearchResults
-import com.mihon.presentation.settings.SettingsData
-import com.mihon.presentation.settings.widget.TextPreferenceWidget
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
-
-object SettingsFragmentScreen : Screen {
-    val screens = persistentListOf(
-        SettingsNavigation(
-            title = R.string.category_general,
-            navigation = R.id.action_navigation_global_to_navigation_settings_general,
-            screen = SettingsGeneralScreen,
-            icon = R.drawable.build_24px,
-            subtitle = persistentListOf(
-                R.string.extension_language,
-                R.string.title_downloads,
-                R.string.pref_category_bypass,
-                R.string.pref_category_links
-            )
-        ),
-        SettingsNavigation(
-            title = R.string.category_player,
-            navigation = R.id.action_navigation_global_to_navigation_settings_player,
-            screen = SettingsPlayerScreen,
-            icon = R.drawable.play_arrow_24px,
-            subtitle = persistentListOf(
-                R.string.pref_category_subtitles,
-                R.string.pref_category_player_features,
-                R.string.pref_category_gestures,
-                R.string.pref_category_player_layout,
-                R.string.pref_category_cache
-            )
-        ),
-        /*SettingsNavigation(
-            title = R.string.category_providers,
-            navigation = R.id.action_navigation_global_to_navigation_settings_providers,
-            screen = SettingsProvidersScreen,
-            icon = R.drawable.build_24px,
-        ),*/
-        SettingsNavigation(
-            title = R.string.category_ui,
-            navigation = R.id.action_navigation_global_to_navigation_settings_ui,
-            screen = SettingsUIScreen,
-            icon = R.drawable.format_paint_24px,
-            subtitle = persistentListOf(
-                R.string.pref_category_looks,
-                R.string.pref_category_ui_features,
-                R.string.search_poster_img_des,
-                R.string.poster_ui_settings
-            )
-        ),
-        SettingsNavigation(
-            title = R.string.category_updates,
-            navigation = R.id.action_navigation_global_to_navigation_settings_updates,
-            screen = SettingsUpdatesScreen,
-            icon = R.drawable.mobile_arrow_down_24px,
-            subtitle = persistentListOf(
-                R.string.pref_category_app_updates,
-                R.string.pref_category_backup,
-                R.string.pref_category_extensions,
-                R.string.pref_category_actions
-            )
-        ),
-        SettingsNavigation(
-            title = R.string.category_account,
-            navigation = R.id.action_navigation_global_to_navigation_settings_account,
-            screen = SettingsAccountScreen,
-            icon = R.drawable.encrypted_24px,
-            subtitle = persistentListOf(
-                R.string.pref_category_accounts,
-                R.string.pref_category_security
-            )
-        ),
-        SettingsNavigation(
-            title = R.string.pref_category_extensions,
-            navigation = R.id.action_navigation_global_to_navigation_settings_extensions,
-            screen = null,
-            icon = R.drawable.extension_24px,
-            subtitle = persistentListOf(R.string.add_repository)
-        ),
-    )
-
-    @Immutable
-    data class SettingsNavigation(
-        val title: Int,
-        val navigation: Int,
-        val screen: SearchableSettings?,
-        val icon: Int,
-        val subtitle: PersistentList<Int>,
-    )
-
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    @Composable
-    @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-    override fun Content() {
-        val textFieldState = rememberTextFieldState()
-
-        val outerListState = rememberScrollState()
-
-        val parentFirstScrollConnection = remember {
-            object : NestedScrollConnection {
-                override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                    val delta = available.y
-                    return if (delta < 0 && outerListState.canScrollForward) {
-                        val consumed = outerListState.dispatchRawDelta(-delta)
-                        Offset(0f, -consumed)
-                    } else {
-                        Offset.Zero
-                    }
-                }
-            }
-        }
-
-        Scaffold { _ ->
-            Column(modifier = Modifier.verticalScroll(outerListState)) {
-                Spacer(modifier = Modifier.height(MaterialTheme.padding.small))
-
-                val default = DataStoreHelper.getDefaultAccount(
-                    LocalContext.current
-                )
-                val flow by DataStoreHelper.selectedAccountNumberFlow.collectAsState()
-                val account = remember(flow) {
-                    DataStoreHelper.getCurrentAccount() ?: default
-                }
-
-                Row(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .focusOutline()
-                        .clickable {
-                            activity.navigate(
-                                R.id.accountSelectActivity,
-                                Bundle().apply { putBoolean("isFromMainActivity", true) }
-                            )
-                        }
-                        .padding(
-                            vertical = MaterialTheme.padding.large,
-                            horizontal = MaterialTheme.padding.medium
-                        )
-                ) {
-                    val image =
-                        account.customImage ?: profileImages.getOrNull(account.defaultImageIndex)
-                        ?: profileImages.first()
-
-                    AsyncImage(
-                        contentScale = ContentScale.Crop,
-                        model = image,
-                        modifier = Modifier.circleBorder(50.dp),
-                        contentDescription = null,
-                    )
-                    Spacer(modifier = Modifier.width(MaterialTheme.padding.medium))
-                    Column {
-                        Text(
-                            text = account.name,
-                            style = MaterialTheme.typography.titleLarge,
-                        )
-                        Text(
-                            text = stringResource(R.string.title_settings),
-                            style = MaterialTheme.typography.bodyMedium,
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(MaterialTheme.padding.small))
-                SettingsSearch(textFieldState = textFieldState)
-                Spacer(modifier = Modifier.height(MaterialTheme.padding.small))
-
-                SettingSearchResults(
-                    nestedScrollConnection = parentFirstScrollConnection,
-                    searchKey = textFieldState.text.toString(),
-                    deferredItems = ::generateSearchItems,
-                    onItemClick = { item ->
-                        SearchableSettings.highlightKey = item.highlightKey
-                        activity?.navigate(item.navigation)
-                    }, empty = {
-                        Column(
-                            modifier = Modifier
-                                .nestedScroll(parentFirstScrollConnection)
-                        ) {
-                            screens.forEach { settingsTab ->
-                                SettingsTab(settingsTab)
-                            }
-                            BuildStamp()
-                        }
-                    })
-
-            }
-        }
-    }
-
-    @Composable
-    @NonRestartableComposable
-    fun generateSearchItems() =
-        screens.mapNotNull { item ->
-            val contents = item.screen?.getPreferences() ?: return@mapNotNull null
-            SettingsData(
-                title = stringResource(item.title),
-                navigation = item.navigation,
-                contents = contents
-            )
-        }.toPersistentList()
-
-    @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
-    @Composable
-    fun SettingsSearch(textFieldState : TextFieldState) {
-        var hasFocus by remember { mutableStateOf(false) }
-        val focusProgress by animateFloatAsState(targetValue = if (hasFocus) 1.0f else 0.0f)
-        val focusManager = LocalFocusManager.current
-        val focusRequester = remember { FocusRequester() }
-        TextField(
-            state = textFieldState,
-            keyboardOptions = KeyboardOptions.Default.copy(
-                imeAction = ImeAction.Search,
-                // This option is bugged on compose, making it unable to open at all
-                // showKeyboardOnFocus = false
-            ),
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp - 12.dp * focusProgress)
-                .focusOutline(enabled = isLayout(TV), CircleShape)
-                .onFocusChanged { newFocus ->
-                    hasFocus = newFocus.hasFocus
-                }.focusRequester(focusRequester),
-            placeholder = {
-                Text(text = stringResource(R.string.search_hint))
-            },
-            shape = CircleShape,
-            colors = TextFieldDefaults.colors(
-                focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                unfocusedLeadingIconColor = MaterialTheme.colorScheme.onBackground,
-                unfocusedTrailingIconColor = MaterialTheme.colorScheme.onBackground,
-                focusedTrailingIconColor = MaterialTheme.colorScheme.onBackground,
-                focusedLeadingIconColor = MaterialTheme.colorScheme.onBackground,
-                focusedIndicatorColor = Color.Transparent,
-                unfocusedIndicatorColor = Color.Transparent,
-                focusedPlaceholderColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                unfocusedPlaceholderColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                cursorColor = MaterialTheme.colorScheme.onBackground,
-            ),
-            leadingIcon = {
-                Crossfade(
-                    targetState = hasFocus,
-                    label = "leftsearch",
-                ) { value ->
-                    if (value) {
-                        IconButton(onClick = {
-                            textFieldState.edit { replace(0, length, "") }
-                            focusManager.clearFocus()
-                        }) {
-                            Icon(
-                                painter = painterResource(R.drawable.keyboard_arrow_left_24px),
-                                contentDescription = null
-                            )
-                        }
-                    } else {
-                        IconButton(onClick = {
-                            focusRequester.requestFocus()
-                        }) {
-                            Icon(
-                                painter = painterResource(R.drawable.search_icon),
-                                contentDescription = null
-                            )
-                        }
-                    }
-                }
-            },
-            trailingIcon = {
-                Crossfade(
-                    targetState = hasFocus,
-                    label = "rightsearch",
-                ) { value ->
-                    if (value) {
-                        IconButton(onClick = {
-                            textFieldState.edit { replace(0, length, "") }
-                        }) {
-                            Icon(
-                                painter = painterResource(R.drawable.close_24px),
-                                contentDescription = null
-                            )
-                        }
-                    }
-                }
-            },
-        )
-
-        val keyboardController = LocalSoftwareKeyboardController.current
-        DisposableEffect(Unit) {
-            onDispose {
-                keyboardController?.hide()
-            }
-        }
-    }
-
-    @Composable
-    fun SettingsTab(settingsTab: SettingsNavigation) {
-        TextPreferenceWidget(
-            title = stringResource(settingsTab.title),
-            icon = painterResource(settingsTab.icon),
-            // This can not be converted to joinToString due to stringResource being composable
-            subtitle =
-                @Suppress("SimplifiableCallChain")
-                settingsTab.subtitle.map { stringResource(it) }.joinToString(),
-            // Clear it if we have already set it but navigated back instantly
-            onPreferenceClick = {
-                SearchableSettings.highlightKey = null
-                activity?.navigate(settingsTab.navigation)
-            })
-    }
-
-    @Composable
-    fun BuildStamp() {
-        val (commitHash, buildTimestamp) = remember {
-            val commitHash = activity?.currentCommitHash() ?: ""
-            val buildTimestamp = SimpleDateFormat.getDateTimeInstance(
-                DateFormat.LONG, DateFormat.MEDIUM,
-                Locale.getDefault()
-            ).apply {
-                timeZone = TimeZone.getTimeZone("UTC")
-            }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")
-            commitHash to buildTimestamp
-        }
-
-        Row(
-            horizontalArrangement = Arrangement.SpaceEvenly,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(50.dp)
-                .focusOutline()
-                .clickable {
-                    clipboardHelper(
-                        txt(R.string.extension_version),
-                        "${BuildConfig.VERSION_NAME} $commitHash $buildTimestamp"
-                    )
-                },
-        ) {
-            ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
-                Text(text = BuildConfig.VERSION_NAME)
-                if (commitHash != "") {
-                    Text("•")
-                    Text(text = commitHash)
-                }
-                Text("•")
-                Text(text = buildTimestamp)
-            }
-        }
-    }
-}
-
-
-@PreviewLightDark
-@Composable
-fun Preview() {
-    CloudStreamPreviewTheme {
-        SettingsFragmentScreen.Content()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 32f60752e..840c6aede 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui.settings
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -18,7 +17,6 @@ import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
-import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
@@ -79,7 +77,6 @@ val appLanguages = arrayListOf(
     Pair("Azərbaycan dili", "az"),
     Pair("Bahasa Indonesia", "in"),
     Pair("Bahasa Melayu", "ms"),
-    Pair("català", "ca"),
     Pair("Deutsch", "de"),
     Pair("English", "en"),
     Pair("Español", "es"),
@@ -100,7 +97,6 @@ val appLanguages = arrayListOf(
     Pair("Português", "pt"),
     Pair("Português (Brasil)", "pt-BR"),
     Pair("Română", "ro"),
-    Pair("Shqip мова", "sq"),
     Pair("Slovenčina", "sk"),
     Pair("Soomaaliga", "so"),
     Pair("Svenska", "sv"),
@@ -110,7 +106,6 @@ val appLanguages = arrayListOf(
     Pair("Wikang Filipino", "fil"),
     Pair("Čeština", "cs"),
     Pair("Ελληνικά", "el"),
-    Pair("беларуская мова", "be"),
     Pair("български", "bg"),
     Pair("македонски", "mk"),
     Pair("русский", "ru"),
@@ -130,7 +125,6 @@ val appLanguages = arrayListOf(
     Pair("தமிழ்", "ta"),
     Pair("ಕನ್ನಡ", "kn"),
     Pair("മലയാളം", "ml"),
-    Pair("ພາສາລາວ", "lo"),
     Pair("ဗမာစာ", "my"),
     Pair("ትግርኛ", "ti"),
     Pair("አማርኛ", "am"),
@@ -178,96 +172,6 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                 putString(context.getString(R.string.download_path_key_visual), visual)
             }
         }
-
-        fun getCurrent(): MutableList<CustomSite> {
-            return getKey<Array<CustomSite>>(USER_PROVIDER_API)?.toMutableList()
-                ?: mutableListOf()
-        }
-        fun showAdd() {
-            val providers = allProviders.distinctBy { it::class }.sortedBy { it.name }
-            val context = activity
-            context?.showDialog(
-                providers.map { "${it.name} (${it.mainUrl})" },
-                -1,
-                context.getString(R.string.add_site_pref),
-                true,
-                {}) { selection ->
-                val provider = providers.getOrNull(selection) ?: return@showDialog
-
-                val binding : AddSiteInputBinding = AddSiteInputBinding.inflate(LayoutInflater.from(
-                    context
-                ),null,false)
-
-                val builder =
-                    AlertDialog.Builder(context, R.style.AlertDialogCustom)
-                        .setView(binding.root)
-
-                val dialog = builder.create()
-                dialog.show()
-
-                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
-                    val simpleName = provider::class.simpleName
-                    if (url.isNullOrBlank() || name.isNullOrBlank() || simpleName == null) {
-                        showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
-                        return@setOnClickListener
-                    }
-
-                    val current = getCurrent()
-                    val newSite = CustomSite(simpleName, name, url, realLang)
-                    current.add(newSite)
-                    setKey(USER_PROVIDER_API, current.toTypedArray())
-                    // reload apis
-                    MainActivity.afterPluginsLoadedEvent.invoke(false)
-
-                    dialog.dismissSafe(activity)
-                }
-                binding.cancelBtt.setOnClickListener {
-                    dialog.dismissSafe(activity)
-                }
-            }
-        }
-
-        fun showDelete() {
-            val current = getCurrent()
-            val context = activity
-            context?.showMultiDialog(
-                current.map { it.name },
-                listOf(),
-                context.getString(R.string.remove_site_pref),
-                {}) { indexes ->
-                current.removeAll(indexes.map { current[it] })
-                setKey(USER_PROVIDER_API, current.toTypedArray())
-            }
-        }
-
-        fun showAddOrDelete() {
-            val context = activity
-
-            val binding : AddRemoveSitesBinding = AddRemoveSitesBinding.inflate(
-                LayoutInflater.from(
-                    context
-                ),null,false)
-            val builder =
-                AlertDialog.Builder(context ?: return, R.style.AlertDialogCustom)
-                    .setView(binding.root)
-
-            val dialog = builder.create()
-            dialog.show()
-
-            binding.addSite.setOnClickListener {
-                showAdd()
-                dialog.dismissSafe(activity)
-            }
-            binding.removeSite.setOnClickListener {
-                showDelete()
-                dialog.dismissSafe(activity)
-            }
-        }
     }
 
     private val pathPicker = getChooseFolderLauncher { uri, path ->
@@ -279,6 +183,10 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
         setPreferencesFromResource(R.xml.settings_general, rootKey)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
+        fun getCurrent(): MutableList<CustomSite> {
+            return getKey<Array<CustomSite>>(USER_PROVIDER_API)?.toMutableList()
+                ?: mutableListOf()
+        }
 
         getPref(R.string.locale_key)?.setOnPreferenceClickListener { pref ->
             val current = getCurrentLocale(pref.context)
@@ -315,7 +223,83 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             true
         }
 
+        fun showAdd() {
+            val providers = allProviders.distinctBy { it::class }.sortedBy { it.name }
+            activity?.showDialog(
+                providers.map { "${it.name} (${it.mainUrl})" },
+                -1,
+                context?.getString(R.string.add_site_pref) ?: return,
+                true,
+                {}) { 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(binding.root)
+
+                val dialog = builder.create()
+                dialog.show()
+
+                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
+                    val simpleName = provider::class.simpleName
+                    if (url.isNullOrBlank() || name.isNullOrBlank() || simpleName == null) {
+                        showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                        return@setOnClickListener
+                    }
+
+                    val current = getCurrent()
+                    val newSite = CustomSite(simpleName, name, url, realLang)
+                    current.add(newSite)
+                    setKey(USER_PROVIDER_API, current.toTypedArray())
+                    // reload apis
+                    MainActivity.afterPluginsLoadedEvent.invoke(false)
+
+                    dialog.dismissSafe(activity)
+                }
+                binding.cancelBtt.setOnClickListener {
+                    dialog.dismissSafe(activity)
+                }
+            }
+        }
+
+        fun showDelete() {
+            val current = getCurrent()
+
+            activity?.showMultiDialog(
+                current.map { it.name },
+                listOf(),
+                context?.getString(R.string.remove_site_pref) ?: return,
+                {}) { indexes ->
+                current.removeAll(indexes.map { current[it] })
+                setKey(USER_PROVIDER_API, current.toTypedArray())
+            }
+        }
+
+        fun showAddOrDelete() {
+            val binding : AddRemoveSitesBinding = AddRemoveSitesBinding.inflate(layoutInflater,null,false)
+            val builder =
+                AlertDialog.Builder(context ?: return, R.style.AlertDialogCustom)
+                    .setView(binding.root)
+
+            val dialog = builder.create()
+            dialog.show()
+
+            binding.addSite.setOnClickListener {
+                showAdd()
+                dialog.dismissSafe(activity)
+            }
+            binding.removeSite.setOnClickListener {
+                showDelete()
+                dialog.dismissSafe(activity)
+            }
+        }
 
         getPref(R.string.override_site_key)?.setOnPreferenceClickListener { _ ->
 
@@ -342,7 +326,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             val prefValues = resources.getIntArray(R.array.dns_pref_values)
 
             val currentDns =
-                settingsManager.getInt(getString(R.string.dns_key), 0)
+                settingsManager.getInt(getString(R.string.dns_pref), 0)
 
             activity?.showBottomDialog(
                 prefNames.toList(),
@@ -350,7 +334,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                 getString(R.string.dns_pref),
                 true,
                 {}) {
-                settingsManager.edit { putInt(getString(R.string.dns_key), prefValues[it]) }
+                settingsManager.edit { putInt(getString(R.string.dns_pref), prefValues[it]) }
                 (context ?: CloudStreamApp.context)?.let { ctx -> app.initClient(ctx) }
             }
             return@setOnPreferenceClickListener true
@@ -368,14 +352,14 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                         (first +
                                 ctx.getExternalFilesDirs("").mapNotNull { it.path } +
                                 currentDir)
-                    } catch (_: Exception) {
+                    } catch (e: Exception) {
                         first
                     }).filterNotNull().distinct()
                 }
             } ?: emptyList()
         }
 
-        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey<Boolean>(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
+        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
         getPref(R.string.jsdelivr_proxy_key)?.setOnPreferenceChangeListener { _, newValue ->
             setKey(getString(R.string.jsdelivr_proxy_key), newValue)
             return@setOnPreferenceChangeListener true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral2.kt
deleted file mode 100644
index 37b1812b9..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsGeneral2 : BaseComposeFragment(), SearchableSettings by SettingsGeneralScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneralScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneralScreen.kt
deleted file mode 100644
index 4c4bff7ae..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneralScreen.kt
+++ /dev/null
@@ -1,304 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.content.Intent
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.AllLanguagesName
-import com.lagradost.cloudstream3.CloudStreamApp
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.UnsafeSSL
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.insecureApp
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.network.initClient
-import com.lagradost.cloudstream3.ui.settings.SettingsProvidersScreen.toStringRes
-import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.isAppRestricted
-import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.showRequestIgnoreBatteryOptDialog
-import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.compose.ActionDialog
-import com.lagradost.cloudstream4.compose.PHONE
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import com.lagradost.safefile.SafeFile
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.collectAsState
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentMap
-
-object SettingsGeneralScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_general)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        // TODO Refactor entirely to use a different file path selector ect like QuickNovel
-        val selectFileSelector =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
-                // It lies, it can be null if file manager quits.
-                if (uri == null) return@rememberLauncherForActivityResult
-                val context = CloudStreamApp.context ?: return@rememberLauncherForActivityResult
-
-                try {
-                    val settings = AppSettings(context)
-                    // RW perms for the path
-                    val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                            Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-
-                    context.contentResolver.takePersistableUriPermission(uri, flags)
-
-                    val filePath = SafeFile.fromUri(context, uri)?.filePath()
-                    println("Selected URI path: $uri - Full path: $filePath")
-
-                    // store the actual URI instead of the path due to permissions.
-                    // filePath should only be used for cosmetic purposes.
-                    val visual = filePath ?: uri.toString()
-                    settings.general.downloadPath.set(uri.toString())
-                    settings.general.downloadPathVisual.set(visual)
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-            }
-
-        val bananas by settings.general.bananas.collectAsState()
-        val downloadPathVisual by settings.general.downloadPathVisual.collectAsState()
-        //val downloadPath by settings.general.downloadPath.collectAsState()
-
-        var isBatteryShown by remember { mutableStateOf(false) }
-        val context = LocalContext.current
-
-        if (isBatteryShown) {
-            ActionDialog(
-                icon = painterResource(R.drawable.battery_alert_24px),
-                title = stringResource(R.string.battery_dialog_title),
-                text = stringResource(R.string.battery_dialog_message),
-                confirmText = stringResource(R.string.ok),
-                dismissText = stringResource(R.string.cancel),
-                dismiss = {
-                    isBatteryShown = false
-                    settings.general.batterOptimization.set(false)
-                },
-                confirm = {
-                    isBatteryShown = false
-                    // The og impl never modified it to true?
-                    // settings.general.batterOptimization.set(true)
-                    context.showRequestIgnoreBatteryOptDialog()
-                }
-            )
-        }
-
-        val default = AllLanguagesName to stringResource(R.string.all_languages_preference)
-        val languages = APIHolder.apis.withLock {
-            APIHolder.apis.map { api -> api.lang }.distinct()
-        }.sortedBy { fromTagToLanguageName(it) ?: it }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(title = stringResource(R.string.extension_language), preferenceItems = persistentListOf(
-                Preference.PreferenceItem.ListPreference(
-                    preference = settings.general.locale,
-                    entries = appLanguages.associate { (name, code) -> (code to (name to code).nameNextToFlagEmoji()) },
-                    title = stringResource(R.string.app_language),
-                    icon = painterResource(R.drawable.language_korean_latin_24px),
-                    onValueChanged = { value ->
-                        settings.general.locale.set(value)
-                        activity?.recreate()
-                        return@ListPreference false
-                    },
-                    subtitleProvider = { v, e -> e[v] ?: getCurrentLocale(LocalContext.current) }
-                ),
-                Preference.PreferenceItem.MultiSelectListPreference(
-                    title = stringResource(R.string.provider_lang_settings),
-                    icon = painterResource(R.drawable.plugin_lang),
-                    entries = mapOf(default) + languages.associateWith { lang ->
-                        (getNameNextToFlagEmoji(
-                            lang
-                        ) ?: lang)
-                    },
-                    preference = settings.provider.extensionLanguages
-                ),
-                Preference.PreferenceItem.MultiSelectListPreference(
-                    title = stringResource(R.string.preferred_media_settings),
-                    icon = painterResource(R.drawable.movie_edit_24px),
-                    preference = settings.provider.preferredMedia,
-                    entries = TvType.entries.associate {
-                        it.ordinal.toString() to stringResource(it.toStringRes())
-                    }
-                        // Ok this looks strange af, but we do this to avoid double movie
-                        .toPersistentMap().remove(TvType.AnimeMovie.ordinal.toString()), onValueChanged = { diff ->
-                        if(diff.contains(TvType.Movie.ordinal.toString())) {
-                            settings.provider.preferredMedia.set(diff + TvType.AnimeMovie.ordinal.toString())
-                        } else {
-                            settings.provider.preferredMedia.set(diff - TvType.AnimeMovie.ordinal.toString())
-                        }
-                        return@MultiSelectListPreference false
-                    }),
-            )),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.title_downloads),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        icon = painterResource(R.drawable.netflix_download),
-                        subtitle = downloadPathVisual,
-                        title = stringResource(R.string.download_path_pref),
-                        onClick = {
-                            // This is not a ListPreference because the old selection system is
-                            // broken af. This needs to be refactored to QuickNovels download path
-                            // system.
-                            selectFileSelector.launch(Uri.EMPTY)
-                        },
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        icon = painterResource(R.drawable.arrow_or_edge_24px),
-                        preference = settings.general.parallelDownloads,
-                        valueRange = 1..10,
-                        title = stringResource(R.string.parallel_downloads),
-                        subtitle = stringResource(R.string.download_parallel_settings_des),
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        icon = painterResource(R.drawable.arrow_and_edge_24px),
-                        preference = settings.general.concurrentConnections,
-                        valueRange = 1..10,
-                        title = stringResource(R.string.concurrent_connections),
-                        subtitle = stringResource(R.string.concurrent_connections_settings_des),
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.battery_dialog_title),
-                        icon = painterResource(R.drawable.battery_alert_24px),
-                        enabled = isLayout(PHONE),
-                        onClick = {
-                            if (isAppRestricted(context)) {
-                                isBatteryShown = true
-                            } else {
-                                showToast(R.string.app_unrestricted_toast)
-                            }
-                        }
-                    ),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_bypass),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.add_site_pref),
-                        subtitle = stringResource(R.string.add_site_summary),
-                        icon = painterResource(R.drawable.copy_all_24px),
-                        onClick = {
-                            // TODO refactor into compose
-                            if (SettingsGeneral.getCurrent().isEmpty()) {
-                                SettingsGeneral.showAdd()
-                            } else {
-                                SettingsGeneral.showAddOrDelete()
-                            }
-                        }
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.dns_pref),
-                        subtitle = stringResource(R.string.dns_pref_summary),
-                        icon = painterResource(R.drawable.dns_24px),
-                        preference = settings.general.dns,
-                        entries = integerArrayResource(R.array.dns_pref_values).zip(
-                            stringArrayResource(R.array.dns_pref)
-                        ).toMap(),
-                        onValueChanged = {
-                            (CloudStreamApp.context)?.let { ctx ->
-                                app.initClient(ctx, ignoreSSL = false)
-                                @OptIn(UnsafeSSL::class)
-                                insecureApp.initClient(ctx, ignoreSSL = true)
-                            }
-                            return@ListPreference true
-                        },
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        title = stringResource(R.string.jsdelivr_proxy),
-                        subtitle = stringResource(R.string.jsdelivr_proxy_summary),
-                        icon = painterResource(R.drawable.wifi_proxy_24px),
-                        preference = settings.general.jsdelivrProxy
-                    )
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_links),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.github),
-                        subtitle = "https://github.com/recloudstream/cloudstream",
-                        icon = painterResource(R.drawable.ic_github_logo),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://github.com/recloudstream/cloudstream")
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.lightnovel),
-                        subtitle = "https://github.com/LagradOst/QuickNovel",
-                        icon = painterResource(R.drawable.quick_novel_icon),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://github.com/LagradOst/QuickNovel")
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.discord),
-                        subtitle = "https://discord.gg/5Hus6fM",
-                        icon = painterResource(R.drawable.ic_baseline_discord_24),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://discord.gg/5Hus6fM")
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.cs3wiki),
-                        subtitle = "https://cloudstream.miraheze.org/",
-                        icon = painterResource(R.drawable.description_24px),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://cloudstream.miraheze.org/")
-                        }
-                    ),
-                )
-            ),
-            Preference.PreferenceItem.TextPreference(
-                title = stringResource(R.string.benene),
-                subtitle = if (bananas == 0) {
-                    stringResource(R.string.benene_count_text_none)
-                } else {
-                    stringResource(R.string.benene_count_text, bananas)
-                },
-                onClick = {
-                    settings.general.bananas.set(bananas + 1)
-                },
-                icon = painterResource(R.drawable.benene),
-            ),
-            Preference.PreferenceItem.InfoPreference(title = stringResource(R.string.legal_notice_text)),
-        )
-    }
-}
-
-
-@PreviewLightDark
-@Composable
-private fun SettingGeneralPreview() {
-    CloudStreamPreviewTheme {
-        SettingsGeneralScreen.Content()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer2.kt
deleted file mode 100644
index 3c6a272d7..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsPlayer2 : BaseComposeFragment(), SearchableSettings by SettingsPlayerScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt
deleted file mode 100644
index 176eb1202..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt
+++ /dev/null
@@ -1,351 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.text.format.Formatter.formatShortFileSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableLongStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.actions.VideoClickActionHolder
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getFolderSize
-import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream4.compose.EMULATOR
-import com.lagradost.cloudstream4.compose.PHONE
-import com.lagradost.cloudstream4.compose.TV
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlin.reflect.jvm.jvmName
-
-object SettingsPlayerScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_player)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        val context = LocalContext.current
-        val defaultPlayerName = stringResource(R.string.player_settings_play_in_app)
-        val players = remember(context) {
-            mapOf("" to defaultPlayerName) + VideoClickActionHolder.getPlayers()
-                .associate { player ->
-                    player.uniqueId() to (player.name.asStringNull(context)
-                        ?: player::class.simpleName ?: player::class.jvmName)
-                }
-        }
-
-        var cacheSize by remember { mutableLongStateOf(0L) }
-        var cacheCleared by remember { mutableIntStateOf(0) }
-        val cacheDir = LocalContext.current.cacheDir
-        LaunchedEffect(cacheCleared) {
-            withContext(Dispatchers.IO) {
-                cacheSize = getFolderSize(cacheDir)
-            }
-        }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_subtitles),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.player_subtitles_settings),
-                        subtitle = stringResource(R.string.player_subtitles_settings_des),
-                        icon = painterResource(R.drawable.subtitles_gear_24px),
-                        onClick = {
-                            SubtitlesFragment.push(activity, false)
-                        }),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.chromecast_subtitles_settings),
-                        subtitle = stringResource(R.string.chromecast_subtitles_settings_des),
-                        icon = painterResource(R.drawable.cast),
-                        onClick = {
-                            ChromecastSubtitlesFragment.push(activity, false)
-                        }),
-                ),
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_player_features),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.player_pref),
-                        icon = painterResource(R.drawable.play_arrow_24px),
-                        preference = settings.player.defaultPlayer,
-                        entries = players,
-                    ),
-
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.source_priority),
-                        subtitle = stringResource(R.string.source_priority_help),
-                        icon = painterResource(R.drawable.ic_baseline_people_24),
-                        onClick = {
-                            ioSafe {
-                                val defaultSources = QualityProfileDialog.getAllDefaultSources()
-                                val activity = activity ?: return@ioSafe
-                                activity.runOnUiThread {
-                                    QualityProfileDialog(
-                                        activity,
-                                        R.style.DialogFullscreenPlayer,
-                                        defaultSources,
-                                    ).show()
-                                }
-                            }
-                        }),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.pipEnabled,
-                        title = stringResource(R.string.picture_in_picture),
-                        subtitle = stringResource(R.string.picture_in_picture_des),
-                        icon = painterResource(R.drawable.pip_24px),
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.resizeEnabled,
-                        title = stringResource(R.string.player_size_settings),
-                        subtitle = stringResource(R.string.player_size_settings_des),
-                        icon = painterResource(R.drawable.aspect_ratio_24px),
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.speedEnabled,
-                        title = stringResource(R.string.eigengraumode_settings),
-                        subtitle = stringResource(R.string.speed_setting_summary),
-                        icon = painterResource(R.drawable.ic_baseline_speed_24),
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.tiktokEnabled,
-                        title = stringResource(R.string.speedup_title),
-                        subtitle = stringResource(R.string.speedup_summary),
-                        icon = painterResource(R.drawable.speedup),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.autoPlayEnabled,
-                        title = stringResource(R.string.autoplay_next_settings),
-                        subtitle = stringResource(R.string.autoplay_next_settings_des),
-                        icon = painterResource(R.drawable.skip_next_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.startPaused,
-                        title = stringResource(R.string.start_paused_settings),
-                        subtitle = stringResource(R.string.start_paused_settings_des),
-                        icon = painterResource(R.drawable.pause_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.skipOpEnabled,
-                        title = stringResource(R.string.video_skip_op),
-                        subtitle = stringResource(R.string.enable_skip_op_from_database_des),
-                        icon = painterResource(R.drawable.keyboard_double_arrow_right_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.autoRotateEnabled,
-                        title = stringResource(R.string.auto_rotate_video),
-                        subtitle = stringResource(R.string.auto_rotate_video_desc),
-                        icon = painterResource(R.drawable.screen_rotation_alt_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.rotateButtonEnabled,
-                        title = stringResource(R.string.rotate_video),
-                        subtitle = stringResource(R.string.rotate_video_desc),
-                        icon = painterResource(R.drawable.screen_rotation),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.previewBarEnabled,
-                        enabled = isLayout(PHONE or EMULATOR),
-                        title = stringResource(R.string.preview_seekbar),
-                        subtitle = stringResource(R.string.preview_seekbar_desc),
-                        icon = painterResource(R.drawable.picture_in_picture_center_24px),
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.softwareDecoding,
-                        title = stringResource(R.string.software_decoding),
-                        subtitle = stringResource(R.string.software_decoding_desc),
-                        icon = painterResource(R.drawable.memory_24px),
-                        entries = integerArrayResource(R.array.software_decoding_switch_values).zip(
-                            stringArrayResource(R.array.software_decoding_switch)
-                        ).toMap()
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.extraBrightnessEnabled,
-                        title = stringResource(R.string.extra_brightness_settings),
-                        subtitle = stringResource(R.string.extra_brightness_settings_des),
-                        icon = painterResource(R.drawable.light_mode_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.episodeSync,
-                        title = stringResource(R.string.episode_sync_settings),
-                        subtitle = stringResource(R.string.episode_sync_settings_des),
-                        icon = painterResource(R.drawable.autorenew_24px)
-                    ),
-                ),
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_gestures),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.swipeHorizontalEnabled,
-                        title = stringResource(R.string.swipe_to_seek_settings),
-                        subtitle = stringResource(R.string.swipe_to_seek_settings_des),
-                        icon = painterResource(R.drawable.swipe_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.swipeVerticalEnabled,
-                        title = stringResource(R.string.swipe_to_change_settings),
-                        subtitle = stringResource(R.string.swipe_to_change_settings_des),
-                        icon = painterResource(R.drawable.swipe_vertical_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.doubleTapToSeekEnabled,
-                        title = stringResource(R.string.double_tap_to_seek_settings),
-                        subtitle = stringResource(R.string.double_tap_to_seek_settings_des),
-                        icon = painterResource(R.drawable.touch_double_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.doubleTapToPauseEnabled,
-                        title = stringResource(R.string.double_tap_to_pause_settings),
-                        subtitle = stringResource(R.string.double_tap_to_pause_settings_des),
-                        icon = painterResource(R.drawable.touch_double_24px),
-                    ),
-
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = settings.player.doubleTapTime,
-                        title = stringResource(R.string.double_tap_to_seek_amount_settings),
-                        icon = painterResource(R.drawable.go_forward_30),
-                        valueRange = 5..60,
-                        //steps = 10,
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_android_tv),
-                enabled = isLayout(TV or EMULATOR),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = settings.player.tvSeekOnTime,
-                        title = stringResource(R.string.android_tv_interface_on_seek_settings),
-                        subtitle = stringResource(R.string.android_tv_interface_on_seek_settings_summary),
-                        icon = painterResource(R.drawable.go_forward_30),
-                        valueRange = 5..60,
-                        //steps = 10,
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = settings.player.tvSeekOffTime,
-                        title = stringResource(R.string.android_tv_interface_off_seek_settings),
-                        subtitle = stringResource(R.string.android_tv_interface_off_seek_settings_summary),
-                        icon = painterResource(R.drawable.go_forward_30),
-                        valueRange = 5..60,
-                        //steps = 10,
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_player_layout),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.limitPlayerTitle,
-                        title = stringResource(R.string.limit_title),
-                        icon = painterResource(R.drawable.match_word_24px),
-                        entries = integerArrayResource(R.array.limit_title_pref_values).zip(
-                            stringArrayResource(R.array.limit_title_pref_names)
-                        ).toMap()
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        enabled = isLayout(PHONE or EMULATOR),
-                        preference = settings.player.hidePlayerControlNames,
-                        icon = painterResource(R.drawable.visibility_off_24px),
-                        title = stringResource(R.string.hide_player_control_names),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.showName,
-                        icon = painterResource(R.drawable.label_24px),
-                        title = stringResource(R.string.source_name),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.showMediaInfo,
-                        icon = painterResource(R.drawable.movie_info_24px),
-                        title = stringResource(R.string.video_info),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.showResolution,
-                        title = stringResource(R.string.resolution),
-                        icon = painterResource(R.drawable.high_res_24px),
-                    ),
-
-                    // Unsure if we want to have MultiSelectListPreference or boolean
-                    /*Preference.PreferenceItem.MultiSelectListPreference(
-                        preference = settings.player.showPlayerInfo,
-                        title = stringResource(R.string.limit_title_rez),
-                        icon = painterResource(R.drawable.ic_baseline_text_format_24),
-                        entries = persistentMapOf(
-                            ShowPlayerInfo.Name to stringResource(R.string.source_name),
-                            ShowPlayerInfo.Resolution to stringResource(R.string.resolution),
-                            ShowPlayerInfo.VideoInfo to stringResource(R.string.video_info),
-                        )
-                    ), */
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_cache),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.bufferDiskMB,
-                        title = stringResource(R.string.video_buffer_disk_settings),
-                        subtitle = "%s\n" + stringResource(R.string.video_disk_description),
-                        icon = painterResource(R.drawable.hard_drive_24px),
-                        entries = integerArrayResource(R.array.video_buffer_size_values).zip(
-                            stringArrayResource(R.array.video_buffer_size_names)
-                        ).toMap()
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.bufferRamMB,
-                        title = stringResource(R.string.video_buffer_size_settings),
-                        subtitle = "%s\n" + stringResource(R.string.video_ram_description),
-                        icon = painterResource(R.drawable.memory_alt_24px),
-                        entries = integerArrayResource(R.array.video_buffer_size_values).zip(
-                            stringArrayResource(R.array.video_buffer_size_names)
-                        ).toMap()
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.bufferTimeSec,
-                        title = stringResource(R.string.video_buffer_length_settings),
-                        subtitle = "%s\n" + stringResource(R.string.video_ram_description),
-                        icon = painterResource(R.drawable.history_toggle_off_24px),
-                        entries = integerArrayResource(R.array.video_buffer_length_values).zip(
-                            stringArrayResource(R.array.video_buffer_length_names)
-                        ).toMap()
-                    ),
-
-                    Preference.PreferenceItem.TextPreference(
-                        icon = painterResource(R.drawable.ic_baseline_delete_outline_24),
-                        title = stringResource(R.string.video_buffer_clear_settings),
-                        subtitle = formatShortFileSize(LocalContext.current, cacheSize),
-                        onClick = {
-                            ioSafe {
-                                cacheDir.deleteRecursively()
-                                cacheCleared += 1
-                            }
-                        })
-                )
-            ),
-
-            )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 08b147f52..c8478a840 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
@@ -109,8 +109,7 @@ class SettingsProviders : BasePreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.
-        provider_lang_key)?.setOnPreferenceClickListener {
+        getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { currentLangTags ->
                 val languagesTagName = APIHolder.apis.withLock {
                     listOf(Pair(AllLanguagesName, getString(R.string.all_languages_preference))) +
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders2.kt
deleted file mode 100644
index a0faeca93..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-@Deprecated("This setting was merged into other places")
-class SettingsProviders2 : BaseComposeFragment(), SearchableSettings by SettingsProvidersScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProvidersScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProvidersScreen.kt
deleted file mode 100644
index 4186994c7..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProvidersScreen.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.AllLanguagesName
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-
-@Deprecated("This setting was merged into other places")
-object SettingsProvidersScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_providers)
-
-    fun TvType.toStringRes() = when (this) {
-        TvType.TvSeries -> R.string.tv_series_singular
-        TvType.Anime -> R.string.anime_singular
-        TvType.OVA -> R.string.ova_singular
-        TvType.AnimeMovie -> R.string.movies_singular
-        TvType.Cartoon -> R.string.cartoons_singular
-        TvType.Documentary -> R.string.documentaries_singular
-        TvType.Movie -> R.string.movies_singular
-        TvType.Torrent -> R.string.torrent_singular
-        TvType.AsianDrama -> R.string.asian_drama_singular
-        TvType.Live -> R.string.live_singular
-        TvType.Others -> R.string.other_singular
-        TvType.NSFW -> R.string.nsfw_singular
-        TvType.Music -> R.string.music_singular
-        TvType.AudioBook -> R.string.audio_book_singular
-        TvType.CustomMedia -> R.string.custom_media_singular
-        TvType.Audio -> R.string.audio_singular
-        TvType.Podcast -> R.string.podcast_singular
-        TvType.Video -> R.string.video_singular
-    }
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        val default = AllLanguagesName to stringResource(R.string.all_languages_preference)
-        val languages = APIHolder.apis.withLock {
-            APIHolder.apis.map { api -> api.lang }.distinct()
-        }.sortedBy { fromTagToLanguageName(it) ?: it }
-
-        return persistentListOf(
-            Preference.PreferenceItem.MultiSelectListPreference(
-            title = stringResource(R.string.provider_lang_settings),
-            icon = painterResource(R.drawable.plugin_lang),
-            entries = mapOf(default) + languages.associateWith { lang ->
-                (getNameNextToFlagEmoji(
-                    lang
-                ) ?: lang)
-            },
-            preference = settings.provider.extensionLanguages
-        ), Preference.PreferenceItem.MultiSelectListPreference(
-            title = stringResource(R.string.preferred_media_settings),
-            icon = painterResource(R.drawable.movie_edit_24px),
-            preference = settings.provider.preferredMedia,
-            entries = TvType.entries.associate {
-                    it.ordinal.toString() to stringResource(it.toStringRes())
-                }),
-            Preference.PreferenceItem.MultiSelectListPreference(
-            title = stringResource(R.string.display_subbed_dubbed_settings),
-            icon = painterResource(R.drawable.audio_capture_24px),
-            preference = settings.provider.displayDubSub,
-            entries = mapOf(
-                DubStatus.None.name to stringResource(R.string.none),
-                DubStatus.Dubbed.name to stringResource(R.string.app_dubbed_text),
-                DubStatus.Subbed.name to stringResource(R.string.app_subbed_text),
-            )
-        ), Preference.PreferenceItem.TextPreference(
-            title = stringResource(R.string.test_extensions),
-            subtitle = stringResource(R.string.test_extensions_summary),
-            icon = painterResource(R.drawable.baseline_network_ping_24),
-            onClick = {
-                activity?.navigate(R.id.navigation_test_providers)
-            }))
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index 5f86a3a5a..f4c522bf9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -228,8 +228,6 @@ class SettingsUI : BasePreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.tv_layout_clock_key)?.hideOn(PHONE or EMULATOR)
-
         getPref(R.string.confirm_exit_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.confirm_exit)
             val prefValues = resources.getIntArray(R.array.confirm_exit_values)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI2.kt
deleted file mode 100644
index 86f3371fa..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsUI2 : BaseComposeFragment(), SearchableSettings by SettingsUIScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUIScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUIScreen.kt
deleted file mode 100644
index 1092a9be6..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUIScreen.kt
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.os.Build
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.SearchQuality
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.ui.clear
-import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
-import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
-import com.lagradost.cloudstream3.ui.search.SearchAdapter
-import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream4.compose.TV
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.cloudstream4.theme.CloudStreamPrimaryColor
-import com.lagradost.cloudstream4.theme.modeToTheme
-import com.lagradost.cloudstream4.theme.perfToColor
-import com.lagradost.cloudstream4.theme.perfToMode
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.mutate
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentMap
-
-object SettingsUIScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_ui)
-
-    fun SearchQuality.toStringRes() = when (this) {
-        SearchQuality.BlueRay -> R.string.quality_blueray
-        SearchQuality.Cam -> R.string.quality_cam
-        SearchQuality.CamRip -> R.string.quality_cam_rip
-        SearchQuality.DVD -> R.string.quality_dvd
-        SearchQuality.HD -> R.string.quality_hd
-        SearchQuality.HQ -> R.string.quality_hq
-        SearchQuality.HdCam -> R.string.quality_cam_hd
-        SearchQuality.Telecine -> R.string.quality_tc
-        SearchQuality.Telesync -> R.string.quality_ts
-        SearchQuality.WorkPrint -> R.string.quality_workprint
-        SearchQuality.SD -> R.string.quality_sd
-        SearchQuality.FourK -> R.string.quality_4k
-        SearchQuality.UHD -> R.string.quality_uhd
-        SearchQuality.SDR -> R.string.quality_sdr
-        SearchQuality.HDR -> R.string.quality_hdr
-        SearchQuality.WebRip -> R.string.quality_webrip
-    }
-
-    @Composable
-    fun RoundColor(color: Color) {
-        Box(
-            modifier = Modifier
-                .padding(start = 15.dp)
-                .size(20.dp)
-                .border(width = 1.5.dp, shape = CircleShape, color = MaterialTheme.colorScheme.onBackground)
-                .background(color, CircleShape)
-        )
-    }
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_looks),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.primaryColor,
-                        icon = painterResource(R.drawable.colors_24px),
-                        title = stringResource(R.string.primary_color_settings),
-                        entries = stringArrayResource(R.array.themes_overlay_names_values).zip(
-                            stringArrayResource(R.array.themes_overlay_names)
-                        ).toMap().toPersistentMap().mutate { map ->
-                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
-                                map.remove("Monet")
-                                map.remove("Monet2")
-                            }
-                        },
-                        iconProvider = { k, _ ->
-                            val color = perfToColor(k)
-                            RoundColor(color.color)
-                        },
-                        onValueChanged = { newValue ->
-                            settings.ui.primaryColor.set(newValue) // We need to set before we recreate
-                            safe {
-                                activity?.recreate()
-                            }
-                            return@ListPreference false
-                        }),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.theme,
-                        icon = painterResource(R.drawable.palette_24px),
-                        title = stringResource(R.string.app_theme_settings),
-                        entries = stringArrayResource(R.array.themes_names_values).zip(
-                            stringArrayResource(R.array.themes_names)
-                        ).toMap().toPersistentMap().mutate { map ->
-                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
-                                map.remove("Monet")
-                            }
-                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { // Remove system on android 9 and less
-                                map.remove("System")
-                            }
-                        },
-                        iconProvider = { k, _ ->
-                            val theme = modeToTheme(perfToMode(k), CloudStreamPrimaryColor.NORMAL)
-                            RoundColor(theme.background)
-                        },
-                        onValueChanged = { newValue ->
-                            settings.ui.theme.set(newValue) // We need to set before we recreate
-                            safe {
-                                activity?.recreate()
-                            }
-                            return@ListPreference false
-                        }),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.layout,
-                        icon = painterResource(R.drawable.responsive_layout_24px),
-                        title = stringResource(R.string.app_layout),
-                        entries = integerArrayResource(R.array.app_layout_values).zip(
-                            stringArrayResource(R.array.app_layout)
-                        ).toMap().toPersistentMap(),
-                        onValueChanged = { newValue ->
-                            settings.ui.layout.set(newValue) // We need to set before we recreate
-                            safe {
-                                activity?.updateTv()
-                                activity?.recreate()
-                            }
-                            return@ListPreference false
-                        }),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_ui_features),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = settings.ui.overscanDp,
-                        title = stringResource(R.string.overscan_settings),
-                        subtitle = stringResource(R.string.overscan_settings_des),
-                        valueRange = 0..100,
-                        icon = painterResource(R.drawable.arrows_input_24px),
-                        enabled = isLayout(TV),
-                        onValueChanged = { newValue ->
-                            settings.ui.overscanDp.set(newValue)
-                            val padding = newValue.toPx
-                            (activity as? MainActivity)?.binding?.homeRoot?.setPadding(
-                                padding, padding, padding, padding
-                            )
-                            return@SliderPreference false
-                        }),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.advancedSearch,
-                        title = stringResource(R.string.advanced_search),
-                        subtitle = stringResource(R.string.advanced_search_des),
-                        icon = painterResource(R.drawable.search_icon)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.searchSuggestions,
-                        title = stringResource(R.string.search_suggestions),
-                        subtitle = stringResource(R.string.search_suggestions_des),
-                        icon = painterResource(R.drawable.tooltip_24px)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.trailersEnabled,
-                        title = stringResource(R.string.show_trailers_settings),
-                        icon = painterResource(R.drawable.baseline_theaters_24)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.kitsuPostersEnabled,
-                        title = stringResource(R.string.kitsu_settings),
-                        icon = painterResource(R.drawable.kitsu_icon)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.castEnabled,
-                        title = stringResource(R.string.show_cast_in_details),
-                        icon = painterResource(R.drawable.face_24px)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.fillersEnabled,
-                        title = stringResource(R.string.show_fillers_settings),
-                        icon = painterResource(R.drawable.skip_next_24px)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.showMetadataOverlay,
-                        title = stringResource(R.string.show_player_metadata_overlay),
-                        icon = painterResource(R.drawable.metadata_overlay_icon)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.showClock,
-                        title = stringResource(R.string.tv_layout_clock_settings),
-                        subtitle = stringResource(R.string.tv_layout_clock_settings_des),
-                        icon = painterResource(R.drawable.ic_baseline_clock_24),
-                        enabled = isLayout(TV),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.randomButtonEnabled,
-                        title = stringResource(R.string.random_button_settings),
-                        subtitle = stringResource(R.string.random_button_settings_desc),
-                        icon = painterResource(R.drawable.shuffle_24px)
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.confirmExit,
-                        title = stringResource(R.string.confirm_before_exiting_title),
-                        subtitle = stringResource(R.string.confirm_before_exiting_desc),
-                        icon = painterResource(R.drawable.ic_baseline_exit_24),
-                        entries = integerArrayResource(R.array.confirm_exit_values).zip(
-                            stringArrayResource(R.array.confirm_exit)
-                        ).toMap()
-                    ),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.search_poster_img_des),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.MultiSelectListPreference(
-                        preference = settings.ui.filterQuality,
-                        title = stringResource(R.string.pref_filter_search_quality),
-                        icon = painterResource(R.drawable.filter_alt_24px),
-                        entries = SearchQuality.entries.associateWith { stringResource(it.toStringRes()) }),
-                    Preference.PreferenceItem.MultiSelectListPreference(
-                        title = stringResource(R.string.display_subbed_dubbed_settings),
-                        icon = painterResource(R.drawable.audio_capture_24px),
-                        preference = settings.provider.displayDubSub,
-                        entries = mapOf(
-                            DubStatus.None.name to stringResource(R.string.none),
-                            DubStatus.Dubbed.name to stringResource(R.string.app_dubbed_text),
-                            DubStatus.Subbed.name to stringResource(R.string.app_subbed_text),
-                        )),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.bottomTitle,
-                        title = stringResource(R.string.bottom_title_settings),
-                        subtitle = stringResource(R.string.bottom_title_settings_des),
-                        icon = painterResource(R.drawable.title_24px)
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = settings.ui.posterSize,
-                        title = stringResource(R.string.poster_size_settings),
-                        subtitle = stringResource(R.string.poster_size_settings_des),
-                        valueRange = 0..15,
-                        icon = painterResource(R.drawable.baseline_grid_view_24),
-                        onValueChanged = { newValue ->
-                            HomeChildItemAdapter.sharedPool.clear()
-                            ParentItemAdapter.sharedPool.clear()
-                            SearchAdapter.sharedPool.clear()
-                            activity?.let { HomeChildItemAdapter.updatePosterSize(it, newValue) }
-                            settings.ui.posterSize.set(newValue)
-                            return@SliderPreference false
-                        }),
-                ),
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.poster_ui_settings),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowRating,
-                        title = stringResource(R.string.show_rating),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowEpisode,
-                        title = stringResource(R.string.show_episode_text),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowTitle,
-                        title = stringResource(R.string.show_title),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowHd,
-                        title = stringResource(R.string.show_hd),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowDub,
-                        title = stringResource(R.string.show_dub),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowSub,
-                        title = stringResource(R.string.show_sub),
-                    ),
-                )
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates2.kt
deleted file mode 100644
index 50070a384..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsUpdates2 : BaseComposeFragment(), SearchableSettings by SettingsUpdatesScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdatesScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdatesScreen.kt
deleted file mode 100644
index 091a645d6..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdatesScreen.kt
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.content.Intent
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import com.lagradost.cloudstream3.AutoDownloadMode
-import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.CloudStreamApp
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.MainActivityScreen
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.utils.BackupUtils
-import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.InAppUpdater.installPreReleaseIfNeeded
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.safefile.SafeFile
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.collectAsState
-import kotlinx.collections.immutable.persistentListOf
-
-object SettingsUpdatesScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_updates)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        // TODO Refactor entirely to use a different file path selector ect like QuickNovel
-        val selectFileSelector =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
-                // It lies, it can be null if file manager quits.
-                if (uri == null) return@rememberLauncherForActivityResult
-                val context = CloudStreamApp.context ?: return@rememberLauncherForActivityResult
-
-                try {
-                    val settings = AppSettings(context)
-                    // RW perms for the path
-                    val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                            Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-
-                    context.contentResolver.takePersistableUriPermission(uri, flags)
-
-                    val filePath = SafeFile.fromUri(context, uri)?.filePath()
-                    println("Selected URI path: $uri - Full path: $filePath")
-
-                    // store the actual URI instead of the path due to permissions.
-                    // filePath should only be used for cosmetic purposes.
-                    val visual = filePath ?: uri.toString()
-                    settings.backup.path.set(uri.toString())
-                    settings.backup.visualPath.set(visual)
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-            }
-
-        val visualBackupPath by settings.backup.visualPath.collectAsState()
-        var showDialog by remember { mutableStateOf(false) }
-
-        if (showDialog) {
-            com.lagradost.cloudstream3.ui.settings.logcat.LogcatDialog {
-                showDialog = false
-            }
-        }
-
-        val githubViewModel = MainActivityScreen.githubViewModel()
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_app_updates),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.check_for_update),
-                        subtitle = BuildConfig.VERSION_NAME,
-                        icon = painterResource(R.drawable.mobile_arrow_down_24px),
-                        onClick = {
-                            githubViewModel?.onAction(GithubAction.SearchForUpdate)
-                            /*ioSafe {
-                                if (activity?.runAutoUpdate(false) == false) {
-                                    activity?.runOnUiThread {
-                                        showToast(
-                                            R.string.no_update_found,
-                                            Toast.LENGTH_SHORT
-                                        )
-                                    }
-                                }
-                            }*/
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.install_prerelease),
-                        icon = painterResource(R.drawable.mobile_code_24px),
-                        enabled = BuildConfig.FLAVOR == "stable",
-                        onClick = {
-                            activity?.installPreReleaseIfNeeded()
-                        }
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.apk_installer_settings),
-                        subtitle = stringResource(R.string.apk_installer_settings_des),
-                        icon = painterResource(R.drawable.mobile_wrench_24px),
-                        entries = integerArrayResource(R.array.apk_installer_values).zip(
-                            stringArrayResource(R.array.apk_installer_pref)
-                        ).toMap(),
-                        preference = settings.updates.apkInstaller
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        title = stringResource(R.string.updates_settings),
-                        subtitle = stringResource(R.string.updates_settings_des),
-                        icon = painterResource(R.drawable.notifications_active_24px),
-                        preference = settings.updates.showAppUpdates
-                    )
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_backup),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.backup_settings),
-                        icon = painterResource(R.drawable.save_as_24px),
-                        onClick = {
-                            BackupUtils.backup(activity)
-                        }
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.backup_frequency),
-                        icon = painterResource(R.drawable.save_clock_24px),
-                        entries = integerArrayResource(R.array.periodic_work_values).zip(
-                            stringArrayResource(R.array.periodic_work_names)
-                        ).toMap(),
-                        preference = settings.backup.frequency
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.backup_path_title),
-                        icon = painterResource(R.drawable.folder_24px),
-                        subtitle = visualBackupPath,
-                        onClick = {
-                            // This is not a ListPreference because the old selection system is
-                            // broken af. This needs to be refactored to QuickNovels download path
-                            // system.
-                            selectFileSelector.launch(Uri.EMPTY)
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.restore_settings),
-                        icon = painterResource(R.drawable.restore_page_24px),
-                        onClick = {
-                            activity?.restorePrompt()
-                        }
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_extensions),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        title = stringResource(R.string.automatic_plugin_updates),
-                        icon = painterResource(R.drawable.extension_24px),
-                        preference = settings.plugins.autoUpdate,
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.automatic_plugin_download),
-                        subtitle = "%s\n" + stringResource(R.string.automatic_plugin_download_summary),
-                        icon = painterResource(R.drawable.extention_renew2),
-                        entries = AutoDownloadMode.entries.map { it.value }.sorted()
-                            .zip(stringArrayResource((R.array.auto_download_plugin))).toMap(),
-                        preference = settings.plugins.autoDownload
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.update_plugins),
-                        subtitle = stringResource(R.string.update_plugins_manually),
-                        icon = painterResource(R.drawable.extention_download),
-                        onClick = {
-                            ioSafe {
-                                PluginManager.___DO_NOT_CALL_FROM_A_PLUGIN_manuallyReloadAndUpdatePlugins(
-                                    activity ?: return@ioSafe
-                                )
-                            }
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.test_extensions),
-                        subtitle = stringResource(R.string.test_extensions_summary),
-                        icon = painterResource(R.drawable.baseline_network_ping_24),
-                        onClick = {
-                            activity?.navigate(R.id.navigation_test_providers)
-                        })
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_actions),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.show_log_cat),
-                        icon = painterResource(R.drawable.article_24px),
-                        onClick = {
-                            showDialog = true
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.redo_setup_process),
-                        icon = painterResource(R.drawable.construction_24px),
-                        onClick = {
-                            activity?.navigate(R.id.navigation_setup_language)
-                        }
-                    ),
-                )
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatDialog.kt
deleted file mode 100644
index 7d5ce2313..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatDialog.kt
+++ /dev/null
@@ -1,282 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings.logcat
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component1
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component2
-import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.DialogProperties
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
-import com.lagradost.cloudstream3.utils.txt
-import com.lagradost.cloudstream4.compose.BlackButton
-import com.lagradost.cloudstream4.compose.WhiteButton
-import com.lagradost.cloudstream4.compose.circle
-import com.lagradost.cloudstream4.compose.rounded
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.OutputStream
-import java.lang.System.currentTimeMillis
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-
-@Composable
-fun LogcatDialog(dismiss: () -> Unit) {
-    val list = remember { mutableStateOf(persistentListOf<LogcatItem>()) }
-    var isLoading by remember { mutableStateOf(true) }
-    LaunchedEffect(dismiss) {
-        try {
-            isLoading = true
-
-            // https://developer.android.com/studio/command-line/logcat
-            val process = Runtime.getRuntime().exec("logcat --binary -d")
-            val items = arrayListOf<LogcatItem>()
-            LogcatBinaryParser(process.inputStream).use { parser ->
-                while (true) {
-                    val item = parser.parseItem() ?: break
-                    items.add(item)
-                }
-            }
-
-            list.value = items.toPersistentList()
-        } catch (e: Exception) {
-            logError(e) // kinda ironic
-        } finally {
-            isLoading = false
-        }
-    }
-    val (dismissFocus, confirmFocus) = remember { FocusRequester.createRefs() }
-
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-    AlertDialog(
-        containerColor = MaterialTheme.colorScheme.background,
-        onDismissRequest = dismiss,
-        title = {
-            Text(text = stringResource(R.string.log_cat))
-        },
-        text = {
-            if (isLoading) {
-                LinearProgressIndicator(
-                    modifier = Modifier.fillMaxWidth(),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    trackColor = MaterialTheme.colorScheme.surfaceVariant,
-                )
-            }
-            LazyColumn(
-                modifier = Modifier.focusProperties {
-                    start = dismissFocus
-                    end = confirmFocus
-                }
-            ) {
-                items(items = list.value) { item ->
-                    LogcatItem(item, modifier = Modifier.focusProperties {
-                        start = dismissFocus
-                        end = confirmFocus
-                    })
-                }
-            }
-        },
-        confirmButton = {
-            WhiteButton(
-                text = stringResource(R.string.sort_save),
-                modifier = Modifier.focusRequester(confirmFocus)
-            ) {
-                scope.launch {
-                    withContext(Dispatchers.IO) {
-                        val date = SimpleDateFormat("yyyy_MM_dd_HH_mm", Locale.getDefault()).format(
-                            Date(currentTimeMillis())
-                        )
-                        var fileStream: OutputStream?
-                        try {
-                            fileStream = VideoDownloadManager.setupStream(
-                                context,
-                                "logcat_${date}",
-                                null,
-                                "txt",
-                                false
-                            ).openNew()
-                            fileStream.bufferedWriter()
-                                .use { writer ->
-                                    list.value.forEach {
-                                        writer.write(it.toString())
-                                        writer.write("\n\n")
-                                    }
-                                }
-                            dismiss()
-                        } catch (t: Throwable) {
-                            logError(t)
-                            showToast(t.message)
-                        }
-                        /*try {
-                            val date = SimpleDateFormat(
-                                "yyyy_MM_dd_HH_mm",
-                                Locale.getDefault()
-                            ).format(
-                                Date(System.currentTimeMillis())
-                            )
-
-                            val file = FileHelper.logcat.createFile(context, "logcat_${date}")
-                                ?: throw ErrorLoadingException("Unable to create file")
-                            val stream = file.openOutputStream(append = false)
-                                ?: throw ErrorLoadingException("Unable to create stream")
-
-                            stream.bufferedWriter()
-                                .use { writer ->
-                                    list.value.forEach {
-                                        writer.write(it.toString())
-                                        writer.write("\n\n")
-                                    }
-                                }
-                            dismiss()
-                            showToast(
-                                txt(
-                                    R.string.logcat_success,
-                                    file.absolutePath ?: file.uri.toString()
-                                ),
-                                Toast.LENGTH_LONG
-                            )
-                        } catch (t: Throwable) {
-                            logError(t)
-                            showToast(t.message)
-                        }*/
-                    }
-                }
-            }
-
-            WhiteButton(text = stringResource(R.string.sort_copy)) {
-                clipboardHelper(
-                    txt("Logcat"),
-                    list.value.joinToString(separator = "\n\n") { it.toString() }
-                )
-            }
-            WhiteButton(text = stringResource(R.string.sort_clear)) {
-                try {
-                    Runtime.getRuntime().exec("logcat -c")
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-                dismiss()
-            }
-        },
-        dismissButton = {
-            BlackButton(
-                text = stringResource(R.string.sort_close),
-                onClick = dismiss,
-                modifier = Modifier.focusRequester(dismissFocus)
-            )
-        },
-        properties = DialogProperties(usePlatformDefaultWidth = false)
-    )
-}
-
-
-@Composable
-fun LogcatItem(item: LogcatItem, modifier: Modifier = Modifier) {
-    val color = when (item.level) {
-        LogcatLevel.Fatal -> Color.Magenta
-        LogcatLevel.Error -> Color.Red
-        LogcatLevel.Warning -> Color.Yellow
-        LogcatLevel.Info -> Color.White
-        LogcatLevel.Debug -> Color.Green
-        LogcatLevel.Verbose -> Color.Gray
-        null -> Color.Transparent
-    }
-
-    Row(modifier = Modifier.fillMaxWidth()) {
-        item.level?.identifier?.let { value ->
-            Text(
-                value,
-                modifier = Modifier
-                    .padding(2.dp)
-                    .rounded()
-                    .background(MaterialTheme.colorScheme.onBackground)
-                    .padding(4.dp),
-                color = MaterialTheme.colorScheme.surfaceVariant
-            )
-        }
-        Text(
-            item.date.toHumanReadable(),
-            modifier = Modifier
-                .padding(2.dp)
-                .rounded()
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-                .padding(4.dp),
-            color = MaterialTheme.colorScheme.onBackground
-        )
-        Text(
-            item.tag,
-            modifier = Modifier
-                .padding(2.dp)
-                .rounded()
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-                .padding(4.dp),
-            color = MaterialTheme.colorScheme.onBackground
-        )
-    }
-    Row(
-        modifier = modifier
-            .height(IntrinsicSize.Min)
-            .fillMaxWidth()
-            .rounded()
-            .clickable(
-                onClick = {
-                    clipboardHelper(txt("Logcat"), item.toString())
-                })
-            .padding(5.dp)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxHeight()
-                .width(4.dp)
-                .circle()
-                .background(color)
-        )
-        Spacer(modifier = Modifier.width(5.dp))
-        Text(
-            item.message,
-            color = MaterialTheme.colorScheme.onBackground,
-            fontSize = 14.sp,
-            lineHeight = 15.sp,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatParser.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatParser.kt
deleted file mode 100644
index df1dc7077..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatParser.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings.logcat
-
-import androidx.compose.runtime.Immutable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.Closeable
-import java.io.InputStream
-import kotlin.time.Instant
-import kotlinx.io.Buffer
-import kotlinx.io.asSource
-import kotlinx.io.readByteArray
-import kotlinx.io.readIntLe
-import kotlinx.io.readString
-import kotlinx.io.readUShortLe
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
-
-fun Instant.toHumanReadable(): String {
-    val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).apply {
-        timeZone = TimeZone.getDefault()
-    }
-    return formatter.format(Date(this.toEpochMilliseconds()))
-}
-@Immutable
-data class LogcatItem(
-    val date: Instant,
-    val pid: Int,
-    val tid: Int,
-    val level: LogcatLevel?,
-    val tag: String,
-    val message: String,
-) {
-    override fun toString(): String {
-        return "${date.toHumanReadable()} $pid-$tid $tag ${level?.identifier ?: "?"} $message"
-    }
-}
-
-enum class LogcatLevel(val identifier: String) {
-    Fatal("WTF"),
-    Error("E"),
-    Warning("W"),
-    Info("I"),
-    Debug("D"),
-    Verbose("V"),
-}
-
-/**https://github.com/brudaswen/android-logcat/blob/main/library/logcat-core/src/main/kotlin/de/brudaswen/android/logcat/core/parser/LogcatBinaryParser.kt  */
-class LogcatBinaryParser(
-    private val input: InputStream,
-) : Closeable by input {
-    val source = input.asSource()
-    private val buffer = Buffer()
-
-    /**
-     * Parse one [LogcatItem] from the current [input] stream.
-     *
-     * @return The parsed [LogcatItem] or `null` if stream reached EOF.
-     */
-    suspend fun parseItem(): LogcatItem? = withContext(Dispatchers.IO) {
-        val firstByte = input.read()
-        if (firstByte == -1) return@withContext null
-
-        // Read v1 header
-        buffer.writeByte(firstByte.toByte())
-        buffer.write(source = source, byteCount = 19)
-
-        val len = buffer.readUShortLe().toInt()
-        val headerSize = buffer.readUShortLe().toInt()
-        val pid = buffer.readIntLe()
-        val tid = buffer.readIntLe()
-        val sec = buffer.readIntLe()
-        val nsec = buffer.readIntLe()
-
-        // Read additional header fields
-        buffer.write(source = source, byteCount = headerSize - 20L)
-
-        val additionalHeaderBytes = (headerSize - 20).coerceAtLeast(0)
-        buffer.readByteArray(byteCount = additionalHeaderBytes)
-
-        // Read payload
-        buffer.write(source = source, byteCount = len.toLong())
-
-        val priority = buffer.readByte()
-
-        val payload = buffer.readString()
-        val texts = payload.split('\u0000', limit = 2)
-        val tag = texts.getOrNull(0).orEmpty()
-        val message = texts.getOrNull(1).orEmpty().removeSuffix("\u0000").trim()
-
-        // Clear buffer
-        buffer.clear()
-
-        // Convert raw values to item
-        LogcatItem(
-            sec = sec,
-            nsec = nsec,
-            priority = priority,
-            pid = pid,
-            tid = tid,
-            tag = tag,
-            message = message,
-        )
-    }
-
-    private fun LogcatItem(
-        sec: Int,
-        nsec: Int,
-        priority: Byte,
-        pid: Int,
-        tid: Int,
-        tag: String,
-        message: String,
-    ): LogcatItem {
-        val date = Instant.fromEpochSeconds(
-            epochSeconds = sec.toLong(),
-            nanosecondAdjustment = nsec,
-        )
-
-        val level = when (priority) {
-            2.toByte() -> LogcatLevel.Verbose
-            3.toByte() -> LogcatLevel.Debug
-            4.toByte() -> LogcatLevel.Info
-            5.toByte() -> LogcatLevel.Warning
-            6.toByte() -> LogcatLevel.Error
-            7.toByte() -> LogcatLevel.Fatal
-            else -> null
-        }
-
-        return LogcatItem(
-            date = date,
-            pid = pid,
-            tid = tid,
-            level = level,
-            tag = tag,
-            message = message,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index 42a62ed52..e96a662c3 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
@@ -50,18 +50,18 @@ class SetupFragmentLanguage : BaseFragment<FragmentSetupLanguageBinding>(
                     appIconImage.setImageDrawable(ContextCompat.getDrawable(ctx, drawable))
                 }
 
-                val tags = appLanguages.map { it.second }
-                val current = getCurrentLocale(ctx).replace('_', '-')
-                val currentIndex = tags.indexOf(current).takeIf { it >= 0 }
-                    ?: tags.indexOf(current.substringBefore('-'))
+                val current = getCurrentLocale(ctx)
+                val languageTagsIETF = appLanguages.map { it.second }
+                val languageNames = appLanguages.map { it.nameNextToFlagEmoji() }
+                val currentIndex = languageTagsIETF.indexOf(current)
 
-                arrayAdapter.addAll(appLanguages.map { it.nameNextToFlagEmoji() })
+                arrayAdapter.addAll(languageNames)
                 listview1.adapter = arrayAdapter
                 listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-                if (currentIndex >= 0) listview1.setItemChecked(currentIndex, true)
+                listview1.setItemChecked(currentIndex, true)
 
                 listview1.setOnItemClickListener { _, _, selectedLangIndex, _ ->
-                    val langTagIETF = tags[selectedLangIndex]
+                    val langTagIETF = languageTagsIETF[selectedLangIndex]
                     CommonActivity.setLocale(activity, langTagIETF)
                     settingsManager.edit {
                         putString(getString(R.string.locale_key), langTagIETF)
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 45755b947..8da121daa 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
@@ -4,6 +4,7 @@ import android.view.View
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import androidx.core.content.edit
+import androidx.core.util.forEach
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
@@ -26,41 +27,40 @@ class SetupFragmentMedia : BaseFragment<FragmentSetupMediaBinding>(
         safe {
             val ctx = context ?: return@safe
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
-            val prefKey = getString(R.string.prefer_media_type_key)
 
             val arrayAdapter =
                 ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-            val sortedTypes = enumValues<TvType>().sorted()
+            val names = enumValues<TvType>().sorted().map { it.name }
+            val selected = mutableListOf<Int>()
 
-            arrayAdapter.addAll(sortedTypes.map { it.name })
+            arrayAdapter.addAll(names)
             binding.apply {
                 listview1.let {
                     it.adapter = arrayAdapter
                     it.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
 
-                    val stored = settingsManager.getStringSet(prefKey, null)
-                    sortedTypes.forEachIndexed { index, type ->
-                        // All media types except NSFW are checked by default
-                        val isChecked = stored?.contains(type.ordinal.toString())
-                            ?: (type != TvType.NSFW)
-                        it.setItemChecked(index, isChecked)
-                    }
-
-                    val saveSelection = {
-                        val values = sortedTypes
-                            .filterIndexed { index, _ -> it.isItemChecked(index) }
-                            .map { type -> type.ordinal.toString() }
-                            .toSet()
-                        settingsManager.edit { putStringSet(prefKey, values) }
+                    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)
+                        }
 
                         // Regenerate set homepage
                         DataStoreHelper.currentHomePage = null
                     }
-
-                    if (stored == null) saveSelection()
-
-                    it.setOnItemClickListener { _, _, _, _ -> saveSelection() }
                 }
 
                 nextBtt.setOnClickListener {
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 0e203989f..95ef264f8 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
@@ -11,8 +11,6 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.OptIn
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.mutableStateOf
 import androidx.media3.common.text.Cue
 import androidx.media3.common.util.UnstableApi
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -46,16 +44,15 @@ import kotlinx.serialization.Serializable
 const val CHROME_SUBTITLE_KEY = "chome_subtitle_settings"
 
 @Serializable
-@Immutable
 data class SaveChromeCaptionStyle(
-    @JsonProperty("fontFamily") @SerialName("fontFamily") val fontFamily: String? = null,
-    @JsonProperty("fontGenericFamily") @SerialName("fontGenericFamily") val fontGenericFamily: Int? = null,
-    @JsonProperty("backgroundColor") @SerialName("backgroundColor") val backgroundColor: Int = 0x00FFFFFF, // transparent
-    @JsonProperty("edgeColor") @SerialName("edgeColor") val edgeColor: Int = Color.BLACK, // BLACK
-    @JsonProperty("edgeType") @SerialName("edgeType") val edgeType: Int = EDGE_TYPE_OUTLINE,
-    @JsonProperty("foregroundColor") @SerialName("foregroundColor") val foregroundColor: Int = Color.WHITE,
-    @JsonProperty("fontScale") @SerialName("fontScale") val fontScale: Float = 1.05f,
-    @JsonProperty("windowColor") @SerialName("windowColor") val windowColor: Int = Color.TRANSPARENT,
+    @JsonProperty("fontFamily") @SerialName("fontFamily") var fontFamily: String? = null,
+    @JsonProperty("fontGenericFamily") @SerialName("fontGenericFamily") var fontGenericFamily: Int? = null,
+    @JsonProperty("backgroundColor") @SerialName("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent
+    @JsonProperty("edgeColor") @SerialName("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK
+    @JsonProperty("edgeType") @SerialName("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE,
+    @JsonProperty("foregroundColor") @SerialName("foregroundColor") var foregroundColor: Int = Color.WHITE,
+    @JsonProperty("fontScale") @SerialName("fontScale") var fontScale: Float = 1.05f,
+    @JsonProperty("windowColor") @SerialName("windowColor") var windowColor: Int = Color.TRANSPARENT,
 )
 
 class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBinding>(
@@ -95,9 +92,6 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
         }
 
         fun Context.saveStyle(style: SaveChromeCaptionStyle) {
-            if (chromeCastSubtitleState.value !== style) {
-                chromeCastSubtitleState.value = style
-            }
             this.setKey(CHROME_SUBTITLE_KEY, style)
         }
 
@@ -107,13 +101,10 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
         }
 
         fun getCurrentSavedStyle(): SaveChromeCaptionStyle {
-            return chromeCastSubtitleState.value
+            return getKey(CHROME_SUBTITLE_KEY) ?: defaultState
         }
 
-        val defaultChromeCastSubtitleState = SaveChromeCaptionStyle()
-        val chromeCastSubtitleState = mutableStateOf(
-            getKey<SaveChromeCaptionStyle>(CHROME_SUBTITLE_KEY) ?: defaultChromeCastSubtitleState
-        )
+        private val defaultState = SaveChromeCaptionStyle()
     }
 
     private fun onColorSelected(stuff: Pair<Int, Int>) {
@@ -143,10 +134,10 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
     private fun setColor(id: Int, color: Int?) {
         val realColor = color ?: getDefColor(id)
         when (id) {
-            0 -> state = state.copy(foregroundColor = realColor)
-            1 -> state = state.copy(edgeColor = realColor)
-            2 -> state = state.copy(backgroundColor = realColor)
-            3 -> state = state.copy(windowColor = realColor)
+            0 -> state.foregroundColor = realColor
+            1 -> state.edgeColor = realColor
+            2 -> state.backgroundColor = realColor
+            3 -> state.windowColor = realColor
 
             else -> Unit
         }
@@ -249,13 +240,13 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
                 false,
                 dismissCallback
             ) { index ->
-                state = state.copy(edgeType = edgeTypes.map { it.first }[index])
+                state.edgeType = edgeTypes.map { it.first }[index]
                 updateState()
             }
         }
 
         binding.subsEdgeType.setOnLongClickListener {
-            state = state.copy(edgeType = defaultChromeCastSubtitleState.edgeType)
+            state.edgeType = defaultState.edgeType
             updateState()
             showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
@@ -290,13 +281,13 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
                 false,
                 dismissCallback
             ) { index ->
-                state = state.copy(fontScale = fontSizes.map { it.first }[index])
+                state.fontScale = fontSizes.map { it.first }[index]
                 //textView.context.updateState() // font size not changed
             }
         }
 
         binding.subsFontSize.setOnLongClickListener { _ ->
-            state = state.copy(fontScale = defaultChromeCastSubtitleState.fontScale)
+            state.fontScale = defaultState.fontScale
             //textView.context.updateState() // font size not changed
             showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
@@ -323,12 +314,12 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
                 false,
                 dismissCallback
             ) { index ->
-                state = state.copy(fontFamily = fontTypes.map { it.first }[index])
+                state.fontFamily = fontTypes.map { it.first }[index]
                 updateState()
             }
         }
         binding.subsFont.setOnLongClickListener { _ ->
-            state = state.copy(fontFamily = defaultChromeCastSubtitleState.fontFamily)
+            state.fontFamily = defaultState.fontFamily
             updateState()
             showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment2.kt
deleted file mode 100644
index a25a8aa88..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lagradost.cloudstream3.ui.subtitles
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.lagradost.cloudstream4.compose.Screen
-
-class ChromecastSubtitlesFragment2 : BaseComposeFragment(), Screen by ChromecastSubtitlesScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesScreen.kt
deleted file mode 100644
index 63c3209b6..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesScreen.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.lagradost.cloudstream3.ui.subtitles
-
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DEPRESSED
-import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DROP_SHADOW
-import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_NONE
-import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_OUTLINE
-import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_RAISED
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment.Companion.applyStyleEvent
-import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment.Companion.chromeCastSubtitleState
-import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment.Companion.defaultChromeCastSubtitleState
-import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment.Companion.saveStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesScreen.SetUpUndoBar
-import com.mihon.common.preference.StatePreferenceStore
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentMapOf
-import kotlin.math.roundToInt
-
-object ChromecastSubtitlesScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.chromecast_subtitles_settings)
-
-    // For ux purposes we also want to show a diff of what will be reset
-    private val diff = arrayOf<Pair<Int, (SaveChromeCaptionStyle) -> Any?>>(
-        R.string.subs_font to { style -> style.fontFamily },
-        R.string.subs_text_color to { state -> state.foregroundColor },
-        R.string.subs_font_size to { state -> state.fontScale },
-        R.string.subs_edge_type to { state -> state.edgeType },
-        R.string.subs_outline_color to { state -> state.edgeColor },
-        R.string.subs_window_color to { state -> state.windowColor },
-        R.string.subs_background_color to { state -> state.backgroundColor },
-    )
-
-    @Composable
-    override fun RowScope.AppBarAction() {
-        val initialState = remember { chromeCastSubtitleState.value }
-        var state by chromeCastSubtitleState
-        val context = LocalContext.current
-
-        SideEffect(state) {
-            // When we modify the state, we modify the stored data
-            context.saveStyle(state)
-        }
-
-        DisposableEffect(Unit) {
-            onDispose {
-                if (initialState != state) {
-                    applyStyleEvent.invoke(state)
-                }
-            }
-        }
-        SetUpUndoBar(
-            diff = diff,
-            initialState = initialState,
-            currentState = chromeCastSubtitleState,
-            default = defaultChromeCastSubtitleState
-        )
-    }
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val store = StatePreferenceStore(chromeCastSubtitleState)
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.subs_font),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = store.field(SaveChromeCaptionStyle::fontFamily) { newValue ->
-                            copy(fontFamily = newValue)
-                        },
-                        icon = painterResource(R.drawable.font_download_24px),
-                        title = stringResource(R.string.subs_font),
-                        entries = persistentMapOf(
-                            null to stringResource(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",
-                        )
-                    ),
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveChromeCaptionStyle::foregroundColor) { newValue ->
-                            copy(foregroundColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_text_color),
-                        icon = painterResource(R.drawable.format_color_text_24px),
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = store.field(
-                            get = { fontScale.times(100.0f).roundToInt() },
-                            set = { newValue -> copy(fontScale = newValue.toFloat() * 0.01f) }),
-                        icon = painterResource(R.drawable.text_fields_24px),
-                        title = stringResource(R.string.subs_font_size),
-                        valueRange = 75..150,
-                        steps = 75 / 5 - 1,
-                    )
-                )
-            ), Preference.PreferenceGroup(
-                title = stringResource(R.string.subs_edge), preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = store.field(SaveChromeCaptionStyle::edgeType) { newValue ->
-                            copy(edgeType = newValue)
-                        },
-                        icon = painterResource(R.drawable.shadow_24px),
-                        title = stringResource(R.string.subs_edge_type),
-                        entries = persistentMapOf(
-                            EDGE_TYPE_NONE to stringResource(R.string.subtitles_none),
-                            EDGE_TYPE_OUTLINE to stringResource(R.string.subtitles_outline),
-                            EDGE_TYPE_DEPRESSED to stringResource(R.string.subtitles_depressed),
-                            EDGE_TYPE_DROP_SHADOW to stringResource(R.string.subtitles_shadow),
-                            EDGE_TYPE_RAISED to stringResource(R.string.subtitles_raised),
-                        )
-                    ),
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveChromeCaptionStyle::edgeColor) { newValue ->
-                            copy(edgeColor = newValue)
-                        },
-                        //enabled = state.edgeType != EDGE_TYPE_NONE,
-                        title = stringResource(R.string.subs_outline_color),
-                        icon = painterResource(R.drawable.border_color_24px),
-                    ),
-                )
-            ), Preference.PreferenceGroup(
-                title = stringResource(R.string.background), preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveChromeCaptionStyle::windowColor) { newValue ->
-                            copy(windowColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_window_color),
-                        icon = painterResource(R.drawable.imagesearch_roller_24px),
-                    ),
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveChromeCaptionStyle::backgroundColor) { newValue ->
-                            copy(backgroundColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_background_color),
-                        icon = painterResource(R.drawable.format_color_fill_24px),
-                    ),
-                )
-            )
-        )
-    }
-}
\ No newline at end of file
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 dd363fc10..860cb4fcb 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
@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.text.Layout
 import android.text.Spannable
 import android.text.SpannableString
-import android.text.SpannableStringBuilder
 import android.text.style.StyleSpan
 import android.util.DisplayMetrics
 import android.util.TypedValue
@@ -19,8 +18,6 @@ import android.widget.Toast
 import androidx.annotation.FontRes
 import androidx.annotation.OptIn
 import androidx.annotation.Px
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.mutableStateOf
 import androidx.core.content.edit
 import androidx.core.content.res.ResourcesCompat
 import androidx.media3.common.text.Cue
@@ -66,83 +63,30 @@ const val SUBTITLE_AUTO_SELECT_KEY = "subs_auto_select"
 const val SUBTITLE_DOWNLOAD_KEY = "subs_auto_download"
 
 @Serializable
-enum class SubtitleFont(
-    @FontRes val resource: Int,
-    val label: String
-) {
-    @JsonProperty("Trebuchet")
-    @SerialName("Trebuchet")
-    Trebuchet(R.font.trebuchet_ms, "Trebuchet MS"),
-    @JsonProperty("Netflix")
-    @SerialName("Netflix")
-    Netflix(R.font.netflix_sans, "Netflix Sans"),
-    @JsonProperty("Google")
-    @SerialName("Google")
-    Google(R.font.google_sans, "Google Sans"),
-    @JsonProperty("Open")
-    @SerialName("Open")
-    Open(R.font.open_sans, "Open Sans"),
-    @JsonProperty("Futura")
-    @SerialName("Futura")
-    Futura(R.font.futura, "Futura"),
-    @JsonProperty("Consola")
-    @SerialName("Consola")
-    Consola(R.font.consola, "Consola"),
-    @JsonProperty("Gotham")
-    @SerialName("Gotham")
-    Gotham(R.font.gotham, "Gotham"),
-    @JsonProperty("Lucida")
-    @SerialName("Lucida")
-    Lucida(R.font.lucida_grande, "Lucida Grande"),
-    @JsonProperty("STIX")
-    @SerialName("STIX")
-    STIX(R.font.stix_general, "STIX General"),
-    @JsonProperty("TimesNewRoman")
-    @SerialName("TimesNewRoman")
-    TimesNewRoman(R.font.times_new_roman, "Times New Roman"),
-    @JsonProperty("Verdana")
-    @SerialName("Verdana")
-    Verdana(R.font.verdana, "Verdana"),
-    @JsonProperty("Ubuntu")
-    @SerialName("Ubuntu")
-    Ubuntu(R.font.ubuntu_regular, "Ubuntu"),
-    @JsonProperty("Comic")
-    @SerialName("Comic")
-    Comic(R.font.comic_sans, "Comic Sans"),
-    @JsonProperty("Poppins")
-    @SerialName("Poppins")
-    Poppins(R.font.poppins_regular, "Poppins"),
-    @JsonProperty("Custom")
-    @SerialName("Custom")
-    Custom(0, "Custom"),
-}
-
-@Serializable
-@Immutable
 data class SaveCaptionStyle(
-    @JsonProperty("foregroundColor") @SerialName("foregroundColor") val foregroundColor: Int,
-    @JsonProperty("backgroundColor") @SerialName("backgroundColor") val backgroundColor: Int,
-    @JsonProperty("windowColor") @SerialName("windowColor") val windowColor: Int,
+    @JsonProperty("foregroundColor") @SerialName("foregroundColor") var foregroundColor: Int,
+    @JsonProperty("backgroundColor") @SerialName("backgroundColor") var backgroundColor: Int,
+    @JsonProperty("windowColor") @SerialName("windowColor") var windowColor: Int,
     @OptIn(UnstableApi::class)
-    @JsonProperty("edgeType") @SerialName("edgeType") val edgeType: @CaptionStyleCompat.EdgeType Int,
-    @JsonProperty("edgeColor") @SerialName("edgeColor") val edgeColor: Int,
-    @JsonProperty("font") @SerialName("font") val font: SubtitleFont? = null,
-    @JsonProperty("typefaceFilePath") @SerialName("typefaceFilePath") val typefaceFilePath: String?,
-    @JsonProperty("elevation") @SerialName("elevation") val elevation: Int, // in dp
-    @JsonProperty("fixedTextSize") @SerialName("fixedTextSize") val fixedTextSize: Float?, // in sp
-    @Px @JsonProperty("edgeSize") @SerialName("edgeSize") val edgeSize: Float? = null,
-    @JsonProperty("removeCaptions") @SerialName("removeCaptions") val removeCaptions: Boolean = false,
-    @JsonProperty("removeBloat") @SerialName("removeBloat") val removeBloat: Boolean = true,
+    @JsonProperty("edgeType") @SerialName("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
+    @JsonProperty("edgeColor") @SerialName("edgeColor") var edgeColor: Int,
+    @FontRes @JsonProperty("typeface") @SerialName("typeface") var typeface: Int?,
+    @JsonProperty("typefaceFilePath") @SerialName("typefaceFilePath") var typefaceFilePath: String?,
+    @JsonProperty("elevation") @SerialName("elevation") var elevation: Int, // in dp
+    @JsonProperty("fixedTextSize") @SerialName("fixedTextSize") var fixedTextSize: Float?, // in sp
+    @Px @JsonProperty("edgeSize") @SerialName("edgeSize") var edgeSize: Float? = null,
+    @JsonProperty("removeCaptions") @SerialName("removeCaptions") var removeCaptions: Boolean = false,
+    @JsonProperty("removeBloat") @SerialName("removeBloat") var removeBloat: Boolean = true,
     /** Apply caps lock to the text */
-    @JsonProperty("upperCase") @SerialName("upperCase") val upperCase: Boolean = false,
+    @JsonProperty("upperCase") @SerialName("upperCase") var upperCase: Boolean = false,
     /** Apply bold to the text */
-    @JsonProperty("bold") @SerialName("bold") val bold: Boolean = false,
+    @JsonProperty("bold") @SerialName("bold") var bold: Boolean = false,
     /** Apply italic to the text */
-    @JsonProperty("italic") @SerialName("italic") val italic: Boolean = false,
+    @JsonProperty("italic") @SerialName("italic") var italic: Boolean = false,
     /** in px, background radius, aka how round the background (backgroundColor) on each row is */
-    @JsonProperty("backgroundRadius") @SerialName("backgroundRadius") val backgroundRadius: Float? = null,
+    @JsonProperty("backgroundRadius") @SerialName("backgroundRadius") var backgroundRadius: Float? = null,
     /** The SSA_ALIGNMENT */
-    @JsonProperty("alignment") @SerialName("alignment") val alignment: Int? = null,
+    @JsonProperty("alignment") @SerialName("alignment") var alignment: Int? = null,
 )
 
 const val DEF_SUBS_ELEVATION = 20
@@ -171,9 +115,6 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                 )
             }
 
-            view.clipToPadding = false
-            view.clipChildren = false
-
             // we default to 25sp, this is needed as RoundedBackgroundColorSpan breaks on override sizes
             val size = data.fixedTextSize ?: 25.0f
             view.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, size)
@@ -186,7 +127,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun Cue.Builder.applyStyle(style: SaveCaptionStyle): Cue.Builder {
-            val edgeSize = style.edgeSize ?: 0.0f
+            val edgeSize = style.edgeSize
 
             /*
             This is old code for only applying on non null
@@ -204,18 +145,22 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
             // instead we use the inherit size of the subtitle view
             setTextSize(Cue.DIMEN_UNSET, Cue.TYPE_UNSET)
 
+            // 2. apply edge
             text?.let { text ->
-                val textSpanBuilder = SpannableStringBuilder(text)
-
-                // 2. apply edge
-                if (edgeSize > 0.0f) {
-                    textSpanBuilder.setSpan(
-                        OutlineSpan(edgeSize), 0, textSpanBuilder.length,
+                val customSpan = SpannableString.valueOf(text)
+                if (edgeSize != null) {
+                    customSpan.setSpan(
+                        OutlineSpan(edgeSize), 0, customSpan.length,
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
                     )
                 }
+                setText(customSpan)
+            }
+
+            // 3. apply bold + italic
+            text?.let { text ->
+                val customSpan = SpannableString.valueOf(text)
 
-                // 3. apply bold + italic
                 val typeface = when (style.bold to style.italic) {
                     (true to true) -> Typeface.BOLD_ITALIC
                     (true to false) -> Typeface.BOLD
@@ -227,36 +172,39 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                 }
                 if (typeface != Typeface.NORMAL) {
                     val styleSpan = StyleSpan(typeface)
-                    textSpanBuilder.setSpan(
-                        styleSpan, 0, textSpanBuilder.length,
+                    customSpan.setSpan(
+                        styleSpan, 0, customSpan.length,
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
                     )
                 }
+                setText(customSpan)
+            }
 
-                // 4. apply radius
-                val radius = style.backgroundRadius ?: 0.0f
-                if (radius > 0.0f && style.backgroundColor != Color.TRANSPARENT) {
+            // 4. apply radius
+            text?.let { text ->
+                val customSpan = SpannableString.valueOf(text)
+                val radius = style.backgroundRadius
+
+                if (radius != null && style.backgroundColor != Color.TRANSPARENT) {
                     val styleSpan = RoundedBackgroundColorSpan(
                         style.backgroundColor,
                         this.textAlignment ?: Layout.Alignment.ALIGN_CENTER,
                         2.0F + radius * 0.5f,
                         radius
                     )
-                    textSpanBuilder.setSpan(
-                        styleSpan, 0, textSpanBuilder.length,
+                    customSpan.setSpan(
+                        styleSpan, 0, customSpan.length,
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
                     )
                 }
+                setText(customSpan)
+            }
 
-                // 5. remove captions but ensure that styling is kept
-                // Just doing .replace removes all styling!
+            // 5. remove captions
+            text?.let { text ->
                 if (style.removeCaptions) {
-                    for (match in captionRegex.findAll(text).toList().asReversed()) {
-                        textSpanBuilder.delete(match.range.first, match.range.last + 1)
-                    }
+                    setText(text.replace(captionRegex, ""))
                 }
-
-                this.setText(textSpanBuilder)
             }
 
             // 6. set alignment
@@ -266,31 +214,23 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         private fun Context.fromSaveToStyle(data: SaveCaptionStyle): CaptionStyleCompat {
             return CaptionStyleCompat(
                 data.foregroundColor,
-                data.backgroundColor,
+                // we actually override with a custom span when backgroundRadius != null
+                if (data.backgroundRadius == null) data.backgroundColor else Color.TRANSPARENT,
                 data.windowColor,
                 data.edgeType,
                 data.edgeColor,
                 data.typefaceFilePath?.let {
                     try {
                         // RuntimeException: Font asset not found
-                        // Fuck android, they have no good way to load a font from a uri without a copy
                         Typeface.createFromFile(File(it))
-                    } catch (_: Exception) {
+                    } catch (e: Exception) {
                         null
                     }
-                } ?: data.font?.let { font ->
-                    if(font.resource != 0) {
-                        try {
-                            ResourcesCompat.getFont(
-                                this,
-                                font.resource
-                            )
-                        } catch (_ : Throwable) {
-                            Typeface.SANS_SERIF
-                        }
-                    } else {
-                        Typeface.SANS_SERIF
-                    }
+                } ?: data.typeface?.let {
+                    ResourcesCompat.getFont(
+                        this,
+                        it
+                    )
                 }
                 ?: Typeface.SANS_SERIF
             )
@@ -313,29 +253,25 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
             }
         }
 
+        private var cachedSubtitleStyle: SaveCaptionStyle? = null
+
         fun Context.saveStyle(style: SaveCaptionStyle) {
-            if (subtitleStyleState.value !== style) {
-                subtitleStyleState.value = style
-            }
+            cachedSubtitleStyle = style
             this.setKey(SUBTITLE_KEY, style)
         }
 
-        val defaultSubtitleStyle = SaveCaptionStyle(
-            foregroundColor = getDefColor(0),
-            backgroundColor = getDefColor(2),
-            windowColor = getDefColor(3),
-            edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE,
-            edgeColor = getDefColor(1),
-            font = null,
-            typefaceFilePath = null,
-            elevation = DEF_SUBS_ELEVATION,
-            fixedTextSize = null,
-        )
-        val subtitleStyleState =
-            mutableStateOf((getKey<SaveCaptionStyle>(SUBTITLE_KEY) ?: defaultSubtitleStyle))
-
         fun getCurrentSavedStyle(): SaveCaptionStyle {
-            return subtitleStyleState.value
+            return cachedSubtitleStyle ?: (getKey(SUBTITLE_KEY) ?: SaveCaptionStyle(
+                foregroundColor = getDefColor(0),
+                backgroundColor = getDefColor(2),
+                windowColor = getDefColor(3),
+                edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE,
+                edgeColor = getDefColor(1),
+                typeface = null,
+                typefaceFilePath = null,
+                elevation = DEF_SUBS_ELEVATION,
+                fixedTextSize = null,
+            )).also { cachedSubtitleStyle = it }
         }
 
         private fun Context.getSavedFonts(): List<File> {
@@ -357,11 +293,11 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getDownloadSubsLanguageTagIETF(): List<String> {
-            return getKey<List<String>>(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
+            return getKey(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
         }
 
         fun getAutoSelectLanguageTagIETF(): String {
-            return getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+            return getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         }
     }
 
@@ -379,10 +315,10 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
     private fun Context.setColor(id: Int, color: Int?) {
         val realColor = color ?: getDefColor(id)
         when (id) {
-            0 -> state = state.copy(foregroundColor = realColor)
-            1 -> state = state.copy(edgeColor = realColor)
-            2 -> state = state.copy(backgroundColor = realColor)
-            3 -> state = state.copy(windowColor = realColor)
+            0 -> state.foregroundColor = realColor
+            1 -> state.edgeColor = realColor
+            2 -> state.backgroundColor = realColor
+            3 -> state.windowColor = realColor
 
             else -> Unit
         }
@@ -508,7 +444,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state = state.copy(elevation = elevationTypes.map { it.first }[index])
+                    state.elevation = elevationTypes.map { it.first }[index]
                     textView.context.updateState()
                     if (hide)
                         activity?.hideSystemUI()
@@ -516,7 +452,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
             }
 
             subsSubtitleElevation.setOnLongClickListener {
-                state = state.copy(elevation = DEF_SUBS_ELEVATION)
+                state.elevation = DEF_SUBS_ELEVATION
                 it.context.updateState()
                 showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
@@ -539,14 +475,13 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state =
-                        state.copy(backgroundRadius = radiusTypes.map { it.first }[index]?.toFloat())
+                    state.backgroundRadius = radiusTypes.map { it.first }[index]?.toFloat()
                     textView.context.updateState()
                 }
             }
 
             subsBackgroundRadius.setOnLongClickListener {
-                state = state.copy(backgroundRadius = null)
+                state.backgroundRadius = null
                 it.context.updateState()
                 showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
@@ -574,7 +509,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state = state.copy(alignment = alignmentTypes.map { it.first }[index])
+                    state.alignment = alignmentTypes.map { it.first }[index]
                     textView.context.updateState()
                 }
             }
@@ -602,13 +537,13 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state = state.copy(edgeType = edgeTypes.map { it.first }[index])
+                    state.edgeType = edgeTypes.map { it.first }[index]
                     textView.context.updateState()
                 }
             }
 
             subsEdgeType.setOnLongClickListener {
-                state = state.copy(edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE)
+                state.edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE
                 it.context.updateState()
                 showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
@@ -628,7 +563,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state = state.copy(fixedTextSize = fontSizes.map { it.first }[index])
+                    state.fixedTextSize = fontSizes.map { it.first }[index]
                     textView.context.updateState()
                 }
             }
@@ -647,47 +582,47 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state = state.copy(edgeSize = fontSizes.map { it.first }[index])
+                    state.edgeSize = fontSizes.map { it.first }[index]
                     textView.context.updateState()
                 }
             }
 
             subtitlesRemoveBloat.isChecked = state.removeBloat
             subtitlesRemoveBloat.setOnCheckedChangeListener { _, b ->
-                state = state.copy(removeBloat = b)
+                state.removeBloat = b
             }
             subtitlesUppercase.isChecked = state.upperCase
             subtitlesUppercase.setOnCheckedChangeListener { _, b ->
-                state = state.copy(upperCase = b)
+                state.upperCase = b
                 context?.updateState()
             }
 
             subtitlesRemoveCaptions.isChecked = state.removeCaptions
             subtitlesRemoveCaptions.setOnCheckedChangeListener { _, b ->
-                state = state.copy(removeCaptions = b)
+                state.removeCaptions = b
             }
 
             subtitlesBold.isChecked = state.bold
             subtitlesBold.setOnCheckedChangeListener { _, b ->
-                state = state.copy(bold = b)
+                state.bold = b
                 context?.updateState()
             }
 
             subtitlesItalic.isChecked = state.italic
             subtitlesItalic.setOnCheckedChangeListener { _, b ->
-                state = state.copy(italic = b)
+                state.italic = b
                 context?.updateState()
             }
 
             subsFontSize.setOnLongClickListener { _ ->
-                state = state.copy(fixedTextSize = null)
+                state.fixedTextSize = null
                 context?.updateState()
                 showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
             }
 
             subsEdgeSize.setOnLongClickListener { _ ->
-                state = state.copy(edgeSize = null)
+                state.edgeSize = null
                 context?.updateState()
                 showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
@@ -733,7 +668,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     savedFontTypes.indexOfFirst { it.absolutePath == state.typefaceFilePath }
                         .let { index ->
                             if (index == -1)
-                                fontTypes.indexOfFirst { it.first == state.font?.resource }
+                                fontTypes.indexOfFirst { it.first == state.typeface }
                             else index + fontTypes.size
                         }
 
@@ -745,23 +680,20 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                     false,
                     dismissCallback
                 ) { index ->
-                    state = if (index < fontTypes.size) {
-                        state.copy(
-                            font = SubtitleFont.entries.firstOrNull { it.resource == fontTypes[index].first },
-                            typefaceFilePath = null
-                        )
+                    if (index < fontTypes.size) {
+                        state.typeface = fontTypes[index].first
+                        state.typefaceFilePath = null
                     } else {
-                        state.copy(
-                            typefaceFilePath = savedFontTypes[index - fontTypes.size].absolutePath,
-                            font = null
-                        )
+                        state.typefaceFilePath = savedFontTypes[index - fontTypes.size].absolutePath
+                        state.typeface = null
                     }
                     textView.context.updateState()
                 }
             }
 
             subsFont.setOnLongClickListener { textView ->
-                state = state.copy(font = null, typefaceFilePath = null)
+                state.typeface = null
+                state.typefaceFilePath = null
                 textView.context.updateState()
                 showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment2.kt
deleted file mode 100644
index b9fd40556..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment2.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.lagradost.cloudstream3.ui.subtitles
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.lagradost.cloudstream3.utils.BaseDialogComposeFragment
-import com.lagradost.cloudstream4.compose.Screen
-
-class SubtitlesFragment2 : BaseComposeFragment(), Screen by SubtitlesScreen
-class SubtitlesFragmentDialog2 : BaseDialogComposeFragment(), Screen by SubtitlesScreen
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesScreen.kt
deleted file mode 100644
index cba651c76..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesScreen.kt
+++ /dev/null
@@ -1,453 +0,0 @@
-package com.lagradost.cloudstream3.ui.subtitles
-
-import android.text.SpannableString
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.OptIn
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.media3.common.text.Cue
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.ui.CaptionStyleCompat
-import androidx.media3.ui.SubtitleView
-import coil3.compose.AsyncImage
-import com.lagradost.cloudstream3.CloudStreamApp
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.ui.player.CustomDecoder
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.applyStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.applyStyleEvent
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.defaultSubtitleStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.saveStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.subtitleStyleState
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJsonLiteral
-import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
-import com.lagradost.cloudstream4.compose.ActionDialog
-import com.mihon.common.preference.AndroidPreferenceStore
-import com.mihon.common.preference.DataPreferenceStore
-import com.mihon.common.preference.StatePreferenceStore
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentMapOf
-import java.io.File
-
-object SubtitlesScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.subtitles_settings)
-
-    // For ux purposes we also want to show a diff of what will be reset
-    private val diff = arrayOf<Pair<Int, (SaveCaptionStyle) -> Any?>>(
-        R.string.subs_font to { style -> style.font },
-        R.string.subs_text_color to { state -> state.foregroundColor },
-        R.string.subs_font_size to { state -> state.fixedTextSize },
-        R.string.uppercase_all_subtitles to { state -> state.upperCase },
-        R.string.all_subtitles_bold to { state -> state.bold },
-        R.string.all_subtitles_italic to { state -> state.italic },
-        R.string.subs_edge_type to { state -> state.edgeType },
-        R.string.subs_outline_color to { state -> state.edgeColor },
-        R.string.subs_edge_size to { state -> state.edgeSize },
-        R.string.subs_window_color to { state -> state.windowColor },
-        R.string.subs_background_color to { state -> state.backgroundColor },
-        R.string.background_radius to { state -> state.backgroundRadius },
-        R.string.subs_subtitle_alignment to { state -> state.alignment },
-        R.string.subs_subtitle_elevation to { state -> state.elevation },
-        R.string.subtitles_remove_captions to { state -> state.removeCaptions },
-        R.string.subtitles_remove_bloat to { state -> state.removeBloat },
-    )
-
-    @Composable
-    fun <T> SetUpUndoBar(
-        diff: Array<Pair<Int, (T) -> Any?>>,
-        initialState: T,
-        currentState: MutableState<T>,
-        default: T
-    ) {
-        var currentState by currentState
-        var dialogShown by remember { mutableStateOf(false) }
-        if (dialogShown) {
-            ActionDialog(
-                title = stringResource(R.string.subs_default_reset_toast),
-                // This can not be converted to joinToString due to stringResource being composable
-                text =
-                    @Suppress("SimplifiableCallChain")
-                    diff.filter { (_, f) -> f(default) != f(currentState) }
-                        .map { (name, _) -> stringResource(name) }.joinToString(separator = "\n"),
-                confirmText = stringResource(R.string.reset_btn),
-                dismissText = stringResource(R.string.dismiss),
-                confirm = {
-                    currentState = default
-                    dialogShown = false
-                },
-                dismiss = {
-                    dialogShown = false
-                })
-        }
-
-        // Undo, current -> initial last saved value
-        AnimatedVisibility(currentState != initialState) {
-            IconButton(onClick = {
-                currentState = initialState
-            }) {
-                Icon(
-                    painter = painterResource(R.drawable.undo_24px),
-                    contentDescription = stringResource(R.string.reset_btn),
-                    tint = MaterialTheme.colorScheme.onBackground
-                )
-            }
-        }
-
-        // Reset, current -> default
-        AnimatedVisibility(currentState != default) {
-            IconButton(onClick = {
-                dialogShown = true
-            }) {
-                Icon(
-                    painter = painterResource(R.drawable.reset_colors_24px),
-                    contentDescription = stringResource(R.string.subs_default_reset_toast),
-                    tint = MaterialTheme.colorScheme.onBackground
-                )
-            }
-        }
-    }
-
-    @Composable
-    override fun RowScope.AppBarAction() {
-        val initialState = remember { subtitleStyleState.value }
-        var state by subtitleStyleState
-        val context = LocalContext.current
-
-        SideEffect(state) {
-            // When we modify the state, we modify the stored data
-            context.saveStyle(state)
-        }
-
-        DisposableEffect(Unit) {
-            onDispose {
-                if (initialState != state) {
-                    applyStyleEvent.invoke(state)
-                }
-            }
-        }
-
-        SetUpUndoBar(
-            diff = diff,
-            initialState = initialState,
-            currentState = subtitleStyleState,
-            default = defaultSubtitleStyle
-        )
-    }
-
-    private val sortedLanguages by lazy {
-        languages.map { it.IETF_tag to it.nameNextToFlagEmoji() }.sortedBy {
-            it.second.substringAfter("\u00a0").lowercase()
-        }.toMap()
-    }
-
-    @OptIn(UnstableApi::class)
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val store = StatePreferenceStore(subtitleStyleState)
-        val dataStore = DataPreferenceStore(LocalContext.current)
-        val androidStore = AndroidPreferenceStore(LocalContext.current)
-
-        val subtitlesFilterSubLang = androidStore.getBoolean("filter_sub_lang_key", false)
-        val autoSelectSubtitles = dataStore.getString(SUBTITLE_AUTO_SELECT_KEY, "en")
-        val downloadSubsLanguage =
-            dataStore.getObjectFromString(SUBTITLE_DOWNLOAD_KEY, setOf("en"), serializer = { obj ->
-                obj.toList().toJsonLiteral()
-            }, deserializer = { json ->
-                parseJson<List<String>>(json).toSet()
-            })
-
-        val subtitleFileSelector =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
-                // It lies, it can be null if file manager quits.
-                if (uri == null) return@rememberLauncherForActivityResult
-                val context = CloudStreamApp.context ?: return@rememberLauncherForActivityResult
-
-                try {
-                    val localFile = File(context.filesDir, "customfont.ttf")
-                    localFile.delete()
-                    localFile.createNewFile()
-                    context.contentResolver?.openInputStream(uri)?.use { stream ->
-                        stream.copyTo(localFile.outputStream())
-                    }
-                    store.state.value = store.state.value.copy(
-                        font = SubtitleFont.Custom,
-                        typefaceFilePath = localFile.absolutePath
-                    )
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-            }
-
-        return persistentListOf(
-            Preference.PreferenceItem.CustomPreference(
-                title = stringResource(R.string.skip_type_preview), content = {
-                    val state by store.state
-                    val text = stringResource(R.string.subtitles_example_text)
-                    val fixedText =
-                        SpannableString.valueOf(if (state.upperCase) text.uppercase() else text)
-
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(75.dp)
-                    ) {
-                        AsyncImage(
-                            contentDescription = stringResource(R.string.preview_background_img_des),
-                            model = R.drawable.subtitles_preview_background,
-                            contentScale = ContentScale.Crop,
-                            modifier = Modifier.fillMaxSize()
-                        )
-                        AndroidView(modifier = Modifier.fillMaxSize(), factory = { context ->
-                            SubtitleView(context).apply {
-                                setSubtitleViewStyle(this, state, false)
-                                this.setCues(
-                                    listOf(
-                                        Cue.Builder().setText(fixedText).applyStyle(state).build()
-                                    )
-                                )
-                            }
-                        }, update = { view ->
-                            setSubtitleViewStyle(view, state, false)
-                            view.setCues(
-                                listOf(
-                                    Cue.Builder().setText(fixedText).applyStyle(state).build()
-                                )
-                            )
-                        })
-                    }
-                }),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.subs_font),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = store.field(SaveCaptionStyle::font) { newValue -> copy(font = newValue, typefaceFilePath = null) },
-                        icon = painterResource(R.drawable.font_download_24px),
-                        title = stringResource(R.string.subs_font),
-                        entries = mapOf(null to stringResource(R.string.normal)) + SubtitleFont.entries.associateWith { it.label },
-                        onValueChanged = { value ->
-                            if (value?.resource == 0) {
-                                subtitleFileSelector.launch(
-                                    arrayOf(
-                                        "font/*",
-                                    )
-                                )
-                                false
-                            } else {
-                                true
-                            }
-                        }
-                    ),
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveCaptionStyle::foregroundColor) { newValue ->
-                            copy(foregroundColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_text_color),
-                        icon = painterResource(R.drawable.format_color_text_24px),
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = store.field(
-                            get = { fixedTextSize?.toInt() ?: 25 },
-                            set = { newValue -> copy(fixedTextSize = newValue.toFloat()) }
-                        ),
-                        icon = painterResource(R.drawable.text_fields_24px),
-                        title = stringResource(R.string.subs_font_size),
-                        valueRange = 5..60
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = store.field(SaveCaptionStyle::upperCase) { newValue ->
-                            copy(upperCase = newValue)
-                        },
-                        icon = painterResource(R.drawable.uppercase_24px),
-                        title = stringResource(R.string.uppercase_all_subtitles),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = store.field(SaveCaptionStyle::bold) { newValue -> copy(bold = newValue) },
-                        icon = painterResource(R.drawable.format_bold_24px),
-                        title = stringResource(R.string.all_subtitles_bold),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = store.field(SaveCaptionStyle::italic) { newValue -> copy(italic = newValue) },
-                        icon = painterResource(R.drawable.format_italic_24px),
-                        title = stringResource(R.string.all_subtitles_italic),
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.subs_edge),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        icon = painterResource(R.drawable.shadow_24px),
-                        title = stringResource(R.string.subs_edge_type),
-                        preference = store.field(SaveCaptionStyle::edgeType) { newValue ->
-                            copy(edgeType = newValue)
-                        },
-                        entries = persistentMapOf(
-                            CaptionStyleCompat.EDGE_TYPE_NONE to stringResource(R.string.subtitles_none),
-                            CaptionStyleCompat.EDGE_TYPE_OUTLINE to stringResource(R.string.subtitles_outline),
-                            CaptionStyleCompat.EDGE_TYPE_DEPRESSED to stringResource(R.string.subtitles_depressed),
-                            CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW to stringResource(R.string.subtitles_shadow),
-                            CaptionStyleCompat.EDGE_TYPE_RAISED to stringResource(R.string.subtitles_raised),
-                        )
-                    ),
-                    Preference.PreferenceItem.ColorPreference(
-                        //enabled = state.edgeType != CaptionStyleCompat.EDGE_TYPE_NONE,
-                        preference = store.field(SaveCaptionStyle::edgeColor) { newValue ->
-                            copy(edgeColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_outline_color),
-                        icon = painterResource(R.drawable.border_color_24px),
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = store.field(
-                            get = { edgeSize?.toInt() ?: 0 },
-                            set = { newValue -> copy(edgeSize = newValue.toFloat()) }
-                        ),
-                        //enabled = state.edgeType == CaptionStyleCompat.EDGE_TYPE_OUTLINE,
-                        icon = painterResource(R.drawable.shadow_add_24px),
-                        title = stringResource(R.string.subs_edge_size),
-                        valueRange = 0..60,
-                    )
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.background),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveCaptionStyle::windowColor) { newValue ->
-                            copy(windowColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_window_color),
-                        icon = painterResource(R.drawable.imagesearch_roller_24px),
-                    ),
-                    Preference.PreferenceItem.ColorPreference(
-                        preference = store.field(SaveCaptionStyle::backgroundColor) { newValue ->
-                            copy(backgroundColor = newValue)
-                        },
-                        title = stringResource(R.string.subs_background_color),
-                        icon = painterResource(R.drawable.format_color_fill_24px),
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = store.field(
-                            get = { backgroundRadius?.toInt() ?: 0 },
-                            set = { newValue -> copy(backgroundRadius = newValue.toFloat()) }
-                        ),
-                        icon = painterResource(R.drawable.rounded_corner_24px),
-                        title = stringResource(R.string.background_radius),
-                        valueRange = 0..50,
-                        steps = 9,
-                    )
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_player_layout),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = store.field(SaveCaptionStyle::alignment) { newValue ->
-                            copy(alignment = newValue)
-                        },
-
-                        icon = painterResource(R.drawable.format_align_center_24px),
-                        title = stringResource(R.string.subs_subtitle_alignment),
-                        entries = persistentMapOf(
-                            null to stringResource(R.string.automatic),
-                            CustomDecoder.SSA_ALIGNMENT_BOTTOM_LEFT to stringResource(R.string.bottom_left),
-                            CustomDecoder.SSA_ALIGNMENT_BOTTOM_CENTER to stringResource(R.string.bottom_center),
-                            CustomDecoder.SSA_ALIGNMENT_BOTTOM_RIGHT to stringResource(R.string.bottom_right),
-                            CustomDecoder.SSA_ALIGNMENT_MIDDLE_LEFT to stringResource(R.string.middle_left),
-                            CustomDecoder.SSA_ALIGNMENT_MIDDLE_CENTER to stringResource(R.string.middle_center),
-                            CustomDecoder.SSA_ALIGNMENT_MIDDLE_RIGHT to stringResource(R.string.middle_right),
-                            CustomDecoder.SSA_ALIGNMENT_TOP_LEFT to stringResource(R.string.top_left),
-                            CustomDecoder.SSA_ALIGNMENT_TOP_CENTER to stringResource(R.string.top_center),
-                            CustomDecoder.SSA_ALIGNMENT_TOP_RIGHT to stringResource(R.string.top_right),
-                        )
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        preference = store.field(SaveCaptionStyle::elevation) { newValue ->
-                            copy(elevation = newValue)
-                        },
-                        title = stringResource(R.string.subs_subtitle_elevation),
-                        icon = painterResource(R.drawable.text_select_move_up_24px),
-                        valueRange = 0..400,
-                        steps = 39
-                    ),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.extension_language),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        icon = painterResource(R.drawable.language_korean_latin_24px),
-                        title = stringResource(R.string.subs_auto_select_language),
-                        preference = autoSelectSubtitles,
-                        entries = mapOf(
-                            "None" to stringResource(R.string.none)
-                        ) + sortedLanguages,
-                    ),
-                    Preference.PreferenceItem.MultiSelectListPreference(
-                        icon = painterResource(R.drawable.language_download2),
-                        title = stringResource(R.string.subs_download_languages),
-                        preference = downloadSubsLanguage,
-                        entries = mapOf(
-                            "None" to stringResource(R.string.none)
-                        ) + sortedLanguages,
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = subtitlesFilterSubLang,
-                        icon = painterResource(R.drawable.filter_alt_24px),
-                        title = stringResource(R.string.subtitles_filter_lang),
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_ui_features),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = store.field(SaveCaptionStyle::removeCaptions) { newValue ->
-                            copy(removeCaptions = newValue)
-                        },
-                        icon = painterResource(R.drawable.closed_caption_24px),
-                        title = stringResource(R.string.subtitles_remove_captions),
-                        subtitle = "[Knocking on door] Hello → Hello",
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = store.field(SaveCaptionStyle::removeBloat) { newValue ->
-                            copy(removeBloat = newValue)
-                        },
-                        icon = painterResource(R.drawable.text_ad_off_24px),
-                        title = stringResource(R.string.subtitles_remove_bloat),
-                    ),
-                )
-            ),
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
index e0661721a..c0be85a3f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
@@ -86,14 +86,16 @@ import com.lagradost.cloudstream3.utils.FillerEpisodeCheck.toClassDir
 import com.lagradost.cloudstream3.utils.JsUnpacker.Companion.load
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream4.AppSettings
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
 import java.io.File
+import java.net.URL
+import java.net.URLDecoder
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
+
 object AppContextUtils {
     fun RecyclerView.isRecyclerScrollable(): Boolean {
         val layoutManager =
@@ -482,14 +484,14 @@ object AppContextUtils {
     fun Context.filterSearchResultByFilmQuality(data: List<SearchResponse>): List<SearchResponse> {
         // Filter results omitting entries with certain quality
         if (data.isNotEmpty()) {
-            val filteredSearchQuality = AppSettings(this).ui.filterQuality.get() /*PreferenceManager.getDefaultSharedPreferences(this)
+            val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
                 ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
                 ?.mapNotNull { entry ->
                     entry.toIntOrNull() ?: return@mapNotNull null
-                } ?: listOf()*/
+                } ?: listOf()
             if (filteredSearchQuality.isNotEmpty()) {
                 return data.filter { item ->
-                    val searchQualVal = item.quality //?.ordinal ?: -1
+                    val searchQualVal = item.quality?.ordinal ?: -1
                     //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
                     !filteredSearchQuality.contains(searchQualVal)
                 }
@@ -501,17 +503,17 @@ object AppContextUtils {
     fun Context.filterHomePageListByFilmQuality(data: HomePageList): HomePageList {
         // Filter results omitting entries with certain quality
         if (data.list.isNotEmpty()) {
-            val filteredSearchQuality = AppSettings(this).ui.filterQuality.get() /*PreferenceManager.getDefaultSharedPreferences(this)
+            val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
                 ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
                 ?.mapNotNull { entry ->
                     entry.toIntOrNull() ?: return@mapNotNull null
-                } ?: listOf()*/
+                } ?: listOf()
             if (filteredSearchQuality.isNotEmpty()) {
                 return HomePageList(
                     name = data.name,
                     isHorizontalImages = data.isHorizontalImages,
                     list = data.list.filter { item ->
-                        val searchQualVal = item.quality //?.ordinal ?: -1
+                        val searchQualVal = item.quality?.ordinal ?: -1
                         //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
                         !filteredSearchQuality.contains(searchQualVal)
                     }
@@ -633,17 +635,16 @@ object AppContextUtils {
         }
     }
 
-    // Deprecate after next stable
-    /* @Deprecated(
-        message = "Use splitUrlParameters instead.",
-        replaceWith = ReplaceWith(
-            expression = "splitUrlParameters(url.toString())",
-            imports = ["com.lagradost.cloudstream3.splitUrlParameters"],
-        ),
-        level = DeprecationLevel.WARNING,
-    ) */
-    fun splitQuery(url: java.net.URL): Map<String, String> {
-        return com.lagradost.cloudstream3.splitUrlParameters(url.toString())
+    fun splitQuery(url: URL): Map<String, String> {
+        val queryPairs: MutableMap<String, String> = LinkedHashMap()
+        val query: String = url.query
+        val pairs = query.split("&").toTypedArray()
+        for (pair in pairs) {
+            val idx = pair.indexOf("=")
+            queryPairs[URLDecoder.decode(pair.substring(0, idx), "UTF-8")] =
+                URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
+        }
+        return queryPairs
     }
 
     /**| S1:E2 Hello World
@@ -901,4 +902,4 @@ object AppContextUtils {
         } else null
         return currentAudioFocusRequest
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index d0c79c43c..0a561b471 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.utils
 
-import android.app.Activity
 import android.content.Context
 import android.net.Uri
 import android.widget.Toast
@@ -283,7 +282,7 @@ object BackupUtils {
         }
     }
 
-    fun Activity.restorePrompt() {
+    fun FragmentActivity.restorePrompt() {
         runOnUiThread {
             try {
                 restoreFileSelector?.launch(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BaseComposeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BaseComposeFragment.kt
deleted file mode 100644
index b11b03754..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BaseComposeFragment.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import android.content.res.Configuration
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-import com.lagradost.cloudstream4.compose.Screen
-import com.lagradost.cloudstream4.compose.createComposeView
-
-abstract class BaseComposeFragment : Fragment(), Screen {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = createComposeView(inflater, container, savedInstanceState)
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        this.view?.let { view ->
-            fixSystemBarsPadding(
-                view,
-                padLeft = isLayout(TV or EMULATOR),
-                padBottom = isLandscape()
-            )
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixSystemBarsPadding(
-            view,
-            padLeft = isLayout(TV or EMULATOR),
-            padBottom = isLandscape()
-        )
-    }
-}
-
-abstract class BaseDialogComposeFragment : DialogFragment(), Screen {
-    var systemBarsAddPadding = isLayout(TV or EMULATOR)
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = createComposeView(inflater, container, savedInstanceState)
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        dialog?.window?.decorView?.let { view ->
-            fixSystemBarsPadding(
-                view,
-                padLeft = systemBarsAddPadding,
-                padBottom = systemBarsAddPadding || isLandscape()
-            )
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        dialog?.window?.setWindowAnimations(R.style.DialogFullscreenPlayer)
-    }
-
-    override fun getTheme(): Int {
-        return R.style.DialogFullscreenPlayer
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        dialog?.window?.decorView?.let { view ->
-            fixSystemBarsPadding(
-                view,
-                padLeft = systemBarsAddPadding,
-                padBottom = systemBarsAddPadding || isLandscape()
-            )
-        }
-    }
-}
\ No newline at end of file
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 68f262d8d..02ee69791 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -181,11 +181,11 @@ object DataStore {
     }
 
     fun <T : Any> Context.getKey(path: String, valueType: Class<T>): T? {
-        return try {
+        try {
             val json: String = getSharedPrefs().getString(path, null) ?: return null
-            parseJson(json, valueType.kotlin)
-        } catch (_: Exception) {
-            null
+            return parseJson(json, valueType.kotlin)
+        } catch (e: Exception) {
+            return null
         }
     }
 
@@ -193,37 +193,21 @@ object DataStore {
         setKey(getFolderName(folder, path), value)
     }
 
-    @Deprecated(
-        message = "Use parseJson<T>(this) directly instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith(
-            expression = "parseJson<T>(this)",
-            imports = ["com.lagradost.cloudstream3.utils.AppUtils.parseJson"],
-        ),
-    )
     inline fun <reified T : Any> String.toKotlinObject(): T {
         return parseJson(this)
     }
 
-    @Deprecated(
-        message = "Use parseJson<T>(this) directly instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith(
-            expression = "parseJson<T>(this)",
-            imports = ["com.lagradost.cloudstream3.utils.AppUtils.parseJson"],
-        ),
-    )
     fun <T : Any> String.toKotlinObject(valueType: Class<T>): T {
         return parseJson(this, valueType.kotlin)
     }
 
     // GET KEY GIVEN PATH AND DEFAULT VALUE, NULL IF ERROR
     inline fun <reified T : Any> Context.getKey(path: String, defVal: T?): T? {
-        return try {
+        try {
             val json: String = getSharedPrefs().getString(path, null) ?: return defVal
-            parseJson<T>(json)
-        } catch (_: Exception) {
-            null
+            return json.toKotlinObject()
+        } catch (e: Exception) {
+            return null
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index eabac20d3..19caead21 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
 import android.content.Context
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
@@ -32,14 +31,6 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import java.util.Calendar
 import java.util.Date
 import java.util.GregorianCalendar
@@ -52,18 +43,17 @@ const val RESULT_WATCH_STATE = "result_watch_state"
 const val RESULT_WATCH_STATE_DATA = "result_watch_state_data"
 const val RESULT_SUBSCRIBED_STATE_DATA = "result_subscribed_state_data"
 const val RESULT_FAVORITES_STATE_DATA = "result_favorites_state_data"
-const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // Changed due to id changes
+const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes
 const val RESULT_RESUME_WATCHING_OLD = "result_resume_watching"
 const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated"
 const val RESULT_EPISODE = "result_episode"
 const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
 const val KEY_RESULT_SORT = "result_sort"
-const val USER_PINNED_PROVIDERS = "user_pinned_providers" // Key for pinned user set
+const val USER_PINNED_PROVIDERS = "user_pinned_providers" //key for pinned user set
 
 class UserPreferenceDelegate<T : Any>(
-    private val key: String,
-    private val default: T,
+    private val key: String, private val default: T //, private val klass: KClass<T>
 ) {
     private val klass: KClass<out T> = default::class
     private val realKey get() = "${DataStoreHelper.currentAccount}/$key"
@@ -73,7 +63,7 @@ class UserPreferenceDelegate<T : Any>(
     operator fun setValue(
         self: Any?,
         property: KProperty<*>,
-        t: T?,
+        t: T?
     ) {
         if (t == null) {
             removeKey(realKey)
@@ -92,7 +82,7 @@ object DataStoreHelper {
         R.drawable.profile_bg_pink,
         R.drawable.profile_bg_purple,
         R.drawable.profile_bg_red,
-        R.drawable.profile_bg_teal,
+        R.drawable.profile_bg_teal
     )
 
     private var searchPreferenceProvidersStrings: List<String> by UserPreferenceDelegate(
@@ -122,17 +112,16 @@ object DataStoreHelper {
     private var searchPreferenceTagsStrings: List<String> by UserPreferenceDelegate(
         "search_pref_tags",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-
     var searchPreferenceTags: List<TvType>
         get() = deserializeTv(searchPreferenceTagsStrings)
         set(value) {
             searchPreferenceTagsStrings = serializeTv(value)
         }
 
+
     private var homePreferenceStrings: List<String> by UserPreferenceDelegate(
         "home_pref_homepage",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-
     var homePreference: List<TvType>
         get() = deserializeTv(homePreferenceStrings)
         set(value) {
@@ -143,38 +132,38 @@ object DataStoreHelper {
         "home_bookmarked_last_list",
         IntArray(0)
     )
-
     var playBackSpeed: Float by UserPreferenceDelegate("playback_speed", 1.0f)
     var resizeMode: Int by UserPreferenceDelegate("resize_mode", 0)
     var librarySortingMode: Int by UserPreferenceDelegate(
         "library_sorting_mode",
         ListSorting.AlphabeticalA.ordinal
     )
-
     private var _resultsSortingMode: Int by UserPreferenceDelegate(
         "results_sorting_mode",
         EpisodeSortType.NUMBER_ASC.ordinal
     )
-
     var resultsSortingMode: EpisodeSortType
         get() = EpisodeSortType.entries.getOrNull(_resultsSortingMode) ?: EpisodeSortType.NUMBER_ASC
         set(value) {
             _resultsSortingMode = value.ordinal
         }
 
-    @Serializable
     data class Account(
-        @JsonProperty("keyIndex") @SerialName("keyIndex") val keyIndex: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("customImage") @SerialName("customImage") val customImage: String? = null,
-        @JsonProperty("defaultImageIndex") @SerialName("defaultImageIndex") val defaultImageIndex: Int,
-        @JsonProperty("lockPin") @SerialName("lockPin") val lockPin: String? = null,
+        @JsonProperty("keyIndex")
+        val keyIndex: Int,
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("customImage")
+        val customImage: String? = null,
+        @JsonProperty("defaultImageIndex")
+        val defaultImageIndex: Int,
+        @JsonProperty("lockPin")
+        val lockPin: String? = null,
     ) {
-        @get:JsonIgnore
-        val image get() = customImage?.let { UiImage.Image(it) } ?:
-            profileImages.getOrNull(defaultImageIndex)?.let {
-                UiImage.Drawable(it)
-            } ?: UiImage.Drawable(profileImages.first())
+        val image
+            get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(
+                defaultImageIndex
+            )?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(profileImages.first())
     }
 
     const val TAG = "data_store_helper"
@@ -182,16 +171,12 @@ object DataStoreHelper {
     var selectedKeyIndex by PreferenceDelegate("$TAG/account_key_index", 0)
     val currentAccount: String get() = selectedKeyIndex.toString()
 
-    private val _selectedAccountNumberFlow = MutableStateFlow(0)
-    /** What account instance we are on, this number changes whenever anything about local accounts changes */
-    val selectedAccountNumberFlow : StateFlow<Int> = _selectedAccountNumberFlow
-
     /**
      * Get or set the current account homepage.
      * Setting this does not automatically reload the homepage.
      */
     var currentHomePage: String?
-        get() = getKey<String>("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
+        get() = getKey("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
         set(value) {
             val key = "$currentAccount/$USER_SELECTED_HOMEPAGE_API"
             if (value == null) {
@@ -203,6 +188,7 @@ object DataStoreHelper {
 
     fun setAccount(account: Account) {
         val homepage = currentHomePage
+
         selectedKeyIndex = account.keyIndex
         AccountManager.updateAccountIds()
         showToast(context?.getString(R.string.logged_account, account.name) ?: account.name)
@@ -213,7 +199,6 @@ object DataStoreHelper {
             // This is not a new account, and the homepage has changed, reload it
             MainActivity.reloadHomeEvent(true)
         }
-        _selectedAccountNumberFlow.value += 1
     }
 
     fun getDefaultAccount(context: Context): Account {
@@ -221,7 +206,7 @@ object DataStoreHelper {
             currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account(
                 keyIndex = 0,
                 name = context.getString(R.string.default_account),
-                defaultImageIndex = 0,
+                defaultImageIndex = 0
             )
         }
     }
@@ -247,21 +232,18 @@ object DataStoreHelper {
         }
     }
 
-    @Serializable
     data class PosDur(
-        @JsonProperty("position") @SerialName("position") val position: Long,
-        @JsonProperty("duration") @SerialName("duration") val duration: Long,
+        @JsonProperty("position") val position: Long,
+        @JsonProperty("duration") val duration: Long
     )
 
     fun PosDur.fixVisual(): PosDur {
         if (duration <= 0) return PosDur(0, duration)
         val percentage = position * 100 / duration
-        return when {
-            percentage <= 1 -> PosDur(0, duration)
-            percentage <= 5 -> PosDur(5 * duration / 100, duration)
-            percentage >= 95 -> PosDur(duration, duration)
-            else -> this
-        }
+        if (percentage <= 1) return PosDur(0, duration)
+        if (percentage <= 5) return PosDur(5 * duration / 100, duration)
+        if (percentage >= 95) return PosDur(duration, duration)
+        return this
     }
 
     fun Int.toYear(): Date =
@@ -269,38 +251,28 @@ object DataStoreHelper {
 
     /**
      * Used to display notifications on new episodes and posters in library.
-     */
-    @Serializable
+     **/
     abstract class LibrarySearchResponse(
-       /**
-        * These fields are marked @Transient because this class is only ever serialized through
-        * through its subclasses, which redeclare each property with their own @SerialName
-        * annotations. Without @Transient here, kotlinx.serialization would try to
-        * generate a serializer for the abstract base class itself (or double-serialize
-        * these fields), which fails/conflicts since these are meant to be overridden,
-        * not serialized directly from the parent.
-        */
-        @Transient override var id: Int? = null,
-        @Transient open val latestUpdatedTime: Long = 0L,
-        @Transient override val name: String = "",
-        @Transient override val url: String = "",
-        @Transient override val apiName: String = "",
-        @Transient override var type: TvType? = null,
-        @Transient override var posterUrl: String? = null,
-        @Transient open val year: Int? = null,
-        @Transient open val syncData: Map<String, String>? = null,
-        @Transient override var quality: SearchQuality? = null,
-        @Transient override var posterHeaders: Map<String, String>? = null,
-        @Transient open val plot: String? = null,
-        @Transient override var score: Score? = null,
-        @Transient open val tags: List<String>? = null,
+        @JsonProperty("id") override var id: Int?,
+        @JsonProperty("latestUpdatedTime") open val latestUpdatedTime: Long,
+        @JsonProperty("name") override val name: String,
+        @JsonProperty("url") override val url: String,
+        @JsonProperty("apiName") override val apiName: String,
+        @JsonProperty("type") override var type: TvType?,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
+        @JsonProperty("year") open val year: Int?,
+        @JsonProperty("syncData") open val syncData: Map<String, String>?,
+        @JsonProperty("quality") override var quality: SearchQuality?,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
+        @JsonProperty("plot") open val plot: String? = null,
+        @JsonProperty("score") override var score: Score? = null,
+        @JsonProperty("tags") open val tags: List<String>? = null,
     ) : SearchResponse {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
-        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR,
+            level = DeprecationLevel.ERROR
         )
         var rating: Int? = null
             set(value) {
@@ -311,26 +283,23 @@ object DataStoreHelper {
             }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = SubscribedData.Serializer::class)
     data class SubscribedData(
-        @JsonProperty("subscribedTime") @SerialName("subscribedTime") val subscribedTime: Long,
-        @JsonProperty("lastSeenEpisodeCount") @SerialName("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        @JsonProperty("subscribedTime") val subscribedTime: Long,
+        @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
+        override var id: Int?,
+        override val latestUpdatedTime: Long,
+        override val name: String,
+        override val url: String,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override val year: Int?,
+        override val syncData: Map<String, String>? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override var score: Score? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -345,13 +314,8 @@ object DataStoreHelper {
         posterHeaders,
         plot,
         score,
-        tags,
+        tags
     ) {
-        object Serializer : WriteOnlySerializer<SubscribedData>(
-            SubscribedData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -370,30 +334,27 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = BookmarkedData.Serializer::class)
     data class BookmarkedData(
-        @JsonProperty("bookmarkedTime") @SerialName("bookmarkedTime") val bookmarkedTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        @JsonProperty("bookmarkedTime") val bookmarkedTime: Long,
+        override var id: Int?,
+        override val latestUpdatedTime: Long,
+        override val name: String,
+        override val url: String,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override val year: Int?,
+        override val syncData: Map<String, String>? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override var score: Score? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -406,13 +367,8 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot,
+        plot
     ) {
-        object Serializer : WriteOnlySerializer<BookmarkedData>(
-            BookmarkedData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(id: String): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 name,
@@ -431,30 +387,27 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = FavoritesData.Serializer::class)
     data class FavoritesData(
-        @JsonProperty("favoritesTime") @SerialName("favoritesTime") val favoritesTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        @JsonProperty("favoritesTime") val favoritesTime: Long,
+        override var id: Int?,
+        override val latestUpdatedTime: Long,
+        override val name: String,
+        override val url: String,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override val year: Int?,
+        override val syncData: Map<String, String>? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override var score: Score? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -467,13 +420,8 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot,
+        plot
     ) {
-        object Serializer : WriteOnlySerializer<FavoritesData>(
-            FavoritesData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -492,32 +440,31 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @Serializable
     data class ResumeWatchingResult(
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType? = null,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("watchPos") @SerialName("watchPos") val watchPos: PosDur?,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        @JsonProperty("name") override val name: String,
+        @JsonProperty("url") override val url: String,
+        @JsonProperty("apiName") override val apiName: String,
+        @JsonProperty("type") override var type: TvType? = null,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
+        @JsonProperty("watchPos") val watchPos: PosDur?,
+        @JsonProperty("id") override var id: Int?,
+        @JsonProperty("parentId") val parentId: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("quality") override var quality: SearchQuality? = null,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("score") override var score: Score? = null,
     ) : SearchResponse
 
     /**
      * A datastore wide account for future implementations of a multiple account system
-     */
+     **/
 
     fun getAllWatchStateIds(): List<Int>? {
         val folder = "$currentAccount/$RESULT_WATCH_STATE"
@@ -553,7 +500,7 @@ object DataStoreHelper {
     }
 
     fun migrateResumeWatching() {
-        // if (getKey<Boolean>(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
+        // if (getKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
         setKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, true)
         getAllResumeStateIdsOld()?.forEach { id ->
             getLastWatchedOld(id)?.let {
@@ -563,12 +510,12 @@ object DataStoreHelper {
                     it.episode,
                     it.season,
                     it.isFromDownload,
-                    it.updateTime,
+                    it.updateTime
                 )
                 removeLastWatchedOld(it.parentId)
             }
         }
-        // }
+        //}
     }
 
     fun setLastWatched(
@@ -589,7 +536,7 @@ object DataStoreHelper {
                 episode,
                 season,
                 updateTime ?: System.currentTimeMillis(),
-                isFromDownload,
+                isFromDownload
             )
         )
     }
@@ -606,7 +553,7 @@ object DataStoreHelper {
 
     fun getLastWatched(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey<DownloadObjects.ResumeWatching>(
+        return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING",
             id.toString(),
         )
@@ -614,7 +561,7 @@ object DataStoreHelper {
 
     private fun getLastWatchedOld(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey<DownloadObjects.ResumeWatching>(
+        return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING_OLD",
             id.toString(),
         )
@@ -628,18 +575,18 @@ object DataStoreHelper {
 
     fun getBookmarkedData(id: Int?): BookmarkedData? {
         if (id == null) return null
-        return getKey<BookmarkedData>("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
     }
 
     fun getAllBookmarkedData(): List<BookmarkedData> {
         return getKeys("$currentAccount/$RESULT_WATCH_STATE_DATA")?.mapNotNull {
-            getKey<BookmarkedData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
     fun getAllSubscriptions(): List<SubscribedData> {
         return getKeys("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA")?.mapNotNull {
-            getKey<SubscribedData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
@@ -651,12 +598,12 @@ object DataStoreHelper {
 
     /**
      * Set new seen episodes and update time
-     */
+     **/
     fun updateSubscribedData(id: Int?, data: SubscribedData?, episodeResponse: EpisodeResponse?) {
         if (id == null || data == null || episodeResponse == null) return
         val newData = data.copy(
             latestUpdatedTime = unixTimeMS,
-            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes(),
+            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes()
         )
         setKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString(), newData)
     }
@@ -669,12 +616,12 @@ object DataStoreHelper {
 
     fun getSubscribedData(id: Int?): SubscribedData? {
         if (id == null) return null
-        return getKey<SubscribedData>("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
     }
 
     fun getAllFavorites(): List<FavoritesData> {
         return getKeys("$currentAccount/$RESULT_FAVORITES_STATE_DATA")?.mapNotNull {
-            getKey<FavoritesData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
@@ -692,7 +639,7 @@ object DataStoreHelper {
 
     fun getFavoritesData(id: Int?): FavoritesData? {
         if (id == null) return null
-        return getKey<FavoritesData>("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
     }
 
     fun setViewPos(id: Int?, pos: Long, dur: Long) {
@@ -701,10 +648,10 @@ object DataStoreHelper {
         setKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), PosDur(pos, dur))
     }
 
-    /**
-     * Sets the position, duration, and resume data of an episode/movie,
-     * If nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
-     */
+    /** Sets the position, duration, and resume data of an episode/movie,
+     *
+     * if nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
+     * */
     fun setViewPosAndResume(id: Int?, position: Long, duration: Long, currentEpisode: Any?, nextEpisode: Any?) {
         setViewPos(id, position, duration)
         if (id != null) {
@@ -740,7 +687,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = false,
+                        isFromDownload = false
                     )
                 }
 
@@ -750,7 +697,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = true,
+                        isFromDownload = true
                     )
                 }
             }
@@ -759,16 +706,17 @@ object DataStoreHelper {
 
     fun getViewPos(id: Int?): PosDur? {
         if (id == null) return null
-        return getKey<PosDur>("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
+        return getKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
     }
 
     fun getVideoWatchState(id: Int?): VideoWatchState? {
         if (id == null) return null
-        return getKey<VideoWatchState>("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
+        return getKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
     }
 
     fun setVideoWatchState(id: Int?, watchState: VideoWatchState) {
         if (id == null) return
+
         // None == No key
         if (watchState == VideoWatchState.None) {
             removeKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString())
@@ -779,7 +727,7 @@ object DataStoreHelper {
 
     fun getDub(id: Int): DubStatus? {
         return DubStatus.entries
-            .getOrNull(getKey<Int>("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
+            .getOrNull(getKey("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
     }
 
     fun setDub(id: Int, status: DubStatus) {
@@ -800,13 +748,13 @@ object DataStoreHelper {
             getKey<Int>(
                 "$currentAccount/$RESULT_WATCH_STATE",
                 id.toString(),
-                null,
+                null
             )
         )
     }
 
     fun getResultSeason(id: Int): Int? {
-        return getKey<Int>("$currentAccount/$RESULT_SEASON", id.toString(), null)
+        return getKey("$currentAccount/$RESULT_SEASON", id.toString(), null)
     }
 
     fun setResultSeason(id: Int, value: Int?) {
@@ -814,7 +762,7 @@ object DataStoreHelper {
     }
 
     fun getResultEpisode(id: Int): Int? {
-        return getKey<Int>("$currentAccount/$RESULT_EPISODE", id.toString(), null)
+        return getKey("$currentAccount/$RESULT_EPISODE", id.toString(), null)
     }
 
     fun setResultEpisode(id: Int, value: Int?) {
@@ -827,11 +775,12 @@ object DataStoreHelper {
 
     fun getSync(id: Int, idPrefixes: List<String>): List<String?> {
         return idPrefixes.map { idPrefix ->
-            getKey<String>("${idPrefix}_sync", id.toString())
+            getKey("${idPrefix}_sync", id.toString())
         }
     }
 
     var pinnedProviders: Array<String>
-        get() = getKey<Array<String>>(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
+        get() = getKey(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
         set(value) = setKey(USER_PINNED_PROVIDERS, value)
+
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
index af3795834..e3c7d68df 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
@@ -63,7 +63,7 @@ object BatteryOptimizationChecker {
         return isRestricted && isOptimizedNotShown && isLayout(PHONE)
     }
 
-    fun Context.showRequestIgnoreBatteryOptDialog() {
+    private fun Context.showRequestIgnoreBatteryOptDialog() {
         try {
             val intent = Intent().apply {
                 action =  Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
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 43e61ad88..b8e2c1b76 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -72,7 +72,7 @@ object SyncUtil {
             // Gogoanime, Twistmoe and 9anime
             val url = "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/pages/$site/$slug.json"
             val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).text
-            val mapped = tryParseJson<MalSyncPage>(response)
+            val mapped = tryParseJson<MalSyncPage?>(response)
 
             val overrideMal = mapped?.malId ?: mapped?.mal?.id ?: mapped?.anilist?.malId
             val overrideAnilist = mapped?.aniId ?: mapped?.anilist?.id
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt
index b5b367262..feecbe312 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt
@@ -23,15 +23,15 @@ const val PROGRAM_ID_LIST_KEY = "persistent_program_ids"
 
 object TvChannelUtils {
     fun Context.saveProgramId(programId: Long) {
-        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = (existing + programId).distinct()
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }
     fun Context.getStoredProgramIds(): List<Long> {
-        return getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        return getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
     }
     fun Context.removeProgramId(programId: Long) {
-        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = existing.filter { it != programId }
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }
@@ -149,12 +149,10 @@ object TvChannelUtils {
             .setInputId(inputId)
             .build()
 
-        val channelUri = runCatching {
-            context.contentResolver.insert(
-                TvContractCompat.Channels.CONTENT_URI,
-                channel.toContentValues()
-            )
-        }.getOrNull()
+        val channelUri = context.contentResolver.insert(
+            TvContractCompat.Channels.CONTENT_URI,
+            channel.toContentValues()
+        )
 
         channelUri?.let {
             val channelId = ContentUris.parseId(it)
@@ -163,4 +161,4 @@ object TvChannelUtils {
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index adefedd20..7cb190667 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -1640,11 +1640,11 @@ object VideoDownloadManager {
     }
 
     fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? {
-        return context.getKey<DownloadResumePackage>(KEY_RESUME_PACKAGES, id.toString())
+        return context.getKey(KEY_RESUME_PACKAGES, id.toString())
     }
 
     fun getDownloadQueuePackage(context: Context, id: Int): DownloadQueueWrapper? {
-        return context.getKey<DownloadQueueWrapper>(KEY_RESUME_IN_QUEUE, id.toString())
+        return context.getKey(KEY_RESUME_IN_QUEUE, id.toString())
     }
 
     fun getDownloadEpisodeMetadata(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
index 946e7ecf9..25a9fdf2a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
@@ -1,32 +1,23 @@
 package com.lagradost.cloudstream3.utils.downloader
 
 import android.net.Uri
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Score
-import com.lagradost.cloudstream3.SkipSerializationTest
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.services.DownloadQueueService
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.serializers.UriSerializer
-import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
 import com.lagradost.safefile.SafeFile
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.io.IOException
 import java.io.OutputStream
 import java.util.Objects
 
 object DownloadObjects {
     /** An item can either be something to resume or something new to start */
-    @Serializable
     data class DownloadQueueWrapper(
-        @JsonProperty("resumePackage") @SerialName("resumePackage") val resumePackage: DownloadResumePackage?,
-        @JsonProperty("downloadItem") @SerialName("downloadItem") val downloadItem: DownloadQueueItem?,
+        @JsonProperty("resumePackage") val resumePackage: DownloadResumePackage?,
+        @JsonProperty("downloadItem") val downloadItem: DownloadQueueItem?,
     ) {
         init {
             assert(resumePackage != null || downloadItem != null) {
@@ -35,66 +26,56 @@ object DownloadObjects {
         }
 
         /** Loop through the current download instances to see if it is currently downloading. Also includes link loading. */
-        @JsonIgnore
         fun isCurrentlyDownloading(): Boolean {
             return DownloadQueueService.downloadInstances.value.any { it.downloadQueueWrapper.id == this.id }
         }
 
-        @JsonProperty("id") @SerialName("id")
+        @JsonProperty("id")
         val id = resumePackage?.item?.ep?.id ?: downloadItem!!.episode.id
 
-        @JsonProperty("parentId") @SerialName("parentId")
+        @JsonProperty("parentId")
         val parentId = resumePackage?.item?.ep?.parentId ?: downloadItem!!.episode.parentId
     }
 
     /** General data about the episode and show to start a download from. */
-    @Serializable
     data class DownloadQueueItem(
-        @JsonProperty("episode") @SerialName("episode") val episode: ResultEpisode,
-        @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
-        @JsonProperty("resultName") @SerialName("resultName") val resultName: String,
-        @JsonProperty("resultType") @SerialName("resultType") val resultType: TvType,
-        @JsonProperty("resultPoster") @SerialName("resultPoster") val resultPoster: String?,
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-        @JsonProperty("resultId") @SerialName("resultId") val resultId: Int,
-        @JsonProperty("resultUrl") @SerialName("resultUrl") val resultUrl: String,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>? = null,
-        @JsonProperty("subs") @SerialName("subs") val subs: List<SubtitleData>? = null,
+        @JsonProperty("episode") val episode: ResultEpisode,
+        @JsonProperty("isMovie") val isMovie: Boolean,
+        @JsonProperty("resultName") val resultName: String,
+        @JsonProperty("resultType") val resultType: TvType,
+        @JsonProperty("resultPoster") val resultPoster: String?,
+        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("resultId") val resultId: Int,
+        @JsonProperty("resultUrl") val resultUrl: String,
+        @JsonProperty("links") val links: List<ExtractorLink>? = null,
+        @JsonProperty("subs") val subs: List<SubtitleData>? = null,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(null, this)
         }
     }
 
-    interface DownloadCached {
-        val id: Int
-    }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = DownloadEpisodeCached.Serializer::class)
+    abstract class DownloadCached(
+        @JsonProperty("id") open val id: Int,
+    )
+
     data class DownloadEpisodeCached(
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("score") @SerialName("score") var score: Score? = null,
-        @JsonProperty("description") @SerialName("description") val description: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
-    ) : DownloadCached {
-        object Serializer : WriteOnlySerializer<DownloadEpisodeCached>(
-            DownloadEpisodeCached.generatedSerializer(),
-            setOf("rating"),
-        )
-
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("episode") val episode: Int,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("score") var score: Score? = null,
+        @JsonProperty("description") val description: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id) {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
-        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR,
+            level = DeprecationLevel.ERROR
         )
         var rating: Int? = null
             set(value) {
@@ -106,81 +87,74 @@ object DownloadObjects {
     }
 
     /** What to display to the user for a downloaded show/movie. Includes info such as name, poster and url */
-    @Serializable
     data class DownloadHeaderCached(
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("type") @SerialName("type") val type: TvType,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
-    ) : DownloadCached
+        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("url") val url: String,
+        @JsonProperty("type") val type: TvType,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id)
 
-    @Serializable
     data class DownloadResumePackage(
-        @JsonProperty("item") @SerialName("item") val item: DownloadItem,
+        @JsonProperty("item") val item: DownloadItem,
         /** Tills which link should get resumed */
-        @JsonProperty("linkIndex") @SerialName("linkIndex") val linkIndex: Int?,
+        @JsonProperty("linkIndex") val linkIndex: Int?,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(this, null)
         }
     }
 
-    @Serializable
     data class DownloadItem(
-        @JsonProperty("source") @SerialName("source") val source: String?,
-        @JsonProperty("folder") @SerialName("folder") val folder: String?,
-        @JsonProperty("ep") @SerialName("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>,
+        @JsonProperty("source") val source: String?,
+        @JsonProperty("folder") val folder: String?,
+        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
+        @JsonProperty("links") val links: List<ExtractorLink>,
     )
 
     /** Metadata for a specific episode and how to display it. */
-    @Serializable
     data class DownloadEpisodeMetadata(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("mainName") @SerialName("mainName") val mainName: String,
-        @JsonProperty("sourceApiName") @SerialName("sourceApiName") val sourceApiName: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("type") @SerialName("type") val type: TvType?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("mainName") val mainName: String,
+        @JsonProperty("sourceApiName") val sourceApiName: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("type") val type: TvType?,
     )
 
-    @Serializable
+
     data class DownloadedFileInfo(
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
-        @JsonProperty("relativePath") @SerialName("relativePath") val relativePath: String,
-        @JsonProperty("displayName") @SerialName("displayName") val displayName: String,
-        @JsonProperty("extraInfo") @SerialName("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") @SerialName("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("relativePath") val relativePath: String,
+        @JsonProperty("displayName") val displayName: String,
+        @JsonProperty("extraInfo") val extraInfo: String? = null,
+        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
         // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
-        @JsonProperty("linkHash") @SerialName("linkHash") val linkHash: Int? = null,
+        @JsonProperty("linkHash") val linkHash : Int? = null
     )
 
-    @Serializable
-    @SkipSerializationTest // Uri has issues with Jackson
     data class DownloadedFileInfoResult(
-        @JsonProperty("fileLength") @SerialName("fileLength") val fileLength: Long,
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
-        @JsonProperty("path") @SerialName("path")
-        @Serializable(with = UriSerializer::class)
-        val path: Uri,
+        @JsonProperty("fileLength") val fileLength: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("path") val path: Uri,
     )
 
-    @Serializable
+
     data class ResumeWatching(
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("episodeId") @SerialName("episodeId") val episodeId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("updateTime") @SerialName("updateTime") val updateTime: Long,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("episodeId") val episodeId: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("updateTime") val updateTime: Long,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
     )
 
+
     data class DownloadStatus(
         /** if you should retry with the same args and hope for a better result */
         val retrySame: Boolean,
@@ -190,19 +164,20 @@ object DownloadObjects {
         val success: Boolean,
     )
 
+
     data class CreateNotificationMetadata(
         val type: VideoDownloadManager.DownloadType,
         val bytesDownloaded: Long,
         val bytesTotal: Long,
         val hlsProgress: Long? = null,
         val hlsTotal: Long? = null,
-        val bytesPerSecond: Long,
+        val bytesPerSecond: Long
     )
 
     data class StreamData(
         private val fileLength: Long,
         val file: SafeFile,
-        // val fileStream: OutputStream,
+        //val fileStream: OutputStream,
     ) {
         @Throws(IOException::class)
         fun open(): OutputStream {
@@ -223,11 +198,9 @@ object DownloadObjects {
         val exists: Boolean get() = file.exists() == true
     }
 
-    /**
-     * Bytes have the size end-start where the byte range is [start,end)
-     * note that ByteArray is a pointer and therefore can't be stored
-     * without cloning it.
-     */
+
+    /** bytes have the size end-start where the byte range is [start,end)
+     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
     data class LazyStreamDownloadResponse(
         val bytes: ByteArray,
         val startByte: Long,
@@ -248,4 +221,4 @@ object DownloadObjects {
             return Objects.hash(startByte, endByte)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt
index adceede42..7c73a6889 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.utils.serializers
 
 import android.net.Uri
-import com.lagradost.cloudstream3.InternalAPI
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
@@ -27,7 +26,6 @@ import kotlinx.serialization.encoding.Encoder
  *       val uri: Uri,
  *   )
  */
-@InternalAPI
 object UriSerializer : KSerializer<Uri> {
     override val descriptor: SerialDescriptor = 
         PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
index 687f746e3..df9d56217 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AnimeLoadResponse
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
@@ -26,7 +25,6 @@ import java.security.MessageDigest
 
 class AnimeSkipAuth : AuthAPI() {
     override val name = "AnimeSkip"
-    override val icon: Int = R.drawable.animeskip
     override val inAppLoginRequirement: AuthLoginRequirement =
         AuthLoginRequirement(password = true, username = true)
     override val idPrefix = "anime-skip"
diff --git a/app/src/main/res/color/account_edit_btn_tint.xml b/app/src/main/res/color/account_edit_btn_tint.xml
deleted file mode 100644
index 7205c77fc..000000000
--- a/app/src/main/res/color/account_edit_btn_tint.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:color="?attr/black"/>
-    <item android:color="?attr/textColor"/>
-</selector>
diff --git a/app/src/main/res/drawable/article_24px.xml b/app/src/main/res/drawable/article_24px.xml
deleted file mode 100644
index 5b0f45801..000000000
--- a/app/src/main/res/drawable/article_24px.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200ZM320,680L520,680Q537,680 548.5,668.5Q560,657 560,640Q560,623 548.5,611.5Q537,600 520,600L320,600Q303,600 291.5,611.5Q280,623 280,640Q280,657 291.5,668.5Q303,680 320,680ZM320,520L640,520Q657,520 668.5,508.5Q680,497 680,480Q680,463 668.5,451.5Q657,440 640,440L320,440Q303,440 291.5,451.5Q280,463 280,480Q280,497 291.5,508.5Q303,520 320,520ZM320,360L640,360Q657,360 668.5,348.5Q680,337 680,320Q680,303 668.5,291.5Q657,280 640,280L320,280Q303,280 291.5,291.5Q280,303 280,320Q280,337 291.5,348.5Q303,360 320,360Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/aspect_ratio_24px.xml b/app/src/main/res/drawable/aspect_ratio_24px.xml
deleted file mode 100644
index 429ed7237..000000000
--- a/app/src/main/res/drawable/aspect_ratio_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M680,600L600,600Q583,600 571.5,611.5Q560,623 560,640Q560,657 571.5,668.5Q583,680 600,680L720,680Q737,680 748.5,668.5Q760,657 760,640L760,520Q760,503 748.5,491.5Q737,480 720,480Q703,480 691.5,491.5Q680,503 680,520L680,600ZM280,360L360,360Q377,360 388.5,348.5Q400,337 400,320Q400,303 388.5,291.5Q377,280 360,280L240,280Q223,280 211.5,291.5Q200,303 200,320L200,440Q200,457 211.5,468.5Q223,480 240,480Q257,480 268.5,468.5Q280,457 280,440L280,360ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/audio_capture_24px.xml b/app/src/main/res/drawable/audio_capture_24px.xml
deleted file mode 100644
index a9ed40e02..000000000
--- a/app/src/main/res/drawable/audio_capture_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M148,812Q129,831 104.5,820.5Q80,810 80,783L80,520Q80,503 91.5,491.5Q103,480 120,480Q137,480 148.5,491.5Q160,503 160,520L160,685L194,651Q199,646 206.5,643Q214,640 222,640L280,640Q297,640 308.5,651.5Q320,663 320,680Q320,697 308.5,708.5Q297,720 280,720L240,720L148,812ZM680,720Q663,720 651.5,708.5Q640,697 640,680Q640,663 651.5,651.5Q663,640 680,640L800,640Q800,640 800,640Q800,640 800,640L800,519Q800,502 811.5,491Q823,480 840,480Q857,480 868.5,491.5Q880,503 880,520L880,640Q880,673 856.5,696.5Q833,720 800,720L680,720ZM451.5,588.5Q440,577 440,560L440,240Q440,223 451.5,211.5Q463,200 480,200Q497,200 508.5,211.5Q520,223 520,240L520,560Q520,577 508.5,588.5Q497,600 480,600Q463,600 451.5,588.5ZM291.5,508.5Q280,497 280,480L280,320Q280,303 291.5,291.5Q303,280 320,280Q337,280 348.5,291.5Q360,303 360,320L360,480Q360,497 348.5,508.5Q337,520 320,520Q303,520 291.5,508.5ZM611.5,468.5Q600,457 600,440L600,360Q600,343 611.5,331.5Q623,320 640,320Q657,320 668.5,331.5Q680,343 680,360L680,440Q680,457 668.5,468.5Q657,480 640,480Q623,480 611.5,468.5ZM120,320Q103,320 91.5,308.5Q80,297 80,280L80,160Q80,127 103.5,103.5Q127,80 160,80L280,80Q297,80 308.5,91.5Q320,103 320,120Q320,137 308.5,148.5Q297,160 280,160L160,160Q160,160 160,160Q160,160 160,160L160,281Q160,298 148.5,309Q137,320 120,320ZM811.5,308.5Q800,297 800,280L800,160Q800,160 800,160Q800,160 800,160L680,160Q663,160 651.5,148.5Q640,137 640,120Q640,103 651.5,91.5Q663,80 680,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,281Q880,298 868.5,309Q857,320 840,320Q823,320 811.5,308.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/autorenew_24px.xml b/app/src/main/res/drawable/autorenew_24px.xml
deleted file mode 100644
index 4ac69c08f..000000000
--- a/app/src/main/res/drawable/autorenew_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M240,482Q240,498 242,513.5Q244,529 249,544Q254,561 248,576.5Q242,592 227,599Q211,607 195.5,600.5Q180,594 175,577Q167,554 163.5,530Q160,506 160,482Q160,348 253,254Q346,160 480,160L487,160L451,124Q440,113 440,96Q440,79 451,68Q462,57 479,57Q496,57 507,68L611,172Q623,184 623,200Q623,216 611,228L507,332Q496,343 479,343Q462,343 451,332Q440,321 440,304Q440,287 451,276L487,240L480,240Q380,240 310,310.5Q240,381 240,482ZM720,478Q720,462 718,446.5Q716,431 711,416Q706,399 712,383.5Q718,368 733,361Q749,353 764.5,359.5Q780,366 785,383Q793,406 796.5,430Q800,454 800,478Q800,612 707,706Q614,800 480,800L473,800L509,836Q520,847 520,864Q520,881 509,892Q498,903 481,903Q464,903 453,892L349,788Q337,776 337,760Q337,744 349,732L453,628Q464,617 481,617Q498,617 509,628Q520,639 520,656Q520,673 509,684L473,720L480,720Q580,720 650,649.5Q720,579 720,478Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/battery_alert_24px.xml b/app/src/main/res/drawable/battery_alert_24px.xml
deleted file mode 100644
index 3675de44d..000000000
--- a/app/src/main/res/drawable/battery_alert_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,120Q400,103 411.5,91.5Q423,80 440,80L520,80Q537,80 548.5,91.5Q560,103 560,120L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880ZM360,800L600,800L600,240L360,240L360,800ZM360,800L360,800L600,800L600,800L360,800ZM508.5,548.5Q520,537 520,520L520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360L440,520Q440,537 451.5,548.5Q463,560 480,560Q497,560 508.5,548.5ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/border_color_24px.xml b/app/src/main/res/drawable/border_color_24px.xml
deleted file mode 100644
index f4a5bbf3b..000000000
--- a/app/src/main/res/drawable/border_color_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,960Q127,960 103.5,936.5Q80,913 80,880Q80,847 103.5,823.5Q127,800 160,800L800,800Q833,800 856.5,823.5Q880,847 880,880Q880,913 856.5,936.5Q833,960 800,960L160,960ZM240,640L296,640L608,329L579,300L551,272L240,584L240,640ZM160,680L160,567Q160,559 163,551.5Q166,544 172,538L608,103Q619,92 633.5,86Q648,80 664,80Q680,80 695,86Q710,92 722,104L777,160Q789,171 794.5,186Q800,201 800,217Q800,232 794.5,246.5Q789,261 777,273L342,708Q336,714 328.5,717Q321,720 313,720L200,720Q183,720 171.5,708.5Q160,697 160,680ZM720,216L720,216L664,160L664,160L720,216ZM608,329L579,300L551,272L551,272L608,329Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/build_24px.xml b/app/src/main/res/drawable/build_24px.xml
deleted file mode 100644
index 0616691da..000000000
--- a/app/src/main/res/drawable/build_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,600Q260,600 190,530Q120,460 120,360Q120,340 123,320Q126,300 134,282Q139,272 146.5,267Q154,262 163,260Q172,258 181.5,260.5Q191,263 199,271L304,376L376,304L271,199Q263,191 260.5,181.5Q258,172 260,163Q262,154 267,146.5Q272,139 282,134Q300,126 320,123Q340,120 360,120Q460,120 530,190Q600,260 600,360Q600,383 596,403.5Q592,424 584,444L786,644Q815,673 815,715Q815,757 786,786Q757,815 715,815Q673,815 644,785L444,584Q424,592 403.5,596Q383,600 360,600ZM360,520Q386,520 412,512Q438,504 459,487L702,730Q707,735 715.5,734.5Q724,734 729,729Q734,724 734,715.5Q734,707 729,702L486,460Q504,440 512,413.5Q520,387 520,360Q520,300 481.5,255.5Q443,211 386,202L460,276Q472,288 472,304Q472,320 460,332L332,460Q320,472 304,472Q288,472 276,460L202,386Q211,443 255.5,481.5Q300,520 360,520ZM469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/cast.xml b/app/src/main/res/drawable/cast.xml
deleted file mode 100644
index 7600cb706..000000000
--- a/app/src/main/res/drawable/cast.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480ZM880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L638,800Q621,800 609.5,788.5Q598,777 598,760Q598,743 609.5,731.5Q621,720 638,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,246Q160,263 148.5,274.5Q137,286 120,286Q103,286 91.5,274.5Q80,263 80,246L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240ZM320,800Q304,800 292,790.5Q280,781 277,765Q266,702 220.5,658Q175,614 112,603Q97,601 88.5,588.5Q80,576 80,560Q80,543 91,531.5Q102,520 117,522Q211,534 277.5,601Q344,668 357,762Q359,778 348,789Q337,800 320,800ZM480,800Q463,800 451.5,789Q440,778 438,761Q424,633 333.5,544Q243,455 115,442Q99,440 89.5,428Q80,416 80,400Q80,383 90.5,371Q101,359 116,361Q277,374 390,486Q503,598 518,759Q520,776 508.5,788Q497,800 480,800ZM130,800Q109,800 94.5,785.5Q80,771 80,750Q80,729 94.5,714.5Q109,700 130,700Q151,700 165.5,714.5Q180,729 180,750Q180,771 165.5,785.5Q151,800 130,800Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/close_24px.xml b/app/src/main/res/drawable/close_24px.xml
deleted file mode 100644
index 77be1d01e..000000000
--- a/app/src/main/res/drawable/close_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,536L284,732Q273,743 256,743Q239,743 228,732Q217,721 217,704Q217,687 228,676L424,480L228,284Q217,273 217,256Q217,239 228,228Q239,217 256,217Q273,217 284,228L480,424L676,228Q687,217 704,217Q721,217 732,228Q743,239 743,256Q743,273 732,284L536,480L732,676Q743,687 743,704Q743,721 732,732Q721,743 704,743Q687,743 676,732L480,536Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/closed_caption_24px.xml b/app/src/main/res/drawable/closed_caption_24px.xml
deleted file mode 100644
index 793e1e061..000000000
--- a/app/src/main/res/drawable/closed_caption_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,800Q167,800 143.5,776.5Q120,753 120,720L120,240Q120,207 143.5,183.5Q167,160 200,160L760,160Q793,160 816.5,183.5Q840,207 840,240L840,720Q840,753 816.5,776.5Q793,800 760,800L200,800ZM200,720L760,720Q760,720 760,720Q760,720 760,720L760,240Q760,240 760,240Q760,240 760,240L200,240Q200,240 200,240Q200,240 200,240L200,720Q200,720 200,720Q200,720 200,720ZM280,600L400,600Q417,600 428.5,588.5Q440,577 440,560L440,540Q440,531 434,525Q428,519 419,519L401,519Q392,519 386,525Q380,531 380,540L380,540Q380,540 380,540Q380,540 380,540L300,540Q300,540 300,540Q300,540 300,540L300,420Q300,420 300,420Q300,420 300,420L380,420Q380,420 380,420Q380,420 380,420L380,420Q380,429 386,435Q392,441 401,441L419,441Q428,441 434,435Q440,429 440,420L440,400Q440,383 428.5,371.5Q417,360 400,360L280,360Q263,360 251.5,371.5Q240,383 240,400L240,560Q240,577 251.5,588.5Q263,600 280,600ZM680,360L560,360Q543,360 531.5,371.5Q520,383 520,400L520,560Q520,577 531.5,588.5Q543,600 560,600L680,600Q697,600 708.5,588.5Q720,577 720,560L720,540Q720,531 714,525Q708,519 699,519L681,519Q672,519 666,525Q660,531 660,540L660,540Q660,540 660,540Q660,540 660,540L580,540Q580,540 580,540Q580,540 580,540L580,420Q580,420 580,420Q580,420 580,420L660,420Q660,420 660,420Q660,420 660,420L660,420Q660,429 666,435Q672,441 681,441L699,441Q708,441 714,435Q720,429 720,420L720,400Q720,383 708.5,371.5Q697,360 680,360ZM200,720Q200,720 200,720Q200,720 200,720L200,240Q200,240 200,240Q200,240 200,240L200,240Q200,240 200,240Q200,240 200,240L200,720Q200,720 200,720Q200,720 200,720Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/colors_24px.xml b/app/src/main/res/drawable/colors_24px.xml
deleted file mode 100644
index d86304cf9..000000000
--- a/app/src/main/res/drawable/colors_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L255,176Q242,163 241.5,145Q241,127 254,113Q267,99 286,99Q305,99 319,113L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L769,630Q778,619 792.5,618.5Q807,618 816,629L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/construction_24px.xml b/app/src/main/res/drawable/construction_24px.xml
deleted file mode 100644
index 00c976c90..000000000
--- a/app/src/main/res/drawable/construction_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M714,798L537,621L621,537L798,714Q815,731 815,756Q815,781 798,798Q781,815 756,815Q731,815 714,798ZM145,756Q145,731 162,714L396,480L328,412L328,412Q317,423 300,423Q283,423 272,412L249,389L249,479Q249,493 237,498Q225,503 215,493L106,384Q96,374 101,362Q106,350 120,350L210,350L188,328Q176,316 176,300Q176,284 188,272L302,158Q322,138 345,129Q368,120 392,120Q412,120 429.5,126Q447,132 464,144Q472,149 472.5,158Q473,167 466,174L390,250L412,272Q423,283 423,300Q423,317 412,328L412,328L480,396L570,306Q566,295 563.5,283Q561,271 561,259Q561,200 601.5,159.5Q642,119 701,119Q709,119 716,119.5Q723,120 730,122Q739,125 741.5,134.5Q744,144 737,151L672,216Q666,222 666,230Q666,238 672,244L716,288Q722,294 730,294Q738,294 744,288L809,223Q816,216 825.5,218Q835,220 838,230Q840,237 840.5,244Q841,251 841,259Q841,318 800.5,358.5Q760,399 701,399Q689,399 677,397Q665,395 654,390L246,798Q229,815 204,815Q179,815 162,798Q145,781 145,756Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/copy_all_24px.xml b/app/src/main/res/drawable/copy_all_24px.xml
deleted file mode 100644
index 8e4db679b..000000000
--- a/app/src/main/res/drawable/copy_all_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM540,400Q540,400 540,400Q540,400 540,400L540,400Q540,400 540,400Q540,400 540,400L540,400Q540,400 540,400Q540,400 540,400L540,400Q540,400 540,400Q540,400 540,400ZM131.5,308.5Q120,297 120,280Q120,263 131.5,251.5Q143,240 160,240Q177,240 188.5,251.5Q200,263 200,280Q200,297 188.5,308.5Q177,320 160,320Q143,320 131.5,308.5ZM131.5,448.5Q120,437 120,420Q120,403 131.5,391.5Q143,380 160,380Q177,380 188.5,391.5Q200,403 200,420Q200,437 188.5,448.5Q177,460 160,460Q143,460 131.5,448.5ZM131.5,588.5Q120,577 120,560Q120,543 131.5,531.5Q143,520 160,520Q177,520 188.5,531.5Q200,543 200,560Q200,577 188.5,588.5Q177,600 160,600Q143,600 131.5,588.5ZM131.5,728.5Q120,717 120,700Q120,683 131.5,671.5Q143,660 160,660Q177,660 188.5,671.5Q200,683 200,700Q200,717 188.5,728.5Q177,740 160,740Q143,740 131.5,728.5ZM131.5,868.5Q120,857 120,840Q120,823 131.5,811.5Q143,800 160,800Q177,800 188.5,811.5Q200,823 200,840Q200,857 188.5,868.5Q177,880 160,880Q143,880 131.5,868.5ZM271.5,868.5Q260,857 260,840Q260,823 271.5,811.5Q283,800 300,800Q317,800 328.5,811.5Q340,823 340,840Q340,857 328.5,868.5Q317,880 300,880Q283,880 271.5,868.5ZM411.5,868.5Q400,857 400,840Q400,823 411.5,811.5Q423,800 440,800Q457,800 468.5,811.5Q480,823 480,840Q480,857 468.5,868.5Q457,880 440,880Q423,880 411.5,868.5ZM551.5,868.5Q540,857 540,840Q540,823 551.5,811.5Q563,800 580,800Q597,800 608.5,811.5Q620,823 620,840Q620,857 608.5,868.5Q597,880 580,880Q563,880 551.5,868.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/delete_24px.xml b/app/src/main/res/drawable/delete_24px.xml
deleted file mode 100644
index 237e75aa6..000000000
--- a/app/src/main/res/drawable/delete_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L200,240Q183,240 171.5,228.5Q160,217 160,200Q160,183 171.5,171.5Q183,160 200,160L360,160L360,160Q360,143 371.5,131.5Q383,120 400,120L560,120Q577,120 588.5,131.5Q600,143 600,160L600,160L760,160Q777,160 788.5,171.5Q800,183 800,200Q800,217 788.5,228.5Q777,240 760,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM428.5,668.5Q440,657 440,640L440,360Q440,343 428.5,331.5Q417,320 400,320Q383,320 371.5,331.5Q360,343 360,360L360,640Q360,657 371.5,668.5Q383,680 400,680Q417,680 428.5,668.5ZM588.5,668.5Q600,657 600,640L600,360Q600,343 588.5,331.5Q577,320 560,320Q543,320 531.5,331.5Q520,343 520,360L520,640Q520,657 531.5,668.5Q543,680 560,680Q577,680 588.5,668.5ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/description_24px.xml b/app/src/main/res/drawable/description_24px.xml
deleted file mode 100644
index f55b9ad85..000000000
--- a/app/src/main/res/drawable/description_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,720L600,720Q617,720 628.5,708.5Q640,697 640,680Q640,663 628.5,651.5Q617,640 600,640L360,640Q343,640 331.5,651.5Q320,663 320,680Q320,697 331.5,708.5Q343,720 360,720ZM360,560L600,560Q617,560 628.5,548.5Q640,537 640,520Q640,503 628.5,491.5Q617,480 600,480L360,480Q343,480 331.5,491.5Q320,503 320,520Q320,537 331.5,548.5Q343,560 360,560ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L527,80Q543,80 557.5,86Q572,92 583,103L777,297Q788,308 794,322.5Q800,337 800,353L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,320L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L560,360Q543,360 531.5,348.5Q520,337 520,320ZM240,160L240,160L240,320Q240,337 240,348.5Q240,360 240,360L240,360L240,160L240,320Q240,337 240,348.5Q240,360 240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/dns_24px.xml b/app/src/main/res/drawable/dns_24px.xml
deleted file mode 100644
index 2f9b4c8bf..000000000
--- a/app/src/main/res/drawable/dns_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M300,240Q275,240 257.5,257.5Q240,275 240,300Q240,325 257.5,342.5Q275,360 300,360Q325,360 342.5,342.5Q360,325 360,300Q360,275 342.5,257.5Q325,240 300,240ZM300,640Q275,640 257.5,657.5Q240,675 240,700Q240,725 257.5,742.5Q275,760 300,760Q325,760 342.5,742.5Q360,725 360,700Q360,675 342.5,657.5Q325,640 300,640ZM160,120L800,120Q817,120 828.5,131.5Q840,143 840,160L840,440Q840,457 828.5,468.5Q817,480 800,480L160,480Q143,480 131.5,468.5Q120,457 120,440L120,160Q120,143 131.5,131.5Q143,120 160,120ZM200,200L200,400L760,400L760,200L200,200ZM160,520L800,520Q817,520 828.5,531.5Q840,543 840,560L840,840Q840,857 828.5,868.5Q817,880 800,880L160,880Q143,880 131.5,868.5Q120,857 120,840L120,560Q120,543 131.5,531.5Q143,520 160,520ZM200,600L200,800L760,800L760,600L200,600ZM200,200L200,200L200,400L200,400L200,200ZM200,600L200,600L200,800L200,800L200,600Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/encrypted_24px.xml b/app/src/main/res/drawable/encrypted_24px.xml
deleted file mode 100644
index 66231650a..000000000
--- a/app/src/main/res/drawable/encrypted_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M444,600L516,600Q525,600 531.5,592.5Q538,585 536,576L517,471Q537,461 548.5,442Q560,423 560,400Q560,367 536.5,343.5Q513,320 480,320Q447,320 423.5,343.5Q400,367 400,400Q400,423 411.5,442Q423,461 443,471L424,576Q422,585 428.5,592.5Q435,600 444,600ZM467,875Q461,874 455,872Q320,827 240,705.5Q160,584 160,444L160,255Q160,230 174.5,210Q189,190 212,181L452,91Q466,86 480,86Q494,86 508,91L748,181Q771,190 785.5,210Q800,230 800,255L800,444Q800,584 720,705.5Q640,827 505,872Q499,874 493,875Q487,876 480,876Q473,876 467,875ZM480,796Q584,763 652,664Q720,565 720,444L720,255Q720,255 720,255Q720,255 720,255L480,165Q480,165 480,165Q480,165 480,165L240,255Q240,255 240,255Q240,255 240,255L240,444Q240,565 308,664Q376,763 480,796ZM480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/extension_24px.xml b/app/src/main/res/drawable/extension_24px.xml
deleted file mode 100644
index ce2cfc260..000000000
--- a/app/src/main/res/drawable/extension_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760L720,760Q720,760 720,760Q720,760 720,760L720,601Q720,590 725.5,580Q731,570 742,565L765,554Q781,546 790.5,532Q800,518 800,500Q800,483 790.5,468.5Q781,454 765,446L743,436Q732,431 726,421.5Q720,412 720,400L720,240Q720,240 720,240Q720,240 720,240L563,240Q548,240 536.5,230.5Q525,221 523,206L518,172Q515,150 498.5,135Q482,120 460,120Q437,120 420.5,135Q404,150 401,172L396,206Q394,221 382.5,230.5Q371,240 356,240L200,240Q200,240 200,240Q200,240 200,240L200,326Q256,347 288,394Q320,441 320,500Q320,560 288,607Q256,654 200,675L200,760Q200,760 200,760Q200,760 200,760ZM200,840Q166,840 143,817Q120,794 120,760L120,635Q120,624 128,615.5Q136,607 147,605Q186,597 213,568.5Q240,540 240,500Q240,461 213,433Q186,405 147,396Q136,393 128,384.5Q120,376 120,365L120,240Q120,207 143.5,183.5Q167,160 200,160L322,160Q329,109 368,74.5Q407,40 460,40Q512,40 551,74.5Q590,109 598,160L720,160Q753,160 776.5,183.5Q800,207 800,240L800,374Q836,392 858,426Q880,460 880,500Q880,541 858,575Q836,609 800,626L800,760Q800,794 776.5,817Q753,840 720,840L200,840ZM500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/extention_download.xml b/app/src/main/res/drawable/extention_download.xml
deleted file mode 100644
index 97f3dbd67..000000000
--- a/app/src/main/res/drawable/extention_download.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M334.49,359.62L334.49,217.46C334.49,211.35 336.74,206.11 341.24,201.76C345.74,197.41 351.15,195.24 357.48,195.24C363.8,195.24 369.22,197.41 373.72,201.76C378.22,206.11 380.47,211.35 380.47,217.46L380.47,359.62L437.77,304.24C442.38,299.77 447.86,297.54 454.18,297.54C460.51,297.54 465.98,299.77 470.61,304.24C474.98,308.71 477.17,314 477.17,320.11C477.17,326.23 474.86,331.52 470.24,335.99L373.9,429.11C371.71,431.23 369.16,432.88 366.24,434.05C363.32,435.23 360.4,435.82 357.48,435.82C354.56,435.82 351.64,435.23 348.73,434.05C345.8,432.88 343.25,431.23 341.06,429.11L244.36,335.63C239.73,331.17 237.42,325.93 237.42,319.94C237.42,313.94 239.73,308.71 244.36,304.24C248.98,299.77 254.45,297.54 260.78,297.54C267.1,297.54 272.58,299.77 277.2,304.24L334.49,359.62Z"
-      android:strokeWidth="1"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M93.09,357.71L210.69,357.71L249.64,395.37L93.09,395.37C82.47,395.37 73.46,391.76 66.3,384.54C59.02,377.33 55.44,368.38 55.44,357.71L55.44,298.88C55.44,295.43 56.67,292.37 59.26,289.7C61.73,287.03 64.69,285.39 68.15,284.76C80.37,282.25 90.74,276.52 99.26,267.58C107.78,258.64 111.97,247.89 111.97,235.34C111.97,223.1 107.78,212.59 99.26,203.8C90.74,195.01 80.37,189.22 68.15,186.39C64.69,185.44 61.73,183.64 59.26,180.98C56.67,178.3 55.44,175.25 55.44,171.79L55.44,112.97C55.44,102.61 59.14,93.75 66.55,86.37C73.83,79 82.72,75.31 93.09,75.31L150.61,75.31C152.83,59.3 159.99,45.9 172.21,35.07C184.55,24.24 199,18.83 215.66,18.83C231.96,18.83 246.27,24.24 258.49,35.07C270.72,45.9 278.12,59.3 280.59,75.31L338.11,75.31C348.48,75.31 357.37,79 364.73,86.37C372.1,93.75 375.79,102.61 375.79,112.97L375.79,160.48C370.9,156.68 364.95,154.59 358.81,154.59C351.21,154.59 343.92,157.78 338.55,163.45C338.4,163.61 338.26,163.76 338.11,163.92L338.11,112.97L264.17,112.97C259.48,112.97 255.29,111.48 251.71,108.49C248,105.51 245.9,101.66 245.29,96.96L242.94,80.96C241.95,74.05 238.87,68.26 233.68,63.54C228.62,58.83 222.45,56.48 215.66,56.48C208.38,56.48 202.21,58.83 197.02,63.54C191.84,68.26 188.75,74.05 187.76,80.96L185.42,96.96C184.8,101.66 182.7,105.51 179.12,108.49C175.42,111.48 171.35,112.97 166.66,112.97L93.09,112.97L93.09,153.44C110.74,160.03 124.56,170.7 134.56,185.44C144.68,200.2 149.62,216.83 149.62,235.34C149.62,254.17 144.68,270.95 134.56,285.7C124.56,300.45 110.74,311.12 93.09,317.71Z"
-      android:strokeWidth="1"/>
-</vector>
diff --git a/app/src/main/res/drawable/extention_renew.xml b/app/src/main/res/drawable/extention_renew.xml
deleted file mode 100644
index a9e6e07f9..000000000
--- a/app/src/main/res/drawable/extention_renew.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M828.649 786.425C828.649 789.514 828.814 792.438 829.145 795.196C829.477 797.953 829.973 800.766 830.634 803.635C832.181 809.372 832.181 814.997 830.634 820.514C829.089 826.03 825.78 830.332 820.707 833.421C815.633 836.509 810.337 837.172 804.82 835.407C799.304 833.641 795.553 830.111 793.568 824.816C791.36 818.638 789.706 812.35 788.603 805.952C787.501 799.553 786.949 793.044 786.949 786.425C786.949 755.536 797.761 728.894 819.382 706.5C841.003 684.105 866.93 672.91 897.157 672.91L899.804 672.91L894.509 667.614C891.421 664.523 889.932 660.883 890.042 656.692C890.15 652.499 891.752 648.859 894.84 645.771C897.927 642.679 901.568 641.138 905.762 641.138C909.955 641.138 913.596 642.679 916.683 645.771L949.779 678.865C953.972 683.057 956.067 688.021 956.067 693.758C956.067 699.495 953.972 704.459 949.779 708.651L916.683 741.746C913.596 744.835 909.955 746.38 905.762 746.38C901.568 746.38 897.927 744.835 894.84 741.746C891.752 738.657 890.207 734.962 890.207 730.66C890.207 726.357 891.752 722.661 894.84 719.572L899.804 714.608L898.149 714.608C878.954 714.608 862.572 721.613 849.003 735.624C835.433 749.634 828.649 766.568 828.649 786.425ZM972.283 786.425C972.283 783.336 972.118 780.413 971.787 777.655C971.456 774.897 970.96 772.083 970.298 769.215C968.752 763.479 968.752 757.852 970.298 752.337C971.843 746.821 975.153 742.519 980.227 739.43C985.3 736.34 990.542 735.624 995.947 737.279C1001.35 738.933 1005.05 742.298 1007.03 747.373C1009.46 753.771 1011.23 760.169 1012.33 766.568C1013.43 772.966 1013.98 779.585 1013.98 786.425C1013.98 817.314 1003.17 844.011 981.55 866.517C959.929 889.021 934.001 900.274 903.776 900.274L901.128 900.274L906.093 905.238C909.18 908.327 910.726 911.968 910.726 916.16C910.726 920.351 909.18 923.992 906.093 927.081C903.005 930.17 899.308 931.714 895.005 931.714C890.703 931.714 887.006 930.17 883.918 927.081L850.823 893.985C846.63 889.793 844.592 884.884 844.701 879.258C844.81 873.632 846.852 868.723 850.823 864.531L884.249 831.435C887.337 828.346 891.034 826.746 895.336 826.636C899.639 826.525 903.336 828.015 906.424 831.104C909.511 834.193 911.057 837.889 911.057 842.191C911.057 846.493 909.511 850.189 906.424 853.278L901.128 858.573L902.783 858.573C921.978 858.573 938.36 851.513 951.93 837.392C965.499 823.272 972.283 806.283 972.283 786.425Z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M130.425 375.105L242.731 375.105C244.138 386.796 246.964 398.225 251.107 409.155L130.425 409.155C120.778 409.155 112.692 405.892 106.164 399.366C99.639 392.839 96.375 384.752 96.375 375.105L96.375 321.903C96.375 318.781 97.511 316.015 99.78 313.604C102.053 311.192 104.747 309.701 107.867 309.135C118.934 306.864 128.297 301.686 135.958 293.599C143.62 285.513 147.451 275.794 147.451 264.444C147.451 253.378 143.62 243.873 135.958 235.928C128.297 227.983 118.934 222.734 107.867 220.18C104.747 219.329 102.053 217.697 99.78 215.285C97.511 212.874 96.375 210.107 96.375 206.986L96.375 153.783C96.375 144.419 99.712 136.404 106.377 129.738C113.046 123.07 121.061 119.732 130.425 119.732L182.35 119.732C184.337 105.267 190.863 93.133 201.93 83.344C212.996 73.555 226.05 68.661 241.087 68.661C255.845 68.661 268.753 73.555 279.82 83.344C290.887 93.133 297.556 105.267 299.82 119.732L351.747 119.732C361.107 119.732 369.129 123.07 375.798 129.738C382.466 136.404 385.797 144.419 385.797 153.783L385.797 207.371C375.371 204.086 363.868 202.111 351.747 201.76L351.747 153.783L284.926 153.783C280.67 153.783 276.911 152.436 273.648 149.74C270.385 147.044 268.468 143.569 267.904 139.313L265.77 124.844C264.92 118.597 262.153 113.35 257.469 109.094C252.792 104.838 247.334 102.711 241.087 102.711C234.562 102.711 228.956 104.838 224.274 109.094C219.593 113.35 216.827 118.597 215.976 124.844L213.847 139.313C213.281 143.569 211.366 147.044 208.101 149.74C204.837 152.436 201.078 153.783 196.822 153.783L130.425 153.783L130.425 190.387C146.316 196.345 158.8 205.993 167.88 219.329C176.96 232.665 181.499 247.703 181.499 264.444C181.499 281.47 176.96 296.649 167.88 309.986C158.8 323.321 146.316 332.968 130.425 338.928L130.425 375.105Z" />
-    <path
-        android:fillColor="#D8D8D8"
-        android:pathData="M362.193 643.11A0.726 2.177 0 0 1 360.741 643.11A0.726 2.177 0 0 1 362.193 643.11Z"
-        android:strokeWidth="1"
-        android:strokeColor="#000000" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M285.208 364.511C285.208 368.086 285.429 371.577 285.861 374.985C286.293 378.39 287.03 381.766 288.073 385.111C289.337 389.523 289.243 393.776 287.81 397.87C286.377 401.967 283.702 405.013 279.814 407.011C275.738 409.183 271.65 409.48 267.563 407.903C263.465 406.322 260.737 403.379 259.357 399.076C257.408 393.502 255.986 387.814 255.101 382.007C254.205 376.204 253.763 370.371 253.763 364.511C253.763 333.308 264.613 306.671 286.314 284.601C308.015 262.531 334.393 251.497 365.427 251.497L367.923 251.497L357.136 240.707C354.439 238.01 353.102 234.647 353.133 230.62C353.154 226.593 354.524 223.229 357.22 220.529C359.917 217.828 363.288 216.479 367.312 216.479C371.336 216.479 374.697 217.828 377.404 220.529L413.01 256.138C416.16 259.29 417.74 262.984 417.74 267.221C417.74 271.458 416.16 275.152 413.01 278.303L377.404 313.914C374.697 316.614 371.336 317.963 367.312 317.963C363.288 317.963 359.917 316.614 357.22 313.914C354.524 311.213 353.175 307.835 353.175 303.781C353.175 299.728 354.524 296.352 357.22 293.651L367.923 282.945L365.669 282.945C343.347 282.945 324.364 290.874 308.699 306.731C293.045 322.588 285.208 341.846 285.208 364.511ZM447.289 363.46C447.289 359.884 447.078 356.392 446.646 352.985C446.204 349.58 445.466 346.204 444.434 342.86C443.17 338.447 443.254 334.194 444.697 330.101C446.13 326.004 448.795 322.957 452.693 320.96C456.759 318.787 460.836 318.476 464.902 320.027C468.968 321.579 471.686 324.48 473.066 328.728C475.068 334.356 476.522 340.074 477.406 345.88C478.291 351.683 478.744 357.544 478.744 363.46C478.744 394.661 467.894 421.312 446.183 443.412C424.482 465.509 398.115 476.557 367.081 476.557L364.573 476.557L375.276 487.263C377.984 489.961 379.332 493.323 379.332 497.351C379.332 501.378 377.984 504.742 375.276 507.442C372.58 510.141 369.209 511.492 365.153 511.492C361.097 511.492 357.716 510.141 355.019 507.442L319.413 471.832C316.263 468.681 314.693 465 314.725 460.791C314.757 456.582 316.316 452.901 319.413 449.749L355.103 414.14C357.8 411.44 361.181 410.076 365.227 410.049C369.282 410.021 372.664 411.357 375.361 414.057C378.068 416.757 379.416 420.135 379.416 424.19C379.416 428.242 378.068 431.619 375.361 434.319L364.573 445.108L366.828 445.108C389.15 445.108 408.143 437.165 423.808 421.28C439.462 405.397 447.289 386.123 447.289 363.46Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/extention_renew2.xml b/app/src/main/res/drawable/extention_renew2.xml
deleted file mode 100644
index d34e91355..000000000
--- a/app/src/main/res/drawable/extention_renew2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="512" android:viewportWidth="512" android:width="24dp">
-      
-    <path android:fillColor="#FF000000" android:pathData="M828.65,786.42C828.65,789.51 828.81,792.44 829.15,795.2C829.48,797.95 829.97,800.77 830.63,803.64C832.18,809.37 832.18,815 830.63,820.51C829.09,826.03 825.78,830.33 820.71,833.42C815.63,836.51 810.34,837.17 804.82,835.41C799.3,833.64 795.55,830.11 793.57,824.82C791.36,818.64 789.71,812.35 788.6,805.95C787.5,799.55 786.95,793.04 786.95,786.42C786.95,755.54 797.76,728.89 819.38,706.5C841,684.1 866.93,672.91 897.16,672.91L899.8,672.91L894.51,667.61C891.42,664.52 889.93,660.88 890.04,656.69C890.15,652.5 891.75,648.86 894.84,645.77C897.93,642.68 901.57,641.14 905.76,641.14C909.96,641.14 913.6,642.68 916.68,645.77L949.78,678.86C953.97,683.06 956.07,688.02 956.07,693.76C956.07,699.49 953.97,704.46 949.78,708.65L916.68,741.75C913.6,744.84 909.96,746.38 905.76,746.38C901.57,746.38 897.93,744.84 894.84,741.75C891.75,738.66 890.21,734.96 890.21,730.66C890.21,726.36 891.75,722.66 894.84,719.57L899.8,714.61L898.15,714.61C878.95,714.61 862.57,721.61 849,735.62C835.43,749.63 828.65,766.57 828.65,786.42ZM972.28,786.42C972.28,783.34 972.12,780.41 971.79,777.66C971.46,774.9 970.96,772.08 970.3,769.22C968.75,763.48 968.75,757.85 970.3,752.34C971.84,746.82 975.15,742.52 980.23,739.43C985.3,736.34 990.54,735.62 995.95,737.28C1001.35,738.93 1005.05,742.3 1007.03,747.37C1009.46,753.77 1011.23,760.17 1012.33,766.57C1013.43,772.97 1013.98,779.59 1013.98,786.42C1013.98,817.31 1003.17,844.01 981.55,866.52C959.93,889.02 934,900.27 903.78,900.27L901.13,900.27L906.09,905.24C909.18,908.33 910.73,911.97 910.73,916.16C910.73,920.35 909.18,923.99 906.09,927.08C903.01,930.17 899.31,931.71 895.01,931.71C890.7,931.71 887.01,930.17 883.92,927.08L850.82,893.98C846.63,889.79 844.59,884.88 844.7,879.26C844.81,873.63 846.85,868.72 850.82,864.53L884.25,831.43C887.34,828.35 891.03,826.75 895.34,826.64C899.64,826.53 903.34,828.02 906.42,831.1C909.51,834.19 911.06,837.89 911.06,842.19C911.06,846.49 909.51,850.19 906.42,853.28L901.13,858.57L902.78,858.57C921.98,858.57 938.36,851.51 951.93,837.39C965.5,823.27 972.28,806.28 972.28,786.42Z" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#FF000000" android:pathData="M93.03,360.46L191.68,360.46C191.41,364.54 191.28,368.65 191.28,372.8C191.28,381.4 191.86,389.87 192.99,398.17L93.03,398.17C82.34,398.17 73.39,394.55 66.16,387.33C58.93,380.1 55.32,371.14 55.32,360.46L55.32,301.55C55.32,298.09 56.58,295.03 59.09,292.36C61.61,289.69 64.59,288.04 68.05,287.41C80.3,284.89 90.67,279.16 99.15,270.2C107.64,261.25 111.88,250.49 111.88,237.92C111.88,225.66 107.64,215.14 99.15,206.34C90.67,197.54 80.3,191.73 68.05,188.9C64.59,187.96 61.61,186.15 59.09,183.48C56.58,180.81 55.32,177.75 55.32,174.29L55.32,115.38C55.32,105.01 59.01,96.13 66.4,88.75C73.78,81.36 82.66,77.67 93.03,77.67L150.53,77.67C152.73,61.65 159.95,48.21 172.21,37.37C184.46,26.53 198.92,21.11 215.57,21.11C231.91,21.11 246.21,26.53 258.46,37.37C270.72,48.21 278.1,61.65 280.61,77.67L338.11,77.67C348.48,77.67 357.36,81.36 364.74,88.75C372.13,96.13 375.82,105.01 375.82,115.38L375.82,151.01C364.09,147.13 351.61,145.03 338.67,145.03C338.49,145.03 338.3,145.03 338.11,145.03L338.11,115.38L264.12,115.38C259.4,115.38 255.24,113.88 251.63,110.9C248.01,107.91 245.89,104.07 245.27,99.35L242.9,83.33C241.96,76.41 238.9,70.6 233.71,65.89C228.53,61.17 222.49,58.82 215.57,58.82C208.34,58.82 202.14,61.17 196.95,65.89C191.77,70.6 188.71,76.41 187.76,83.33L185.4,99.35C184.78,104.07 182.66,107.91 179.04,110.9C175.43,113.88 171.26,115.38 166.55,115.38L93.03,115.38L93.03,155.91C110.62,162.51 124.45,173.19 134.5,187.96C144.56,202.73 149.58,219.38 149.58,237.92C149.58,256.77 144.56,273.58 134.5,288.35C124.45,303.12 110.62,313.8 93.03,320.4Z" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#D8D8D8" android:pathData="M360.74,643.11a0.73,2.18 0,1 0,1.45 0a0.73,2.18 0,1 0,-1.45 0z" android:strokeColor="#000000" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#FF000000" android:pathData="M264.43,348.73C264.43,352.69 264.67,356.55 265.15,360.33C265.63,364.1 266.45,367.84 267.6,371.54C269,376.43 268.9,381.14 267.31,385.67C265.72,390.21 262.76,393.58 258.45,395.79C253.94,398.2 249.41,398.53 244.89,396.78C240.35,395.03 237.33,391.77 235.8,387.01C233.64,380.83 232.07,374.54 231.09,368.1C230.1,361.68 229.61,355.22 229.61,348.73C229.61,314.18 241.62,284.68 265.65,260.24C289.68,235.8 318.89,223.58 353.26,223.58L356.02,223.58L344.08,211.63C341.09,208.65 339.61,204.92 339.65,200.46C339.67,196 341.19,192.28 344.17,189.29C347.16,186.3 350.89,184.8 355.35,184.8C359.8,184.8 363.52,186.3 366.52,189.29L405.95,228.72C409.44,232.21 411.19,236.3 411.19,240.99C411.19,245.68 409.44,249.78 405.95,253.26L366.52,292.7C363.52,295.69 359.8,297.18 355.35,297.18C350.89,297.18 347.16,295.69 344.17,292.7C341.19,289.71 339.69,285.97 339.69,281.48C339.69,276.99 341.19,273.25 344.17,270.26L356.02,258.41L353.53,258.41C328.81,258.41 307.79,267.19 290.44,284.75C273.11,302.3 264.43,323.63 264.43,348.73ZM443.91,347.57C443.91,343.61 443.68,339.74 443.2,335.97C442.71,332.2 441.89,328.46 440.75,324.75C439.35,319.87 439.44,315.16 441.04,310.63C442.63,306.09 445.58,302.71 449.9,300.5C454.4,298.1 458.91,297.75 463.42,299.47C467.92,301.19 470.93,304.4 472.46,309.1C474.67,315.34 476.28,321.67 477.26,328.1C478.24,334.52 478.74,341.01 478.74,347.57C478.74,382.12 466.73,411.63 442.69,436.1C418.66,460.57 389.46,472.81 355.09,472.81L352.31,472.81L364.17,484.66C367.17,487.65 368.66,491.37 368.66,495.83C368.66,500.29 367.17,504.02 364.17,507.01C361.18,510 357.45,511.49 352.96,511.49C348.46,511.49 344.72,510 341.73,507.01L302.3,467.57C298.82,464.08 297.08,460.01 297.11,455.35C297.15,450.69 298.88,446.61 302.3,443.12L341.83,403.69C344.81,400.7 348.56,399.19 353.04,399.16C357.53,399.13 361.27,400.61 364.26,403.6C367.26,406.58 368.75,410.33 368.75,414.82C368.75,419.3 367.26,423.04 364.26,426.03L352.31,437.98L354.81,437.98C379.53,437.98 400.56,429.18 417.91,411.59C435.24,394.01 443.91,372.66 443.91,347.57Z" android:strokeWidth="1"/>
-    
-</vector>
diff --git a/app/src/main/res/drawable/face_24px.xml b/app/src/main/res/drawable/face_24px.xml
deleted file mode 100644
index 152c278e7..000000000
--- a/app/src/main/res/drawable/face_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M324.5,555.5Q310,541 310,520Q310,499 324.5,484.5Q339,470 360,470Q381,470 395.5,484.5Q410,499 410,520Q410,541 395.5,555.5Q381,570 360,570Q339,570 324.5,555.5ZM564.5,555.5Q550,541 550,520Q550,499 564.5,484.5Q579,470 600,470Q621,470 635.5,484.5Q650,499 650,520Q650,541 635.5,555.5Q621,570 600,570Q579,570 564.5,555.5ZM480,800Q614,800 707,707Q800,614 800,480Q800,456 797,433.5Q794,411 786,390Q765,395 744,397.5Q723,400 700,400Q609,400 528,361Q447,322 390,252Q358,330 298.5,387.5Q239,445 160,474Q160,476 160,477Q160,478 160,480Q160,614 253,707Q346,800 480,800ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM426,165Q468,235 540,277.5Q612,320 700,320Q714,320 727,318.5Q740,317 754,315Q712,245 640,202.5Q568,160 480,160Q466,160 453,161.5Q440,163 426,165ZM177,379Q228,350 266,304Q304,258 323,201Q272,230 234,276Q196,322 177,379ZM426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165ZM323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/filter_alt_24px.xml b/app/src/main/res/drawable/filter_alt_24px.xml
deleted file mode 100644
index 0afa9b51d..000000000
--- a/app/src/main/res/drawable/filter_alt_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,800Q423,800 411.5,788.5Q400,777 400,760L400,520L168,224Q153,204 163.5,182Q174,160 200,160L760,160Q786,160 796.5,182Q807,204 792,224L560,520L560,760Q560,777 548.5,788.5Q537,800 520,800L440,800ZM480,492L678,240L282,240L480,492ZM480,492L480,492L480,492Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/folder_24px.xml b/app/src/main/res/drawable/folder_24px.xml
deleted file mode 100644
index a1e978b69..000000000
--- a/app/src/main/res/drawable/folder_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L367,160Q383,160 397.5,166Q412,172 423,183L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L447,320L367,240Q367,240 367,240Q367,240 367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,320L160,320Q160,320 160,320Q160,320 160,320L160,720Q160,720 160,720Q160,720 160,720Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/font_download_24px.xml b/app/src/main/res/drawable/font_download_24px.xml
deleted file mode 100644
index 82f04c483..000000000
--- a/app/src/main/res/drawable/font_download_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M384,598L576,598L611,695Q615,706 625,713Q635,720 647,720Q667,720 679.5,703.5Q692,687 684,667L532,265Q527,254 517,247Q507,240 495,240L465,240Q453,240 443,247Q433,254 428,265L276,667Q268,686 280,703Q292,720 312,720Q325,720 334.5,713Q344,706 349,694L384,598ZM408,528L478,330L482,330L552,528L408,528ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,800Q880,833 856.5,856.5Q833,880 800,880L160,880ZM160,800L800,800Q800,800 800,800Q800,800 800,800L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,800Q160,800 160,800Q160,800 160,800ZM160,160L160,160Q160,160 160,160Q160,160 160,160L160,800Q160,800 160,800Q160,800 160,800L160,800Q160,800 160,800Q160,800 160,800L160,160Q160,160 160,160Q160,160 160,160Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/format_align_center_24px.xml b/app/src/main/res/drawable/format_align_center_24px.xml
deleted file mode 100644
index 8a425daa4..000000000
--- a/app/src/main/res/drawable/format_align_center_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,840Q143,840 131.5,828.5Q120,817 120,800Q120,783 131.5,771.5Q143,760 160,760L800,760Q817,760 828.5,771.5Q840,783 840,800Q840,817 828.5,828.5Q817,840 800,840L160,840ZM320,680Q303,680 291.5,668.5Q280,657 280,640Q280,623 291.5,611.5Q303,600 320,600L640,600Q657,600 668.5,611.5Q680,623 680,640Q680,657 668.5,668.5Q657,680 640,680L320,680ZM160,520Q143,520 131.5,508.5Q120,497 120,480Q120,463 131.5,451.5Q143,440 160,440L800,440Q817,440 828.5,451.5Q840,463 840,480Q840,497 828.5,508.5Q817,520 800,520L160,520ZM320,360Q303,360 291.5,348.5Q280,337 280,320Q280,303 291.5,291.5Q303,280 320,280L640,280Q657,280 668.5,291.5Q680,303 680,320Q680,337 668.5,348.5Q657,360 640,360L320,360ZM160,200Q143,200 131.5,188.5Q120,177 120,160Q120,143 131.5,131.5Q143,120 160,120L800,120Q817,120 828.5,131.5Q840,143 840,160Q840,177 828.5,188.5Q817,200 800,200L160,200Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/format_bold_24px.xml b/app/src/main/res/drawable/format_bold_24px.xml
deleted file mode 100644
index 61aa7f509..000000000
--- a/app/src/main/res/drawable/format_bold_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M352,760Q319,760 295.5,736.5Q272,713 272,680L272,280Q272,247 295.5,223.5Q319,200 352,200L493,200Q558,200 613,240Q668,280 668,351Q668,402 645,429.5Q622,457 602,469L602,469Q627,480 657.5,510Q688,540 688,600Q688,689 623,724.5Q558,760 501,760L352,760ZM393,648L497,648Q545,648 555.5,623.5Q566,599 566,588Q566,577 555.5,552.5Q545,528 494,528L393,528L393,648ZM393,420L486,420Q519,420 534,403Q549,386 549,365Q549,341 532,326Q515,311 488,311L393,311L393,420Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/format_color_fill_24px.xml b/app/src/main/res/drawable/format_color_fill_24px.xml
deleted file mode 100644
index 3dc2047e9..000000000
--- a/app/src/main/res/drawable/format_color_fill_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M332,28L647,343Q670,366 670,400Q670,434 647,457L457,647Q434,670 400,670Q366,670 343,647L153,457Q130,434 130,400Q130,366 153,343L343,152L275,84Q263,72 263.5,56Q264,40 276,28Q288,17 304,16.5Q320,16 332,28ZM400,209L209,400Q209,400 209,400Q209,400 209,400L591,400Q591,400 591,400Q591,400 591,400L400,209ZM703.5,656.5Q680,633 680,600Q680,579 692.5,555Q705,531 720,510Q729,498 739,485Q749,472 760,460Q771,472 781,485Q791,498 800,510Q815,531 827.5,555Q840,579 840,600Q840,633 816.5,656.5Q793,680 760,680Q727,680 703.5,656.5ZM160,960Q127,960 103.5,936.5Q80,913 80,880Q80,847 103.5,823.5Q127,800 160,800L800,800Q833,800 856.5,823.5Q880,847 880,880Q880,913 856.5,936.5Q833,960 800,960L160,960Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/format_color_text_24px.xml b/app/src/main/res/drawable/format_color_text_24px.xml
deleted file mode 100644
index e1d88be33..000000000
--- a/app/src/main/res/drawable/format_color_text_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,960Q103,960 91.5,948.5Q80,937 80,920L80,840Q80,823 91.5,811.5Q103,800 120,800L840,800Q857,800 868.5,811.5Q880,823 880,840L880,920Q880,937 868.5,948.5Q857,960 840,960L120,960ZM285,680Q262,680 248.5,660.5Q235,641 243,619L419,150Q424,136 436,128Q448,120 462,120L498,120Q513,120 524.5,128Q536,136 541,150L718,620Q726,642 712.5,661Q699,680 676,680Q662,680 650,672Q638,664 633,650L594,536L368,536L327,651Q322,665 310.5,672.5Q299,680 285,680ZM396,456L564,456L482,224L478,224L396,456Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/format_italic_24px.xml b/app/src/main/res/drawable/format_italic_24px.xml
deleted file mode 100644
index 0f69910e8..000000000
--- a/app/src/main/res/drawable/format_italic_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M250,760Q229,760 214.5,745.5Q200,731 200,710Q200,689 214.5,674.5Q229,660 250,660L360,660L480,300L370,300Q349,300 334.5,285.5Q320,271 320,250Q320,229 334.5,214.5Q349,200 370,200L670,200Q691,200 705.5,214.5Q720,229 720,250Q720,271 705.5,285.5Q691,300 670,300L580,300L460,660L550,660Q571,660 585.5,674.5Q600,689 600,710Q600,731 585.5,745.5Q571,760 550,760L250,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/format_paint_24px.xml b/app/src/main/res/drawable/format_paint_24px.xml
deleted file mode 100644
index b27cf246e..000000000
--- a/app/src/main/res/drawable/format_paint_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,880Q407,880 383.5,856.5Q360,833 360,800L360,640L240,640Q207,640 183.5,616.5Q160,593 160,560L160,280Q160,214 207,167Q254,120 320,120L760,120Q777,120 788.5,131.5Q800,143 800,160L800,560Q800,593 776.5,616.5Q753,640 720,640L600,640L600,800Q600,833 576.5,856.5Q553,880 520,880L440,880ZM240,400L720,400L720,200L680,200L680,320Q680,337 668.5,348.5Q657,360 640,360Q623,360 611.5,348.5Q600,337 600,320L600,200L560,200L560,240Q560,257 548.5,268.5Q537,280 520,280Q503,280 491.5,268.5Q480,257 480,240L480,200L320,200Q287,200 263.5,223.5Q240,247 240,280L240,400ZM240,560L720,560Q720,560 720,560Q720,560 720,560L720,480L240,480L240,560Q240,560 240,560Q240,560 240,560ZM240,560Q240,560 240,560Q240,560 240,560L240,480L240,480L240,560Q240,560 240,560Q240,560 240,560Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/hard_drive_24px.xml b/app/src/main/res/drawable/hard_drive_24px.xml
deleted file mode 100644
index 45fecb4d2..000000000
--- a/app/src/main/res/drawable/hard_drive_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,680L800,680Q800,680 800,680Q800,680 800,680L800,440L160,440L160,680Q160,680 160,680Q160,680 160,680ZM722.5,602.5Q740,585 740,560Q740,535 722.5,517.5Q705,500 680,500Q655,500 637.5,517.5Q620,535 620,560Q620,585 637.5,602.5Q655,620 680,620Q705,620 722.5,602.5ZM880,360L767,360L687,280L273,280L193,360L80,360L217,223Q228,212 242.5,206Q257,200 273,200L687,200Q703,200 717.5,206Q732,212 743,223L880,360ZM160,760Q127,760 103.5,736.5Q80,713 80,680L80,360L880,360L880,680Q880,713 856.5,736.5Q833,760 800,760L160,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/high_res_24px.xml b/app/src/main/res/drawable/high_res_24px.xml
deleted file mode 100644
index 183f2ae69..000000000
--- a/app/src/main/res/drawable/high_res_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M240,660L264,660L293,724Q296,732 303,736Q310,740 318,740Q333,740 341.5,728Q350,716 344,702L324,656Q339,647 349.5,632.5Q360,618 360,600L360,560Q360,535 342.5,517.5Q325,500 300,500L220,500Q203,500 191.5,511.5Q180,523 180,540L180,710Q180,723 188.5,731.5Q197,740 210,740Q223,740 231.5,731.5Q240,723 240,710L240,660ZM530,740Q543,740 551.5,731.5Q560,723 560,710Q560,697 551.5,688.5Q543,680 530,680L460,680L460,650L510,650Q523,650 531.5,641.5Q540,633 540,620Q540,607 531.5,598.5Q523,590 510,590L460,590L460,560L530,560Q543,560 551.5,551.5Q560,543 560,530Q560,517 551.5,508.5Q543,500 530,500L440,500Q423,500 411.5,511.5Q400,523 400,540L400,700Q400,717 411.5,728.5Q423,740 440,740L530,740ZM720,680L630,680Q617,680 608.5,688.5Q600,697 600,710Q600,723 608.5,731.5Q617,740 630,740L740,740Q757,740 768.5,728.5Q780,717 780,700L780,640Q780,623 768.5,611.5Q757,600 740,600L660,600L660,560L750,560Q763,560 771.5,551.5Q780,543 780,530Q780,517 771.5,508.5Q763,500 750,500L640,500Q623,500 611.5,511.5Q600,523 600,540L600,600Q600,617 611.5,628.5Q623,640 640,640L720,640L720,680ZM240,600L240,560L300,560Q300,560 300,560Q300,560 300,560L300,600Q300,600 300,600Q300,600 300,600L240,600ZM360,370L420,370L420,430Q420,443 428.5,451.5Q437,460 450,460Q463,460 471.5,451.5Q480,443 480,430L480,250Q480,237 471.5,228.5Q463,220 450,220Q437,220 428.5,228.5Q420,237 420,250L420,310L360,310L360,250Q360,237 351.5,228.5Q343,220 330,220Q317,220 308.5,228.5Q300,237 300,250L300,430Q300,443 308.5,451.5Q317,460 330,460Q343,460 351.5,451.5Q360,443 360,430L360,370ZM580,250L580,430Q580,443 588.5,451.5Q597,460 610,460Q623,460 631.5,451.5Q640,443 640,430L640,250Q640,237 631.5,228.5Q623,220 610,220Q597,220 588.5,228.5Q580,237 580,250ZM120,840Q87,840 63.5,816.5Q40,793 40,760L40,200Q40,167 63.5,143.5Q87,120 120,120L840,120Q873,120 896.5,143.5Q920,167 920,200L920,760Q920,793 896.5,816.5Q873,840 840,840L120,840ZM120,760L840,760Q840,760 840,760Q840,760 840,760L840,200Q840,200 840,200Q840,200 840,200L120,200Q120,200 120,200Q120,200 120,200L120,760Q120,760 120,760Q120,760 120,760ZM120,760Q120,760 120,760Q120,760 120,760L120,200Q120,200 120,200Q120,200 120,200L120,200Q120,200 120,200Q120,200 120,200L120,760Q120,760 120,760Q120,760 120,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/history_toggle_off_24px.xml b/app/src/main/res/drawable/history_toggle_off_24px.xml
deleted file mode 100644
index 30186016c..000000000
--- a/app/src/main/res/drawable/history_toggle_off_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M196.5,254Q185,242 185,225Q185,208 196.5,196.5Q208,185 225,185Q242,185 254,196.5Q266,208 266,225Q266,242 254,254Q242,266 225,266Q208,266 196.5,254ZM358,161Q346,149 346,132Q346,115 358,103.5Q370,92 387,92Q404,92 415.5,103.5Q427,115 427,132Q427,149 415.5,161Q404,173 387,173Q370,173 358,161ZM544.5,161Q533,149 533,132Q533,115 544.5,103.5Q556,92 573,92Q590,92 602,103.5Q614,115 614,132Q614,149 602,161Q590,173 573,173Q556,173 544.5,161ZM706,254Q694,242 694,225Q694,208 706,196Q718,184 735,184Q752,184 763.5,196Q775,208 775,225Q775,242 763.5,254Q752,266 735,266Q718,266 706,254ZM799,415.5Q787,404 787,387Q787,370 799,358.5Q811,347 828,347Q845,347 856.5,358.5Q868,370 868,387Q868,404 856.5,415.5Q845,427 828,427Q811,427 799,415.5ZM799,602Q787,590 787,573Q787,556 799,544.5Q811,533 828,533Q845,533 856.5,544.5Q868,556 868,573Q868,590 856.5,602Q845,614 828,614Q811,614 799,602ZM706,763.5Q694,752 694,735Q694,718 706,706Q718,694 735,694Q752,694 763.5,706Q775,718 775,735Q775,752 763.5,763.5Q752,775 735,775Q718,775 706,763.5ZM544.5,856.5Q533,845 533,828Q533,811 544.5,799Q556,787 573,787Q590,787 602,799Q614,811 614,828Q614,845 602,856.5Q590,868 573,868Q556,868 544.5,856.5ZM358,856.5Q346,845 346,828Q346,811 358,799Q370,787 387,787Q404,787 415.5,799Q427,811 427,828Q427,845 415.5,856.5Q404,868 387,868Q370,868 358,856.5ZM196.5,762.5Q185,751 185,734Q185,717 196.5,705.5Q208,694 225,694Q242,694 253.5,705.5Q265,717 265,734Q265,751 253.5,762.5Q242,774 225,774Q208,774 196.5,762.5ZM132,613Q115,613 103.5,601Q92,589 92,572Q92,555 103.5,543.5Q115,532 132,532Q149,532 161,543.5Q173,555 173,572Q173,589 161,601Q149,613 132,613ZM132,427Q115,427 103.5,415.5Q92,404 92,387Q92,370 103.5,358Q115,346 132,346Q149,346 161,358Q173,370 173,387Q173,404 161,415.5Q149,427 132,427ZM520,464L640,584Q651,595 651,612Q651,629 640,640Q629,651 612,651Q595,651 584,640L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_clock_24.xml b/app/src/main/res/drawable/ic_baseline_clock_24.xml
deleted file mode 100644
index 3436c6208..000000000
--- a/app/src/main/res/drawable/ic_baseline_clock_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:pathData="m612,668 l56,-56 -148,-148v-184h-80v216l172,172ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,480ZM480,800q133,0 226.5,-93.5T800,480q0,-133 -93.5,-226.5T480,160q-133,0 -226.5,93.5T160,480q0,133 93.5,226.5T480,800Z"
-      android:fillColor="#e3e3e3"/>
-</vector>
diff --git a/app/src/main/res/drawable/imagesearch_roller_24px.xml b/app/src/main/res/drawable/imagesearch_roller_24px.xml
deleted file mode 100644
index 184f6f60a..000000000
--- a/app/src/main/res/drawable/imagesearch_roller_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M600,920L440,920Q423,920 411.5,908.5Q400,897 400,880L400,640Q400,623 411.5,611.5Q423,600 440,600L480,600L480,480Q480,480 480,480Q480,480 480,480L160,480Q127,480 103.5,456.5Q80,433 80,400L80,240Q80,207 103.5,183.5Q127,160 160,160L240,160L240,120Q240,103 251.5,91.5Q263,80 280,80L760,80Q777,80 788.5,91.5Q800,103 800,120L800,280Q800,297 788.5,308.5Q777,320 760,320L280,320Q263,320 251.5,308.5Q240,297 240,280L240,240L160,240Q160,240 160,240Q160,240 160,240L160,400Q160,400 160,400Q160,400 160,400L480,400Q513,400 536.5,423.5Q560,447 560,480L560,600L600,600Q617,600 628.5,611.5Q640,623 640,640L640,880Q640,897 628.5,908.5Q617,920 600,920ZM480,840L560,840L560,680L480,680L480,840ZM320,240L720,240L720,160L320,160L320,240ZM480,840L480,840L560,840L560,840L480,840ZM320,240L320,160L320,160L320,240Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/keyboard_arrow_left_24px.xml b/app/src/main/res/drawable/keyboard_arrow_left_24px.xml
deleted file mode 100644
index b4b89a922..000000000
--- a/app/src/main/res/drawable/keyboard_arrow_left_24px.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M432,480L588,636Q599,647 599,664Q599,681 588,692Q577,703 560,703Q543,703 532,692L348,508Q342,502 339.5,495Q337,488 337,480Q337,472 339.5,465Q342,458 348,452L532,268Q543,257 560,257Q577,257 588,268Q599,279 599,296Q599,313 588,324L432,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/keyboard_double_arrow_right_24px.xml b/app/src/main/res/drawable/keyboard_double_arrow_right_24px.xml
deleted file mode 100644
index 2e564cea4..000000000
--- a/app/src/main/res/drawable/keyboard_double_arrow_right_24px.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M383,480L228,324Q217,313 216.5,296.5Q216,280 228,268Q239,257 256,257Q273,257 284,268L468,452Q474,458 476.5,465Q479,472 479,480Q479,488 476.5,495Q474,502 468,508L284,692Q273,703 256.5,703.5Q240,704 228,692Q217,681 217,664Q217,647 228,636L383,480ZM647,480L492,324Q481,313 480.5,296.5Q480,280 492,268Q503,257 520,257Q537,257 548,268L732,452Q738,458 740.5,465Q743,472 743,480Q743,488 740.5,495Q738,502 732,508L548,692Q537,703 520.5,703.5Q504,704 492,692Q481,681 481,664Q481,647 492,636L647,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/label_24px.xml b/app/src/main/res/drawable/label_24px.xml
deleted file mode 100644
index fb1d1b506..000000000
--- a/app/src/main/res/drawable/label_24px.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L600,160Q619,160 636,168.5Q653,177 664,192L844,432Q860,453 860,480Q860,507 844,528L664,768Q653,783 636,791.5Q619,800 600,800L160,800ZM160,720L600,720Q600,720 600,720Q600,720 600,720L780,480Q780,480 780,480Q780,480 780,480L600,240Q600,240 600,240Q600,240 600,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/language_download.xml b/app/src/main/res/drawable/language_download.xml
deleted file mode 100644
index 129dd4eea..000000000
--- a/app/src/main/res/drawable/language_download.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="512" android:viewportWidth="512" android:width="24dp">
-      
-    <path android:fillColor="#FF000000" android:pathData="M136.4,255.92C142.82,251.93 146.02,245.95 146.02,237.98C146.02,230 142.82,223.93 136.4,219.77C129.99,215.61 122.27,213.53 113.26,213.53C104.23,213.53 96.53,215.61 90.11,219.77C83.7,223.93 80.48,230 80.48,237.98C80.48,245.95 83.7,251.93 90.11,255.92C96.53,259.91 104.23,261.9 113.26,261.9C122.27,261.9 129.99,259.91 136.4,255.92ZM51.36,183.37C48.24,183.37 45.55,182.24 43.3,179.98C41.05,177.73 39.92,175.04 39.92,171.92C39.92,168.8 41.05,166.11 43.3,163.86C45.55,161.61 48.24,160.48 51.36,160.48L99.21,160.48L99.21,144.88C99.21,141.06 100.51,137.85 103.11,135.26C105.72,132.65 108.92,131.35 112.72,131.35C116.54,131.35 119.75,132.65 122.35,135.26C124.96,137.85 126.25,141.06 126.25,144.88L126.25,160.48L174.63,160.48C177.75,160.48 180.43,161.61 182.68,163.86C184.95,166.11 186.07,168.8 186.07,171.92C186.07,175.04 184.95,177.73 182.68,179.98C180.43,182.24 177.75,183.37 174.63,183.37ZM113.26,284.79C96.95,284.79 83,280.71 71.39,272.56C59.77,264.42 53.96,252.88 53.96,237.98C53.96,222.72 59.77,211.1 71.39,203.13C83,195.15 96.95,191.16 113.26,191.16C129.89,191.16 144.03,195.15 155.65,203.13C167.26,211.1 173.06,222.72 173.06,237.98C173.06,253.23 167.26,264.85 155.65,272.82C144.03,280.8 129.89,284.79 113.26,284.79ZM96.09,368.52C90.2,368.52 85.25,366.53 81.27,362.54C77.28,358.55 75.29,353.61 75.29,347.72L75.29,309.23C75.29,305.41 76.68,302.21 79.44,299.61C82.23,297.01 85.51,295.71 89.33,295.71C93.15,295.71 96.35,297.01 98.96,299.61C101.54,302.21 102.86,305.41 102.86,309.23L102.86,345.64L228.71,345.64C231.84,345.64 234.52,346.76 236.78,349.02C239.03,351.27 240.16,353.96 240.16,357.08C240.16,360.2 239.03,362.89 236.78,365.14C234.52,367.39 231.84,368.52 228.71,368.52ZM216.24,313.91C212.42,313.91 209.22,312.61 206.61,310.01C204.01,307.41 202.71,304.2 202.71,300.39L202.71,144.36C202.71,140.54 204.01,137.42 206.61,134.99C209.22,132.57 212.42,131.35 216.24,131.35C220.04,131.35 223.16,132.57 225.59,134.99C228.02,137.42 229.23,140.54 229.23,144.36L229.23,209.37L253.68,209.37C256.8,209.37 259.49,210.5 261.74,212.75C264,215.01 265.12,217.69 265.12,220.81C265.12,223.93 264,226.62 261.74,228.87C259.49,231.13 256.8,232.25 253.68,232.25L229.75,232.25L229.75,300.39C229.75,304.2 228.45,307.41 225.85,310.01C223.26,312.61 220.04,313.91 216.24,313.91ZM366.02,325.87C370.16,325.87 374.26,325.46 378.3,324.64C377.75,329.28 377.46,334.09 377.46,338.95C377.46,345.5 377.98,351.93 378.97,358C371,360.16 362.7,361.24 354.06,361.24C334.3,361.24 318.7,355.61 307.25,344.34C295.81,333.07 290.09,317.72 290.09,298.31C290.09,280.28 295.81,265.54 307.25,254.1C318.7,242.66 337.07,233.47 362.38,226.54C370.36,224.45 379.11,222.55 388.65,220.81C398.18,219.08 408.5,217.52 419.6,216.13C418.9,199.83 415.09,187.96 408.15,180.51C401.22,173.05 390.47,169.32 375.91,169.32C368.63,169.32 361.52,170.36 354.58,172.44C347.65,174.52 339.5,177.99 330.14,182.85C325.98,185.27 321.64,185.97 317.14,184.92C312.63,183.88 309.16,181.28 306.73,177.12C304.3,172.96 303.79,168.54 305.17,163.86C306.56,159.18 309.33,155.63 313.49,153.2C324.24,147.31 335.77,142.54 348.08,138.9C360.39,135.26 372.96,133.43 385.79,133.43C410.41,133.43 429.13,141.06 441.96,156.32C454.79,171.57 461.2,193.76 461.2,222.89L461.2,339.4C461.2,344.25 459.56,348.33 456.26,351.62C452.97,354.91 448.89,356.56 444.04,356.56L441.44,356.56C437.76,356.56 434.54,355.58 431.78,353.61C432.36,348.86 432.66,343.94 432.66,338.95C432.66,323.44 429.76,308.57 424.58,297.6C423.06,294.39 421.39,291.59 419.6,289.24L419.6,244.74C411.62,245.78 404.25,246.99 397.49,248.38C390.73,249.76 384.4,251.33 378.51,253.06C362.9,257.91 351.2,263.98 343.4,271.26C335.6,278.54 331.7,287.04 331.7,296.75C331.7,305.76 334.82,312.87 341.06,318.07C347.3,323.27 355.62,325.87 366.02,325.87Z" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#FF000000" android:pathData="M391.57,421.49L391.57,300.92C391.57,297.39 392.78,294.41 395.21,291.98C397.63,289.56 400.61,288.35 404.14,288.35C407.66,288.35 410.64,289.56 413.07,291.98C415.49,294.41 416.71,297.39 416.71,300.92L416.71,421.49L468.27,369.92C470.79,367.4 473.74,366.18 477.13,366.25C480.52,366.32 483.47,367.61 485.99,370.13C488.32,372.65 489.52,375.6 489.6,378.99C489.67,382.37 488.44,385.33 485.92,387.85L413,460.77C411.76,462.01 410.38,462.91 408.87,463.48C407.37,464.05 405.79,464.34 404.14,464.34C402.49,464.34 400.91,464.05 399.4,463.48C397.89,462.91 396.52,462.01 395.28,460.77L322.29,387.78C319.91,385.4 318.72,382.49 318.72,379.06C318.72,375.63 319.91,372.65 322.29,370.13C324.8,367.61 327.79,366.35 331.25,366.35C334.7,366.35 337.69,367.61 340.21,370.13L391.57,421.49Z" android:strokeWidth="1"/>
-    
-</vector>
diff --git a/app/src/main/res/drawable/language_download2.xml b/app/src/main/res/drawable/language_download2.xml
deleted file mode 100644
index 30cb8bf13..000000000
--- a/app/src/main/res/drawable/language_download2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M116.73,212.35C123.15,208.37 126.36,202.38 126.36,194.41C126.36,186.43 123.15,180.37 116.73,176.21C110.32,172.05 102.61,169.96 93.6,169.96C84.57,169.96 76.87,172.05 70.44,176.21C64.04,180.37 60.82,186.43 60.82,194.41C60.82,202.38 64.04,208.37 70.44,212.35C76.87,216.34 84.57,218.33 93.6,218.33C102.61,218.33 110.32,216.34 116.73,212.35ZM31.69,139.8C28.57,139.8 25.89,138.67 23.64,136.42C21.39,134.16 20.26,131.48 20.26,128.36C20.26,125.24 21.39,122.55 23.64,120.3C25.89,118.04 28.57,116.91 31.69,116.91L79.55,116.91L79.55,101.31C79.55,97.5 80.85,94.29 83.45,91.69C86.06,89.09 89.26,87.79 93.06,87.79C96.88,87.79 100.08,89.09 102.69,91.69C105.29,94.29 106.59,97.5 106.59,101.31L106.59,116.91L154.96,116.91C158.09,116.91 160.77,118.04 163.02,120.3C165.29,122.55 166.4,125.24 166.4,128.36C166.4,131.48 165.29,134.16 163.02,136.42C160.77,138.67 158.09,139.8 154.96,139.8L31.69,139.8ZM93.6,241.22C77.29,241.22 63.34,237.15 51.72,228.99C40.11,220.85 34.3,209.32 34.3,194.41C34.3,179.15 40.11,167.54 51.72,159.56C63.34,151.59 77.29,147.6 93.6,147.6C110.23,147.6 124.37,151.59 135.99,159.56C147.6,167.54 153.39,179.15 153.39,194.41C153.39,209.66 147.6,221.28 135.99,229.26C124.37,237.23 110.23,241.22 93.6,241.22ZM76.43,324.95C70.54,324.95 65.59,322.96 61.61,318.98C57.61,314.99 55.62,310.05 55.62,304.15L55.62,265.66C55.62,261.85 57.01,258.64 59.78,256.04C62.56,253.44 65.85,252.14 69.67,252.14C73.49,252.14 76.69,253.44 79.29,256.04C81.88,258.64 83.19,261.85 83.19,265.66L83.19,302.07L209.05,302.07C212.17,302.07 214.86,303.2 217.12,305.45C219.37,307.71 220.5,310.39 220.5,313.52C220.5,316.63 219.37,319.32 217.12,321.57C214.86,323.83 212.17,324.95 209.05,324.95L76.43,324.95ZM196.58,270.34C192.76,270.34 189.55,269.05 186.95,266.45C184.35,263.84 183.05,260.64 183.05,256.82L183.05,100.79C183.05,96.98 184.35,93.86 186.95,91.43C189.55,89 192.76,87.79 196.58,87.79C200.38,87.79 203.5,89 205.93,91.43C208.35,93.86 209.57,96.98 209.57,100.79L209.57,165.8L234.02,165.8C237.14,165.8 239.83,166.93 242.08,169.19C244.33,171.44 245.46,174.13 245.46,177.24C245.46,180.37 244.33,183.05 242.08,185.31C239.83,187.56 237.14,188.69 234.02,188.69L210.09,188.69L210.09,256.82C210.09,260.64 208.79,263.84 206.19,266.45C203.6,269.05 200.38,270.34 196.58,270.34ZM323.74,227.7C315.94,234.98 312.04,243.47 312.04,253.18C312.04,262.2 315.16,269.3 321.4,274.51C326.98,279.16 334.23,281.73 343.15,282.22C343.37,294.21 343.97,305.94 344.92,317.12C341.47,317.49 337.96,317.67 334.4,317.67C314.64,317.67 299.03,312.04 287.59,300.77C276.15,289.5 270.43,274.16 270.43,254.74C270.43,236.71 276.15,221.98 287.59,210.53C299.03,199.09 317.41,189.9 342.72,182.97C345.48,182.25 348.33,181.55 351.28,180.87C349.14,190.85 347.39,202.07 346.06,214.1C336.68,218.03 329.24,222.56 323.74,227.7L323.74,227.7ZM399.93,172.56C399.24,156.27 395.43,144.39 388.49,136.94C381.55,129.48 370.81,125.76 356.24,125.76C348.96,125.76 341.86,126.79 334.92,128.88C327.98,130.96 319.84,134.43 310.47,139.28C306.31,141.71 301.98,142.4 297.47,141.36C292.96,140.32 289.5,137.72 287.07,133.56C284.64,129.4 284.12,124.97 285.51,120.3C286.9,115.61 289.67,112.06 293.83,109.63C304.58,103.74 316.11,98.97 328.42,95.33C340.73,91.69 353.3,89.87 366.13,89.87C390.74,89.87 409.47,97.5 422.3,112.75C435.13,128.01 441.54,150.2 441.54,179.33L441.54,295.83C441.54,300.68 439.89,304.76 436.6,308.05C433.31,311.35 429.23,312.99 424.38,312.99L421.78,312.99C417.27,312.99 413.46,311.52 410.33,308.57C407.91,306.28 406.22,303.63 405.26,300.61C405.75,291.13 406.01,281.37 406.01,271.5C406.01,235.85 402.69,201.65 396.79,176.45C396.52,175.3 396.24,174.17 395.97,173.07C397.28,172.9 398.6,172.73 399.93,172.56Z"
-      android:strokeWidth="1"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M358.81,394.22L358.81,224.77C358.81,219.82 360.51,215.63 363.92,212.22C367.33,208.81 371.52,207.11 376.47,207.11C381.43,207.11 385.61,208.81 389.02,212.22C392.43,215.63 394.14,219.82 394.14,224.77L394.14,394.22L466.61,321.75C470.15,318.21 474.3,316.49 479.06,316.59C483.82,316.69 487.97,318.51 491.51,322.05C494.79,325.59 496.48,329.74 496.58,334.5C496.68,339.26 494.95,343.4 491.42,346.95L388.92,449.44C387.18,451.17 385.25,452.44 383.13,453.24C381.01,454.05 378.79,454.45 376.47,454.45C374.15,454.45 371.93,454.05 369.82,453.24C367.69,452.44 365.76,451.17 364.02,449.44L261.44,346.85C258.1,343.51 256.43,339.42 256.43,334.6C256.43,329.77 258.1,325.59 261.44,322.05C264.98,318.51 269.18,316.74 274.04,316.74C278.89,316.74 283.09,318.51 286.63,322.05L358.81,394.22Z"
-      android:strokeWidth="1"/>
-</vector>
diff --git a/app/src/main/res/drawable/language_korean_latin_24px.xml b/app/src/main/res/drawable/language_korean_latin_24px.xml
deleted file mode 100644
index 55bf0cf21..000000000
--- a/app/src/main/res/drawable/language_korean_latin_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M260.5,491.5Q279,480 279,457Q279,434 260.5,422Q242,410 216,410Q190,410 171.5,422Q153,434 153,457Q153,480 171.5,491.5Q190,503 216,503Q242,503 260.5,491.5ZM97,352Q88,352 81.5,345.5Q75,339 75,330Q75,321 81.5,314.5Q88,308 97,308L189,308L189,278Q189,267 196.5,259.5Q204,252 215,252Q226,252 233.5,259.5Q241,267 241,278L241,308L334,308Q343,308 349.5,314.5Q356,321 356,330Q356,339 349.5,345.5Q343,352 334,352L97,352ZM216,547Q169,547 135.5,523.5Q102,500 102,457Q102,413 135.5,390Q169,367 216,367Q264,367 297.5,390Q331,413 331,457Q331,501 297.5,524Q264,547 216,547ZM183,708Q166,708 154.5,696.5Q143,685 143,668L143,594Q143,583 151,575.5Q159,568 170,568Q181,568 188.5,575.5Q196,583 196,594L196,664L438,664Q447,664 453.5,670.5Q460,677 460,686Q460,695 453.5,701.5Q447,708 438,708L183,708ZM414,603Q403,603 395.5,595.5Q388,588 388,577L388,277Q388,266 395.5,259Q403,252 414,252Q425,252 432,259Q439,266 439,277L439,402L486,402Q495,402 501.5,408.5Q508,415 508,424Q508,433 501.5,439.5Q495,446 486,446L440,446L440,577Q440,588 432.5,595.5Q425,603 414,603ZM702,626Q730,626 756.5,613Q783,600 805,576L805,470Q782,473 762.5,477Q743,481 726,486Q681,500 658.5,521Q636,542 636,570Q636,596 654,611Q672,626 702,626ZM679,694Q622,694 589,661.5Q556,629 556,573Q556,521 589,488Q622,455 695,435Q718,429 745.5,424Q773,419 805,415L805,415Q803,368 783,346.5Q763,325 721,325Q700,325 680,331Q660,337 633,351Q621,358 608,355Q595,352 588,340Q581,328 585,314.5Q589,301 601,294Q632,277 667.5,266.5Q703,256 740,256Q811,256 848,300Q885,344 885,428L885,652Q885,666 875.5,675.5Q866,685 852,685L847,685Q834,685 825,676.5Q816,668 814,656L812,640Q784,665 750.5,679.5Q717,694 679,694Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/light_mode_24px.xml b/app/src/main/res/drawable/light_mode_24px.xml
deleted file mode 100644
index 8d278ec46..000000000
--- a/app/src/main/res/drawable/light_mode_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M565,565Q600,530 600,480Q600,430 565,395Q530,360 480,360Q430,360 395,395Q360,430 360,480Q360,530 395,565Q430,600 480,600Q530,600 565,565ZM338.5,621.5Q280,563 280,480Q280,397 338.5,338.5Q397,280 480,280Q563,280 621.5,338.5Q680,397 680,480Q680,563 621.5,621.5Q563,680 480,680Q397,680 338.5,621.5ZM80,520Q63,520 51.5,508.5Q40,497 40,480Q40,463 51.5,451.5Q63,440 80,440L160,440Q177,440 188.5,451.5Q200,463 200,480Q200,497 188.5,508.5Q177,520 160,520L80,520ZM800,520Q783,520 771.5,508.5Q760,497 760,480Q760,463 771.5,451.5Q783,440 800,440L880,440Q897,440 908.5,451.5Q920,463 920,480Q920,497 908.5,508.5Q897,520 880,520L800,520ZM451.5,188.5Q440,177 440,160L440,80Q440,63 451.5,51.5Q463,40 480,40Q497,40 508.5,51.5Q520,63 520,80L520,160Q520,177 508.5,188.5Q497,200 480,200Q463,200 451.5,188.5ZM451.5,908.5Q440,897 440,880L440,800Q440,783 451.5,771.5Q463,760 480,760Q497,760 508.5,771.5Q520,783 520,800L520,880Q520,897 508.5,908.5Q497,920 480,920Q463,920 451.5,908.5ZM226,282L183,240Q171,229 171.5,212Q172,195 183,183Q195,171 212,171Q229,171 240,183L282,226Q293,238 293,254Q293,270 282,282Q271,294 254.5,293.5Q238,293 226,282ZM720,777L678,734Q667,722 667,705.5Q667,689 678,678Q689,666 705.5,666.5Q722,667 734,678L777,720Q789,731 788.5,748Q788,765 777,777Q765,789 748,789Q731,789 720,777ZM678,282Q666,271 666.5,254.5Q667,238 678,226L720,183Q731,171 748,171.5Q765,172 777,183Q789,195 789,212Q789,229 777,240L734,282Q722,293 706,293Q690,293 678,282ZM183,777Q171,765 171,748Q171,731 183,720L226,678Q238,667 254.5,667Q271,667 282,678Q294,689 293.5,705.5Q293,722 282,734L240,777Q229,789 212,788.5Q195,788 183,777ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/lock_icon_bg.xml b/app/src/main/res/drawable/lock_icon_bg.xml
deleted file mode 100644
index 7d5a233e7..000000000
--- a/app/src/main/res/drawable/lock_icon_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/primaryGrayBackground" />
-</shape>
diff --git a/app/src/main/res/drawable/match_word_24px.xml b/app/src/main/res/drawable/match_word_24px.xml
deleted file mode 100644
index d2a7334f8..000000000
--- a/app/src/main/res/drawable/match_word_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,761Q87,761 63.5,737.5Q40,714 40,681L40,601Q40,584 51.5,572.5Q63,561 80,561Q97,561 108.5,572.5Q120,584 120,601L120,681Q120,681 120,681Q120,681 120,681L840,681Q840,681 840,681Q840,681 840,681L840,601Q840,584 851.5,572.5Q863,561 880,561Q897,561 908.5,572.5Q920,584 920,601L920,681Q920,714 896.5,737.5Q873,761 840,761L120,761ZM294,609Q245,609 217,583.5Q189,558 189,514Q189,472 221.5,445.5Q254,419 305,419Q328,419 347.5,422.5Q367,426 381,434L381,420Q381,393 362.5,377Q344,361 312,361Q297,361 283.5,365.5Q270,370 259,378Q250,385 239.5,386Q229,387 220,380Q211,373 209,362.5Q207,352 215,344Q233,327 257.5,318Q282,309 313,309Q375,309 408,338.5Q441,368 441,424L441,571Q441,583 432.5,591.5Q424,600 412,600Q399,600 390.5,591.5Q382,583 382,570L382,566L379,566Q366,586 344,597.5Q322,609 294,609ZM316,466Q284,466 267,478.5Q250,491 250,514Q250,534 265,546.5Q280,559 304,559Q336,559 358.5,536.5Q381,514 381,482Q367,474 349,470Q331,466 316,466ZM653,609Q612,609 590.5,591Q569,573 563,563L560,563L560,576Q560,588 551.5,596.5Q543,605 531,605Q519,605 510,596Q501,587 501,575L501,230Q501,217 510,208Q519,199 532,199Q545,199 554,208Q563,217 563,230L563,312L560,352L563,352Q566,347 587,326.5Q608,306 653,306Q717,306 754,352Q791,398 791,458Q791,518 754.5,563.5Q718,609 653,609ZM644,362Q604,362 582,391.5Q560,421 560,457Q560,494 582,523Q604,552 644,552Q684,552 706.5,523Q729,494 729,457Q729,420 706.5,391Q684,362 644,362Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/memory_24px.xml b/app/src/main/res/drawable/memory_24px.xml
deleted file mode 100644
index 7e4dd5e9b..000000000
--- a/app/src/main/res/drawable/memory_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,560L360,400Q360,383 371.5,371.5Q383,360 400,360L560,360Q577,360 588.5,371.5Q600,383 600,400L600,560Q600,577 588.5,588.5Q577,600 560,600L400,600Q383,600 371.5,588.5Q360,577 360,560ZM440,520L520,520L520,440L440,440L440,520ZM360,800L360,760L280,760Q247,760 223.5,736.5Q200,713 200,680L200,600L160,600Q143,600 131.5,588.5Q120,577 120,560Q120,543 131.5,531.5Q143,520 160,520L200,520L200,440L160,440Q143,440 131.5,428.5Q120,417 120,400Q120,383 131.5,371.5Q143,360 160,360L200,360L200,280Q200,247 223.5,223.5Q247,200 280,200L360,200L360,160Q360,143 371.5,131.5Q383,120 400,120Q417,120 428.5,131.5Q440,143 440,160L440,200L520,200L520,160Q520,143 531.5,131.5Q543,120 560,120Q577,120 588.5,131.5Q600,143 600,160L600,200L680,200Q713,200 736.5,223.5Q760,247 760,280L760,360L800,360Q817,360 828.5,371.5Q840,383 840,400Q840,417 828.5,428.5Q817,440 800,440L760,440L760,520L800,520Q817,520 828.5,531.5Q840,543 840,560Q840,577 828.5,588.5Q817,600 800,600L760,600L760,680Q760,713 736.5,736.5Q713,760 680,760L600,760L600,800Q600,817 588.5,828.5Q577,840 560,840Q543,840 531.5,828.5Q520,817 520,800L520,760L440,760L440,800Q440,817 428.5,828.5Q417,840 400,840Q383,840 371.5,828.5Q360,817 360,800ZM680,680Q680,680 680,680Q680,680 680,680L680,280Q680,280 680,280Q680,280 680,280L280,280Q280,280 280,280Q280,280 280,280L280,680Q280,680 280,680Q280,680 280,680L680,680ZM480,480L480,480L480,480L480,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/memory_alt_24px.xml b/app/src/main/res/drawable/memory_alt_24px.xml
deleted file mode 100644
index 21807a9e9..000000000
--- a/app/src/main/res/drawable/memory_alt_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M308.5,588.5Q320,577 320,560L320,400Q320,383 308.5,371.5Q297,360 280,360Q263,360 251.5,371.5Q240,383 240,400L240,560Q240,577 251.5,588.5Q263,600 280,600Q297,600 308.5,588.5ZM508.5,588.5Q520,577 520,560L520,400Q520,383 508.5,371.5Q497,360 480,360Q463,360 451.5,371.5Q440,383 440,400L440,560Q440,577 451.5,588.5Q463,600 480,600Q497,600 508.5,588.5ZM708.5,588.5Q720,577 720,560L720,400Q720,383 708.5,371.5Q697,360 680,360Q663,360 651.5,371.5Q640,383 640,400L640,560Q640,577 651.5,588.5Q663,600 680,600Q697,600 708.5,588.5ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,280Q800,280 800,280Q800,280 800,280L160,280Q160,280 160,280Q160,280 160,280L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,280Q160,280 160,280Q160,280 160,280L160,280Q160,280 160,280Q160,280 160,280L160,680Q160,680 160,680Q160,680 160,680ZM160,760Q127,760 103.5,736.5Q80,713 80,680L80,280Q80,247 103.5,223.5Q127,200 160,200L200,200L200,160Q200,143 211.5,131.5Q223,120 240,120Q257,120 268.5,131.5Q280,143 280,160L280,200L440,200L440,160Q440,143 451.5,131.5Q463,120 480,120Q497,120 508.5,131.5Q520,143 520,160L520,200L680,200L680,160Q680,143 691.5,131.5Q703,120 720,120Q737,120 748.5,131.5Q760,143 760,160L760,200L800,200Q833,200 856.5,223.5Q880,247 880,280L880,680Q880,713 856.5,736.5Q833,760 800,760L760,760L760,800Q760,817 748.5,828.5Q737,840 720,840Q703,840 691.5,828.5Q680,817 680,800L680,760L520,760L520,800Q520,817 508.5,828.5Q497,840 480,840Q463,840 451.5,828.5Q440,817 440,800L440,760L280,760L280,800Q280,817 268.5,828.5Q257,840 240,840Q223,840 211.5,828.5Q200,817 200,800L200,760L160,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/mobile_arrow_down_24px.xml b/app/src/main/res/drawable/mobile_arrow_down_24px.xml
deleted file mode 100644
index caab6850e..000000000
--- a/app/src/main/res/drawable/mobile_arrow_down_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM495,620.5Q502,618 508,612L612,508Q623,497 623.5,480.5Q624,464 612,452Q601,441 584.5,440.5Q568,440 556,451L520,486L520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360L440,486L404,451Q393,440 376.5,440Q360,440 348,452Q337,463 337,480Q337,497 348,508L452,612Q458,618 465,620.5Q472,623 480,623Q488,623 495,620.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/mobile_code_24px.xml b/app/src/main/res/drawable/mobile_code_24px.xml
deleted file mode 100644
index 9b78af094..000000000
--- a/app/src/main/res/drawable/mobile_code_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,840L280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,520L280,520Q280,520 280,590Q280,660 280,760L280,840ZM508.5,228.5Q520,217 520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200Q440,217 451.5,228.5Q463,240 480,240Q497,240 508.5,228.5ZM280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,480Q760,497 748.5,508.5Q737,520 720,520Q703,520 691.5,508.5Q680,497 680,480L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840L320,840Q337,840 348.5,851.5Q360,863 360,880Q360,897 348.5,908.5Q337,920 320,920L280,920ZM553,760L612,819Q623,830 623,846.5Q623,863 612,875Q600,887 583.5,887Q567,887 555,875L468,788Q456,776 456,760Q456,744 468,732L556,644Q568,632 584,632.5Q600,633 612,645Q623,657 623.5,673Q624,689 612,701L553,760ZM807,760L748,701Q737,690 737,673.5Q737,657 748,645Q760,633 776.5,633Q793,633 805,645L892,732Q904,744 904,760Q904,776 892,788L804,876Q792,888 776,887.5Q760,887 748,875Q737,863 736.5,847Q736,831 748,819L807,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/mobile_wrench_24px.xml b/app/src/main/res/drawable/mobile_wrench_24px.xml
deleted file mode 100644
index 5cc975528..000000000
--- a/app/src/main/res/drawable/mobile_wrench_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,440Q760,457 748.5,468.5Q737,480 720,480Q703,480 691.5,468.5Q680,457 680,440L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840L440,840Q457,840 468.5,851.5Q480,863 480,880Q480,897 468.5,908.5Q457,920 440,920L440,920L280,920ZM660,700Q671,688 671.5,671.5Q672,655 660,644L618,603Q609,594 611.5,581.5Q614,569 626,565Q634,563 642.5,562Q651,561 660,561Q718,561 759,601.5Q800,642 800,701Q800,713 798,725Q796,737 791,748L851,808Q863,820 863,836Q863,852 851,864L823,892Q811,903 795,903.5Q779,904 767,892L707,832Q696,837 684,838.5Q672,840 660,840Q601,840 560.5,799.5Q520,759 520,701Q520,692 521,683.5Q522,675 524,667Q527,655 539.5,652Q552,649 562,659L604,701Q616,713 632,712.5Q648,712 660,700ZM508.5,228.5Q520,217 520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200Q440,217 451.5,228.5Q463,240 480,240Q497,240 508.5,228.5ZM280,840L280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/movie_edit_24px.xml b/app/src/main/res/drawable/movie_edit_24px.xml
deleted file mode 100644
index 41df964e6..000000000
--- a/app/src/main/res/drawable/movie_edit_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,720L160,720Q160,720 160,720Q160,720 160,720L160,400L160,400L160,402Q160,406 160,415Q160,424 160,440L160,660Q160,671 160,686Q160,701 160,717L160,720ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L160,160L225,290Q232,304 245,312Q258,320 273,320Q303,320 319,294.5Q335,269 321,242L280,160L360,160L425,290Q432,304 445,312Q458,320 473,320Q503,320 519,294.5Q535,269 521,242L480,160L560,160L625,290Q632,304 645,312Q658,320 673,320Q703,320 719,294.5Q735,269 721,242L680,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,360Q880,377 868.5,388.5Q857,400 840,400L800,400L800,400L160,400L160,720Q160,720 160,720Q160,720 160,720L440,720Q457,720 468.5,731.5Q480,743 480,760Q480,777 468.5,788.5Q457,800 440,800L160,800ZM560,800L560,734Q560,726 563,718.5Q566,711 572,705L781,497Q790,488 801,484Q812,480 823,480Q835,480 846,484.5Q857,489 866,498L903,535Q911,544 915.5,555Q920,566 920,577Q920,588 916,599.5Q912,611 903,620L695,828Q689,834 681.5,837Q674,840 666,840L600,840Q583,840 571.5,828.5Q560,817 560,800ZM860,577L860,577L823,540L823,540L860,577ZM620,780L658,780L779,658L761,639L742,621L620,742L620,780ZM761,639L742,621L742,621L779,658L779,658L761,639Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/movie_info_24px.xml b/app/src/main/res/drawable/movie_info_24px.xml
deleted file mode 100644
index 7d7dfe9e9..000000000
--- a/app/src/main/res/drawable/movie_info_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,840Q127,840 103.5,816.5Q80,793 80,760L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM320,760L640,760L640,200L320,200L320,760ZM320,200L320,200L640,200L640,200L320,200ZM160,760L240,760L240,680L160,680L160,760Q160,760 160,760Q160,760 160,760ZM720,760L800,760Q800,760 800,760Q800,760 800,760L800,680L720,680L720,760ZM160,600L240,600L240,520L160,520L160,600ZM720,600L800,600L800,520L720,520L720,600ZM160,440L240,440L240,360L160,360L160,440ZM720,440L800,440L800,360L720,360L720,440ZM160,280L240,280L240,200L160,200Q160,200 160,200Q160,200 160,200L160,280ZM720,280L800,280L800,200Q800,200 800,200Q800,200 800,200L720,200L720,280Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/notifications_active_24px.xml b/app/src/main/res/drawable/notifications_active_24px.xml
deleted file mode 100644
index b3982c522..000000000
--- a/app/src/main/res/drawable/notifications_active_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760Q183,760 171.5,748.5Q160,737 160,720Q160,703 171.5,691.5Q183,680 200,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L760,680Q777,680 788.5,691.5Q800,703 800,720Q800,737 788.5,748.5Q777,760 760,760L200,760ZM480,460L480,460L480,460L480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,680L640,680L640,400Q640,334 593,287Q546,240 480,240Q414,240 367,287Q320,334 320,400L320,680ZM120,400Q103,400 91.5,387Q80,374 82,357Q90,282 124,217.5Q158,153 211,105Q224,94 240.5,95Q257,96 267,110Q277,124 275,140Q273,156 260,168Q221,205 196,254Q171,303 163,360Q161,377 149,388.5Q137,400 120,400ZM840,400Q823,400 811,388.5Q799,377 797,360Q789,303 764,254Q739,205 700,168Q687,156 685,140Q683,124 693,110Q703,96 719.5,95Q736,94 749,105Q802,153 836,217.5Q870,282 878,357Q880,374 868.5,387Q857,400 840,400Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/outline_drawable_forced_round.xml b/app/src/main/res/drawable/outline_drawable_forced_round.xml
index e028ef10a..7736f088a 100644
--- a/app/src/main/res/drawable/outline_drawable_forced_round.xml
+++ b/app/src/main/res/drawable/outline_drawable_forced_round.xml
@@ -1,8 +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/oval_stroke_focus" />
-    <item android:state_hovered="true" android:drawable="@drawable/oval_stroke_focus" />
-    <item>
-        <shape android:shape="oval" />
-    </item>
+    <item android:state_focused="true"
+          android:drawable="@drawable/outline_card"/> <!-- focused -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/oval_stroke_focus.xml b/app/src/main/res/drawable/oval_stroke_focus.xml
deleted file mode 100644
index a2af717f1..000000000
--- a/app/src/main/res/drawable/oval_stroke_focus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <stroke android:width="3dp" android:color="?attr/white" />
-</shape>
diff --git a/app/src/main/res/drawable/palette_24px.xml b/app/src/main/res/drawable/palette_24px.xml
deleted file mode 100644
index f701027cc..000000000
--- a/app/src/main/res/drawable/palette_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 112.5,324Q145,251 200.5,197Q256,143 330,111.5Q404,80 488,80Q568,80 639,107.5Q710,135 763.5,183.5Q817,232 848.5,298.5Q880,365 880,442Q880,557 810,618.5Q740,680 640,680L566,680Q557,680 553.5,685Q550,690 550,696Q550,708 565,730.5Q580,753 580,782Q580,832 552.5,856Q525,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM303,503Q320,486 320,460Q320,434 303,417Q286,400 260,400Q234,400 217,417Q200,434 200,460Q200,486 217,503Q234,520 260,520Q286,520 303,503ZM423,343Q440,326 440,300Q440,274 423,257Q406,240 380,240Q354,240 337,257Q320,274 320,300Q320,326 337,343Q354,360 380,360Q406,360 423,343ZM623,343Q640,326 640,300Q640,274 623,257Q606,240 580,240Q554,240 537,257Q520,274 520,300Q520,326 537,343Q554,360 580,360Q606,360 623,343ZM743,503Q760,486 760,460Q760,434 743,417Q726,400 700,400Q674,400 657,417Q640,434 640,460Q640,486 657,503Q674,520 700,520Q726,520 743,503ZM480,800Q489,800 494.5,795Q500,790 500,782Q500,768 485,749Q470,730 470,692Q470,650 499,625Q528,600 570,600L640,600Q706,600 753,561.5Q800,523 800,442Q800,321 707.5,240.5Q615,160 488,160Q352,160 256,253Q160,346 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/pause_24px.xml b/app/src/main/res/drawable/pause_24px.xml
deleted file mode 100644
index e8de0339c..000000000
--- a/app/src/main/res/drawable/pause_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="#fff">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M520,760L520,200L760,200L760,760L520,760ZM200,760L200,200L440,200L440,760L200,760ZM600,680L680,680L680,280L600,280L600,680ZM280,680L360,680L360,280L280,280L280,680ZM280,280L280,280L280,680L280,680L280,280ZM600,280L600,280L600,680L600,680L600,280Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/picture_in_picture_center_24px.xml b/app/src/main/res/drawable/picture_in_picture_center_24px.xml
deleted file mode 100644
index 60d7e133b..000000000
--- a/app/src/main/res/drawable/picture_in_picture_center_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM360,600L600,600Q617,600 628.5,588.5Q640,577 640,560L640,400Q640,383 628.5,371.5Q617,360 600,360L360,360Q343,360 331.5,371.5Q320,383 320,400L320,560Q320,577 331.5,588.5Q343,600 360,600ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/pip_24px.xml b/app/src/main/res/drawable/pip_24px.xml
deleted file mode 100644
index 5fba5b85e..000000000
--- a/app/src/main/res/drawable/pip_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,440Q103,440 91.5,428.5Q80,417 80,400Q80,383 91.5,371.5Q103,360 120,360L224,360L80,217Q68,205 68,188.5Q68,172 80,160Q92,148 108.5,148Q125,148 137,160L280,304L280,200Q280,183 291.5,171.5Q303,160 320,160Q337,160 348.5,171.5Q360,183 360,200L360,400Q360,417 348.5,428.5Q337,440 320,440L120,440ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,560Q80,543 91.5,531.5Q103,520 120,520Q137,520 148.5,531.5Q160,543 160,560L160,720Q160,720 160,720Q160,720 160,720L440,720Q457,720 468.5,731.5Q480,743 480,760Q480,777 468.5,788.5Q457,800 440,800L160,800ZM811.5,508.5Q800,497 800,480L800,240Q800,240 800,240Q800,240 800,240L480,240Q463,240 451.5,228.5Q440,217 440,200Q440,183 451.5,171.5Q463,160 480,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,480Q880,497 868.5,508.5Q857,520 840,520Q823,520 811.5,508.5ZM600,800Q583,800 571.5,788.5Q560,777 560,760L560,640Q560,623 571.5,611.5Q583,600 600,600L840,600Q857,600 868.5,611.5Q880,623 880,640L880,760Q880,777 868.5,788.5Q857,800 840,800L600,800Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/play_arrow_24px.xml b/app/src/main/res/drawable/play_arrow_24px.xml
deleted file mode 100644
index b7b67fccc..000000000
--- a/app/src/main/res/drawable/play_arrow_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M320,687L320,273Q320,256 332,244.5Q344,233 360,233Q365,233 370.5,234.5Q376,236 381,239L707,446Q716,452 720.5,461Q725,470 725,480Q725,490 720.5,499Q716,508 707,514L381,721Q376,724 370.5,725.5Q365,727 360,727Q344,727 332,715.5Q320,704 320,687ZM400,480L400,480L400,480ZM400,614L610,480L400,346L400,614Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/plugin_lang.xml b/app/src/main/res/drawable/plugin_lang.xml
deleted file mode 100644
index ac33489ac..000000000
--- a/app/src/main/res/drawable/plugin_lang.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:width="24dp"
-    android:height="24dp">
-    <path
-        android:pathData="M132.52 171.211C139.414 166.925 142.861 160.497 142.861 151.927C142.861 143.356 139.414 136.835 132.52 132.364C125.627 127.892 117.335 125.657 107.647 125.657C97.958 125.657 89.667 127.892 82.774 132.364C75.88 136.835 72.432 143.356 72.432 151.927C72.432 160.497 75.88 166.925 82.774 171.211C89.667 175.497 97.958 177.639 107.647 177.639C117.335 177.639 125.627 175.497 132.52 171.211ZM41.126 93.236C37.783 93.236 34.883 92.026 32.466 89.604C30.05 87.181 28.835 84.293 28.835 80.94C28.835 77.585 30.05 74.697 32.466 72.276C34.883 69.854 37.783 68.643 41.126 68.643L92.555 68.643L92.555 51.874C92.555 47.775 93.952 44.328 96.748 41.533C99.542 38.739 102.989 37.341 107.088 37.341C111.186 37.341 114.634 38.739 117.429 41.533C120.223 44.328 121.621 47.775 121.621 51.874L121.621 68.643L173.604 68.643C176.957 68.643 179.845 69.854 182.267 72.276C184.69 74.697 185.901 77.585 185.901 80.94C185.901 84.293 184.69 87.181 182.267 89.604C179.845 92.026 176.957 93.236 173.604 93.236L41.126 93.236ZM107.647 202.233C90.133 202.233 75.134 197.854 62.65 189.098C50.165 180.34 43.922 167.951 43.922 151.927C43.922 135.532 50.165 123.047 62.65 114.477C75.134 105.907 90.133 101.621 107.647 101.621C125.533 101.621 140.719 105.907 153.202 114.477C165.684 123.047 171.927 135.532 171.927 151.927C171.927 168.323 165.684 180.806 153.202 189.378C140.719 197.948 125.533 202.233 107.647 202.233ZM89.202 292.225C82.866 292.225 77.557 290.081 73.271 285.797C68.985 281.511 66.843 276.202 66.843 269.866L66.843 228.504C66.843 224.405 68.334 220.958 71.314 218.163C74.295 215.369 77.836 213.971 81.935 213.971C86.034 213.971 89.481 215.369 92.275 218.163C95.07 220.958 96.468 224.405 96.468 228.504L96.468 267.63L231.734 267.63C235.089 267.63 237.977 268.841 240.398 271.264C242.82 273.686 244.032 276.574 244.032 279.928C244.032 283.281 242.82 286.169 240.398 288.592C237.977 291.014 235.089 292.225 231.734 292.225L89.202 292.225ZM218.319 233.534C214.221 233.534 210.773 232.137 207.979 229.343C205.184 226.547 203.787 223.1 203.787 219.001L203.787 51.315C203.787 47.216 205.184 43.863 207.979 41.253C210.773 38.645 214.221 37.341 218.319 37.341C222.418 37.341 225.773 38.645 228.381 41.253C230.99 43.863 232.293 47.216 232.293 51.315L232.293 121.184L258.565 121.184C261.918 121.184 264.806 122.395 267.228 124.818C269.651 127.24 270.862 130.128 270.862 133.481C270.862 136.835 269.651 139.723 267.228 142.145C264.806 144.567 261.918 145.779 258.565 145.779L232.852 145.779L232.852 219.001C232.852 223.1 231.456 226.547 228.661 229.343C225.865 232.137 222.418 233.534 218.319 233.534ZM436.872 159.194C428.301 160.312 420.383 161.615 413.116 163.106C405.85 164.596 399.048 166.273 392.715 168.137C383.326 171.057 375.252 174.387 368.492 178.125C367.463 178.073 366.421 178.048 365.368 178.048C353.422 178.048 342.787 181.978 333.459 189.838C324.135 197.698 318.004 206.968 315.068 217.658L297.695 217.658C297.692 217.362 297.691 217.064 297.691 216.766C297.691 197.389 303.84 181.552 316.138 169.254C328.435 156.957 348.184 147.082 375.386 139.631C383.956 137.394 393.366 135.345 403.614 133.481C413.861 131.618 424.948 129.941 436.872 128.451C436.127 110.937 432.028 98.174 424.574 90.163C417.122 82.151 405.57 78.144 389.919 78.144C382.094 78.144 374.455 79.263 367.002 81.499C359.55 83.734 350.793 87.46 340.731 92.677C336.26 95.286 331.602 96.032 326.757 94.914C321.913 93.796 318.187 91 315.579 86.529C312.97 82.058 312.411 77.306 313.902 72.276C315.392 67.245 318.373 63.426 322.845 60.818C334.396 54.482 346.787 49.358 360.015 45.446C373.244 41.533 386.752 39.577 400.54 39.577C426.996 39.577 447.12 47.775 460.907 64.171C474.695 80.566 481.588 104.416 481.588 135.717L481.588 239.62C480.018 234.941 477.344 230.765 473.566 227.088C467.099 220.798 459.327 217.658 450.251 217.658L436.872 217.658L436.872 159.194Z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M283.3 417.225L448.866 417.225L448.866 366.6C448.866 364.265 449.459 362.036 450.62 359.914C451.783 357.789 453.542 356.199 455.874 355.137L463.203 351.634C466.594 349.937 469.305 347.601 471.317 344.63C473.334 341.658 474.34 338.261 474.34 334.44C474.34 330.832 473.334 327.489 471.317 324.411C469.305 321.333 466.594 318.944 463.203 317.247L456.192 314.062C453.861 313.001 452.055 311.463 450.777 309.446C449.5 307.429 448.866 305.147 448.866 302.599L448.866 251.657L398.873 251.657C395.695 251.657 392.881 250.643 390.442 248.631C388.003 246.613 386.562 244.016 386.141 240.827L384.544 230.001C383.92 225.331 381.84 221.404 378.334 218.22C374.841 215.037 370.759 213.443 366.077 213.443C361.2 213.443 357.007 215.037 353.501 218.22C349.995 221.404 347.936 225.331 347.29 230.001L345.701 240.827C345.279 244.016 343.852 246.613 341.407 248.631C338.969 250.643 336.148 251.657 332.968 251.657L283.3 251.657L283.3 279.039C295.183 283.495 304.52 290.713 311.321 300.689C318.109 310.666 321.499 321.916 321.499 334.44C321.499 347.177 318.109 358.534 311.321 368.509C304.52 378.486 295.183 385.704 283.3 390.162L283.3 417.225ZM283.3 442.699C276.085 442.699 270.03 440.258 265.146 435.376C260.259 430.493 257.821 424.444 257.821 417.225L257.821 377.425C257.821 375.09 258.671 373.022 260.369 371.216C262.075 369.411 264.085 368.298 266.423 367.872C274.691 366.176 281.703 362.301 287.439 356.252C293.165 350.201 296.034 342.931 296.034 334.44C296.034 326.162 293.165 319.051 287.439 313.108C281.703 307.164 274.691 303.236 266.423 301.325C264.085 300.689 262.075 299.468 260.369 297.664C258.671 295.86 257.821 293.79 257.821 291.455L257.821 251.657C257.821 244.65 260.316 238.651 265.301 233.662C270.295 228.673 276.294 226.183 283.3 226.183L322.144 226.183C323.626 215.357 328.511 206.283 336.787 198.956C345.068 191.633 354.832 187.973 366.077 187.973C377.118 187.973 386.781 191.633 395.062 198.956C403.331 206.283 408.325 215.357 410.024 226.183L448.866 226.183C455.874 226.183 461.872 228.673 466.859 233.662C471.854 238.651 474.34 244.65 474.34 251.657L474.34 294.321C481.983 298.142 488.138 303.661 492.807 310.878C497.482 318.096 499.812 325.95 499.812 334.44C499.812 343.143 497.482 351.103 492.807 358.32C488.138 365.537 481.983 370.951 474.34 374.56L474.34 417.225C474.34 424.444 471.854 430.493 466.859 435.376C461.872 440.258 455.874 442.699 448.866 442.699L283.3 442.699ZM378.817 334.44Z"
-        android:fillColor="#000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/quick_novel_icon.xml b/app/src/main/res/drawable/quick_novel_icon.xml
index 8f0b3cf3e..b19aaafea 100644
--- a/app/src/main/res/drawable/quick_novel_icon.xml
+++ b/app/src/main/res/drawable/quick_novel_icon.xml
@@ -1,23 +1,31 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1000"
-    android:viewportHeight="1000">
-    <group android:scaleX="1"
-        android:scaleY="1"
-        android:translateX="0"
-        android:translateY="0">
-        <path
-            android:pathData="M491.9,400a19,19 0,0 0,-7 -14.7c-28.8,-23.5 -77.2,-55.2 -141.1,-64.5A254.4,254.4 0,0 0,261 322.4a19,19 0,0 0,-15.6 18.8l0.3,289.7a19.1,19.1 0,0 0,22.1 18.8,254 254,0 0,1 76.4,-0.6c49.2,7.1 89.3,27.6 118.2,47.4a19.1,19.1 0,0 0,29.8 -15.8Z"
-            android:fillColor="#3e80ef"/>
-        <path
-            android:pathData="M491.9,381a19.1,19.1 0,0 0,-7 -14.7c-28.8,-23.5 -77.2,-55.2 -141.1,-64.5a254.4,254.4 0,0 0,-82.8 1.7,19 19,0 0,0 -15.6,18.8l0.3,289.7a19.1,19.1 0,0 0,22 18.8,254 254,0 0,1 76.4,-0.6c49.2,7.1 89.3,27.6 118.2,47.4A19.1,19.1 0,0 0,492.2 661.8Z"
-            android:fillColor="#1f4adc"/>
-        <path
-            android:pathData="M508.9,398.5a19,19 0,0 1,7 -14.7c28.8,-23.5 77.1,-55.2 140.9,-64.5a253.8,253.8 0,0 1,82.7 1.7A19.1,19.1 0,0 1,755 339.7l-0.3,289.7a19.1,19.1 0,0 1,-22.1 18.8,253.3 253.3,0 0,0 -76.2,-0.6c-49.1,7.1 -89.1,27.6 -118,47.3a19.1,19.1 0,0 1,-29.9 -15.8Z"
-            android:fillColor="#3e80ef"/>
-        <path
-            android:pathData="M508.9,381a19,19 0,0 1,7 -14.7C544.6,342.8 593,311 656.8,301.8a253.5,253.5 0,0 1,82.7 1.7A19,19 0,0 1,755 322.2l-0.3,289.7a19.1,19.1 0,0 1,-22.1 18.8,253.3 253.3,0 0,0 -76.2,-0.6c-49.1,7.1 -89.1,27.6 -118,47.3a19.1,19.1 0,0 1,-29.8 -15.8Z"
-            android:fillColor="#1f4adc"/>
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108"
+        android:name="vector"
+        android:tint="?attr/white"
+>
+    <!-- ScaleX = 108/24 -->
+    <group
+            android:scaleX="0.22"
+            android:scaleY="0.22"
+    >
+        <path android:name="path"
+              android:pathData="M 475.35 304.28 C 432.112 306.219 389.584 315.994 349.84 333.13 C 311.168 349.86 275.547 372.909 244.44 401.33 L 244.44 97.04 C 275.547 68.619 311.168 45.57 349.84 28.84 C 389.589 11.727 432.116 1.968 475.35 0.04 L 475.35 304.28"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
+        <path android:name="path_1"
+              android:pathData="M 348.22 364.24 C 310.074 381.02 275.008 404.073 244.48 432.44 L 244.48 411.44 C 275.006 383.062 310.072 359.999 348.22 343.21 M 348.22 364.24 C 387.267 347.125 429.132 337.342 471.72 335.38 L 471.72 314.38 C 429.134 316.333 387.269 326.106 348.22 343.21"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
+        <path android:name="path_2"
+              android:pathData="M 127.44 364.24 C 165.5 381.028 200.476 404.082 230.91 432.44 L 230.91 411.44 C 200.476 383.082 165.5 360.028 127.44 343.24 M 127.44 364.24 C 88.492 347.123 46.718 337.339 4.22 335.38 L 4.22 314.38 C 46.718 316.339 88.492 326.123 127.44 343.24"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
+        <path android:name="path_3"
+              android:pathData="M 0 304.28 C 43.238 306.218 85.766 315.994 125.51 333.13 C 164.182 349.86 199.803 372.909 230.91 401.33 L 230.91 97.04 C 199.803 68.619 164.182 45.57 125.51 28.84 C 85.761 11.725 43.234 1.967 0 0.04 L 0 304.28"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
     </group>
-</vector>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/reset_colors_24px.xml b/app/src/main/res/drawable/reset_colors_24px.xml
deleted file mode 100644
index 6cfa81413..000000000
--- a/app/src/main/res/drawable/reset_colors_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M678,915.5Q667,911 658,902L498,742Q489,733 484.5,722Q480,711 480,700Q480,689 484.5,677.5Q489,666 498,657L644,512L594,462Q582,450 582,434Q582,418 594,406Q606,394 622.5,394Q639,394 651,406L903,657Q912,666 916.5,677Q921,688 921,699Q921,710 916.5,721.5Q912,733 903,742L743,902Q734,911 722.5,915.5Q711,920 700,920Q689,920 678,915.5ZM568,700L832,700L700,568L568,700ZM480,200Q363,200 281.5,281.5Q200,363 200,480Q200,552 232.5,612Q265,672 320,710L320,640Q320,623 331.5,611.5Q343,600 360,600Q377,600 388.5,611.5Q400,623 400,640L400,800Q400,817 388.5,828.5Q377,840 360,840L200,840Q183,840 171.5,828.5Q160,817 160,800Q160,783 171.5,771.5Q183,760 200,760L254,760Q192,710 156,637.5Q120,565 120,480Q120,405 148.5,339.5Q177,274 225.5,225.5Q274,177 339.5,148.5Q405,120 480,120Q594,120 684,182.5Q774,245 814,345Q820,361 814,376Q808,391 792,397Q776,403 760.5,397Q745,391 739,375Q708,297 638.5,248.5Q569,200 480,200Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/responsive_layout_24px.xml b/app/src/main/res/drawable/responsive_layout_24px.xml
deleted file mode 100644
index 4d3ea085f..000000000
--- a/app/src/main/res/drawable/responsive_layout_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,840L120,320L320,320L320,120L840,120L840,840L120,840ZM640,760L760,760L760,200L400,200L400,320L640,320L640,760ZM400,760L560,760L560,400L400,400L400,760ZM200,760L320,760L320,400L200,400L200,760ZM640,320L640,320L640,320L640,320L640,400L640,400L640,400L640,400L640,400L640,400L640,400L640,400L640,320L640,320ZM320,400L320,400L320,400L320,400ZM560,400L560,400L560,400L560,400ZM640,320L640,320L640,320L640,320L640,320L640,320Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/restore_page_24px.xml b/app/src/main/res/drawable/restore_page_24px.xml
deleted file mode 100644
index 65a7d274f..000000000
--- a/app/src/main/res/drawable/restore_page_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M388,430Q405,412 429,401Q453,390 480,390Q534,390 572,428Q610,466 610,520Q610,574 572,612Q534,650 480,650Q444,650 414.5,632Q385,614 368,585Q362,574 350.5,570.5Q339,567 328,572Q316,577 311.5,589.5Q307,602 314,613Q338,657 382,683.5Q426,710 480,710Q558,710 614,654Q670,598 670,520Q670,442 614,386Q558,330 480,330Q442,330 409,344Q376,358 350,382L350,350Q350,337 341.5,328.5Q333,320 320,320Q307,320 298.5,328.5Q290,337 290,350L290,460Q290,473 298.5,481.5Q307,490 320,490L430,490Q443,490 451.5,481.5Q460,473 460,460Q460,447 451.5,438.5Q443,430 430,430L388,430ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L527,80Q543,80 557.5,86Q572,92 583,103L777,297Q788,308 794,322.5Q800,337 800,353L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,354L526,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800ZM240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160L240,160L240,354L240,800Q240,800 240,800Q240,800 240,800Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/rounded_corner_24px.xml b/app/src/main/res/drawable/rounded_corner_24px.xml
deleted file mode 100644
index 6d3180c42..000000000
--- a/app/src/main/res/drawable/rounded_corner_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M131.5,188.5Q120,177 120,160Q120,143 131.5,131.5Q143,120 160,120Q177,120 188.5,131.5Q200,143 200,160Q200,177 188.5,188.5Q177,200 160,200Q143,200 131.5,188.5ZM291.5,188.5Q280,177 280,160Q280,143 291.5,131.5Q303,120 320,120Q337,120 348.5,131.5Q360,143 360,160Q360,177 348.5,188.5Q337,200 320,200Q303,200 291.5,188.5ZM131.5,348.5Q120,337 120,320Q120,303 131.5,291.5Q143,280 160,280Q177,280 188.5,291.5Q200,303 200,320Q200,337 188.5,348.5Q177,360 160,360Q143,360 131.5,348.5ZM131.5,508.5Q120,497 120,480Q120,463 131.5,451.5Q143,440 160,440Q177,440 188.5,451.5Q200,463 200,480Q200,497 188.5,508.5Q177,520 160,520Q143,520 131.5,508.5ZM131.5,668.5Q120,657 120,640Q120,623 131.5,611.5Q143,600 160,600Q177,600 188.5,611.5Q200,623 200,640Q200,657 188.5,668.5Q177,680 160,680Q143,680 131.5,668.5ZM771.5,668.5Q760,657 760,640Q760,623 771.5,611.5Q783,600 800,600Q817,600 828.5,611.5Q840,623 840,640Q840,657 828.5,668.5Q817,680 800,680Q783,680 771.5,668.5ZM131.5,828.5Q120,817 120,800Q120,783 131.5,771.5Q143,760 160,760Q177,760 188.5,771.5Q200,783 200,800Q200,817 188.5,828.5Q177,840 160,840Q143,840 131.5,828.5ZM291.5,828.5Q280,817 280,800Q280,783 291.5,771.5Q303,760 320,760Q337,760 348.5,771.5Q360,783 360,800Q360,817 348.5,828.5Q337,840 320,840Q303,840 291.5,828.5ZM451.5,828.5Q440,817 440,800Q440,783 451.5,771.5Q463,760 480,760Q497,760 508.5,771.5Q520,783 520,800Q520,817 508.5,828.5Q497,840 480,840Q463,840 451.5,828.5ZM611.5,828.5Q600,817 600,800Q600,783 611.5,771.5Q623,760 640,760Q657,760 668.5,771.5Q680,783 680,800Q680,817 668.5,828.5Q657,840 640,840Q623,840 611.5,828.5ZM771.5,828.5Q760,817 760,800Q760,783 771.5,771.5Q783,760 800,760Q817,760 828.5,771.5Q840,783 840,800Q840,817 828.5,828.5Q817,840 800,840Q783,840 771.5,828.5ZM760,480L760,320Q760,270 725,235Q690,200 640,200L480,200Q463,200 451.5,188.5Q440,177 440,160Q440,143 451.5,131.5Q463,120 480,120L640,120Q723,120 781.5,178.5Q840,237 840,320L840,480Q840,497 828.5,508.5Q817,520 800,520Q783,520 771.5,508.5Q760,497 760,480Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/rounded_outline.xml b/app/src/main/res/drawable/rounded_outline.xml
index 752cd7823..b85ace8ea 100644
--- a/app/src/main/res/drawable/rounded_outline.xml
+++ b/app/src/main/res/drawable/rounded_outline.xml
@@ -1,11 +1,13 @@
 <?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/oval_stroke_focus" />
-    <item android:state_hovered="true" android:drawable="@drawable/oval_stroke_focus" />
-    <item android:state_pressed="true" android:drawable="@drawable/oval_stroke_focus" />
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@android:color/white">
+
     <item>
         <shape android:shape="oval">
-            <stroke android:width="2dp" android:color="?attr/account_unselected_stroke" />
+            <stroke
+                android:width="2dp"
+                android:color="?attr/white" />
+            <corners android:radius="10dp" />
         </shape>
     </item>
-</selector>
+</ripple>
diff --git a/app/src/main/res/drawable/save_as_24px.xml b/app/src/main/res/drawable/save_as_24px.xml
deleted file mode 100644
index 0c3c01414..000000000
--- a/app/src/main/res/drawable/save_as_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L647,120Q663,120 677.5,126Q692,132 703,143L817,257Q828,268 834,282.5Q840,297 840,313L840,440Q840,457 828.5,468.5Q817,480 800,480Q783,480 771.5,468.5Q760,457 760,440L760,313L647,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L400,760Q417,760 428.5,771.5Q440,783 440,800Q440,817 428.5,828.5Q417,840 400,840L200,840ZM200,200L200,313L200,482Q200,485 200,494.5Q200,504 200,519L200,760L200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200ZM520,880L520,814Q520,806 523,798.5Q526,791 532,785L741,577Q750,568 761,564Q772,560 783,560Q795,560 806,564.5Q817,569 826,578L863,615Q871,624 875.5,635Q880,646 880,657Q880,668 876,679.5Q872,691 863,700L655,908Q649,914 641.5,917Q634,920 626,920L560,920Q543,920 531.5,908.5Q520,897 520,880ZM820,657L820,657L783,620L783,620L820,657ZM580,860L618,860L739,738L721,719L702,701L580,822L580,860ZM721,719L702,701L702,701L739,738L739,738L721,719ZM280,400L560,400Q577,400 588.5,388.5Q600,377 600,360L600,280Q600,263 588.5,251.5Q577,240 560,240L280,240Q263,240 251.5,251.5Q240,263 240,280L240,360Q240,377 251.5,388.5Q263,400 280,400ZM480,720Q481,720 482,720Q483,720 484,720L600,605Q600,603 600,602.5Q600,602 600,600Q600,550 565,515Q530,480 480,480Q430,480 395,515Q360,550 360,600Q360,650 395,685Q430,720 480,720Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/save_clock_24px.xml b/app/src/main/res/drawable/save_clock_24px.xml
deleted file mode 100644
index c86924cc1..000000000
--- a/app/src/main/res/drawable/save_clock_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200L200,314L200,403Q200,401 200,400.5Q200,400 200,400Q200,400 200,481.5Q200,563 200,679Q200,700 200,720Q200,740 200,760ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L647,120Q663,120 677.5,126Q692,132 703,143L817,257Q828,268 834,282.5Q840,297 840,313L840,375Q840,392 828.5,403.5Q817,415 800,415Q783,415 771.5,403.5Q760,392 760,375L760,314L646,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L432,760Q449,760 460.5,771.5Q472,783 472,800Q472,817 460.5,828.5Q449,840 432,840L200,840ZM578.5,821.5Q520,763 520,680Q520,597 578.5,538.5Q637,480 720,480Q803,480 861.5,538.5Q920,597 920,680Q920,763 861.5,821.5Q803,880 720,880Q637,880 578.5,821.5ZM740,672L740,580Q740,572 734,566Q728,560 720,560Q712,560 706,566Q700,572 700,580L700,671Q700,679 703,686.5Q706,694 712,700L773,761Q779,767 787,767Q795,767 801,761Q807,755 807,747Q807,739 801,733L740,672ZM280,400L560,400Q577,400 588.5,388.5Q600,377 600,360L600,280Q600,263 588.5,251.5Q577,240 560,240L280,240Q263,240 251.5,251.5Q240,263 240,280L240,360Q240,377 251.5,388.5Q263,400 280,400ZM442,714Q441,705 440.5,696.5Q440,688 440,679Q440,625 460,575Q480,525 518,486Q509,483 499.5,481.5Q490,480 480,480Q430,480 395,515Q360,550 360,600Q360,639 382.5,670.5Q405,702 442,714Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/screen_rotation_alt_24px.xml b/app/src/main/res/drawable/screen_rotation_alt_24px.xml
deleted file mode 100644
index a1d01a5c6..000000000
--- a/app/src/main/res/drawable/screen_rotation_alt_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M487,856L219,589Q213,583 210,576Q207,569 207,561Q207,545 218,532.5Q229,520 247,520Q255,520 262.5,523Q270,526 276,532L544,800Q544,800 544,800Q544,800 544,800L744,600L680,600Q663,600 651.5,588.5Q640,577 640,560Q640,543 651.5,531.5Q663,520 680,520L840,520Q857,520 868.5,531.5Q880,543 880,560L880,720Q880,737 868.5,748.5Q857,760 840,760Q823,760 811.5,748.5Q800,737 800,720L800,656L600,856Q589,867 574.5,873Q560,879 544,879Q529,879 514,873Q499,867 487,856ZM120,440Q103,440 91.5,428.5Q80,417 80,400L80,240Q80,223 91.5,211.5Q103,200 120,200Q137,200 148.5,211.5Q160,223 160,240L160,304L360,104Q372,92 387,86.5Q402,81 417,81Q433,81 447.5,86.5Q462,92 473,104L741,371Q747,377 750,384Q753,391 753,399Q753,415 742,427.5Q731,440 713,440Q705,440 697.5,437Q690,434 684,428L416,160Q416,160 416,160Q416,160 416,160L216,360L280,360Q297,360 308.5,371.5Q320,383 320,400Q320,417 308.5,428.5Q297,440 280,440L120,440Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/shadow_24px.xml b/app/src/main/res/drawable/shadow_24px.xml
deleted file mode 100644
index 09bf8d62e..000000000
--- a/app/src/main/res/drawable/shadow_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,880Q127,880 103.5,856.5Q80,833 80,800L80,320Q80,287 103.5,263.5Q127,240 160,240L240,240L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L720,720L720,800Q720,833 696.5,856.5Q673,880 640,880L160,880ZM320,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/shadow_add_24px.xml b/app/src/main/res/drawable/shadow_add_24px.xml
deleted file mode 100644
index 9ff30d54c..000000000
--- a/app/src/main/res/drawable/shadow_add_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M520,440L440,440Q423,440 411.5,428.5Q400,417 400,400Q400,383 411.5,371.5Q423,360 440,360L520,360L520,280Q520,263 531.5,251.5Q543,240 560,240Q577,240 588.5,251.5Q600,263 600,280L600,360L680,360Q697,360 708.5,371.5Q720,383 720,400Q720,417 708.5,428.5Q697,440 680,440L600,440L600,520Q600,537 588.5,548.5Q577,560 560,560Q543,560 531.5,548.5Q520,537 520,520L520,440ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,320Q80,287 103.5,263.5Q127,240 160,240L240,240L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L720,720L720,800Q720,833 696.5,856.5Q673,880 640,880L160,880ZM320,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/shuffle_24px.xml b/app/src/main/res/drawable/shuffle_24px.xml
deleted file mode 100644
index d25985f8b..000000000
--- a/app/src/main/res/drawable/shuffle_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M560,800L560,720L664,720L537,593L594,536L720,662L720,560L800,560L800,800L560,800ZM216,800L160,744L664,240L560,240L560,160L800,160L800,400L720,400L720,296L216,800ZM367,423L160,216L216,160L423,367L367,423Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/skip_next_24px.xml b/app/src/main/res/drawable/skip_next_24px.xml
deleted file mode 100644
index 3beb9c760..000000000
--- a/app/src/main/res/drawable/skip_next_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M660,720L660,240L740,240L740,720L660,720ZM220,720L220,240L580,480L220,720ZM300,480L300,480L300,480ZM300,570L436,480L300,390L300,570Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/subtitles_gear_24px.xml b/app/src/main/res/drawable/subtitles_gear_24px.xml
deleted file mode 100644
index d84e9f883..000000000
--- a/app/src/main/res/drawable/subtitles_gear_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M634,768L628,740Q616,735 605.5,729.5Q595,724 584,716L555,725Q542,729 529.5,724Q517,719 510,708L502,694Q495,682 497,668Q499,654 510,645L532,626Q530,612 530,600Q530,588 532,574L510,555Q499,546 497,532.5Q495,519 502,507L511,492Q518,481 530,476Q542,471 555,475L584,484Q595,476 605.5,470.5Q616,465 628,460L634,431Q637,417 647.5,408.5Q658,400 672,400L688,400Q702,400 712.5,409Q723,418 726,432L732,460Q744,465 754.5,471Q765,477 776,486L803,477Q817,472 830,477Q843,482 850,494L858,508Q865,520 863,534Q861,548 850,557L828,576Q830,588 830,601Q830,614 828,626L850,645Q861,654 863,667.5Q865,681 858,693L849,708Q842,719 830,724Q818,729 805,725L776,716Q765,724 754.5,729.5Q744,735 732,740L726,769Q723,783 712.5,791.5Q702,800 688,800L672,800Q658,800 647.5,791Q637,782 634,768ZM160,720L160,720Q160,720 160,720Q160,720 160,720L160,720Q160,540 160,442.5Q160,345 160,300Q160,255 160,247.5Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720ZM429,478Q440,455 454,436Q468,417 486,400L440,400Q423,400 411.5,411.5Q400,423 400,440Q400,454 408,464Q416,474 429,478ZM404,640Q402,630 401.5,620.5Q401,611 401,600Q401,589 401.5,579.5Q402,570 404,560L280,560Q263,560 251.5,571.5Q240,583 240,600Q240,617 251.5,628.5Q263,640 280,640L404,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,337Q880,354 868.5,365.5Q857,377 840,377Q823,377 811.5,365.5Q800,354 800,337L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L417,720Q434,720 445.5,731.5Q457,743 457,760Q457,777 445.5,788.5Q434,800 417,800L160,800ZM680,680Q713,680 736.5,656.5Q760,633 760,600Q760,567 736.5,543.5Q713,520 680,520Q647,520 623.5,543.5Q600,567 600,600Q600,633 623.5,656.5Q647,680 680,680ZM308.5,468.5Q320,457 320,440Q320,423 308.5,411.5Q297,400 280,400Q263,400 251.5,411.5Q240,423 240,440Q240,457 251.5,468.5Q263,480 280,480Q297,480 308.5,468.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/swipe_24px.xml b/app/src/main/res/drawable/swipe_24px.xml
deleted file mode 100644
index 9b2183713..000000000
--- a/app/src/main/res/drawable/swipe_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M311,131Q230,162 164,220L250,220Q263,220 271.5,228.5Q280,237 280,250Q280,263 271.5,271.5Q263,280 250,280L120,280Q103,280 91.5,268.5Q80,257 80,240L80,110Q80,97 88.5,88.5Q97,80 110,80Q123,80 131.5,88.5Q140,97 140,110L140,161Q212,102 299,71Q386,40 480,40Q574,40 661,71Q748,102 820,161L820,110Q820,97 828.5,88.5Q837,80 850,80Q863,80 871.5,88.5Q880,97 880,110L880,240Q880,257 868.5,268.5Q857,280 840,280L710,280Q697,280 688.5,271.5Q680,263 680,250Q680,237 688.5,228.5Q697,220 710,220L796,220Q730,162 649,131Q568,100 480,100Q392,100 311,131ZM473,880Q449,880 427,871Q405,862 388,845L212,668Q201,657 200.5,640.5Q200,624 211,612L214,609Q230,593 251.5,587.5Q273,582 294,588L360,607L360,280Q360,263 371.5,251.5Q383,240 400,240Q417,240 428.5,251.5Q440,263 440,280L440,660Q440,680 424,692Q408,704 389,699L343,686L445,788Q450,793 457.5,796.5Q465,800 473,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 731.5,531.5Q743,520 760,520Q777,520 788.5,531.5Q800,543 800,560L800,720Q800,786 753,833Q706,880 640,880L473,880ZM548.5,411.5Q560,423 560,440L560,560Q560,577 548.5,588.5Q537,600 520,600L520,600Q503,600 491.5,588.5Q480,577 480,560L480,440Q480,423 491.5,411.5Q503,400 520,400Q537,400 548.5,411.5ZM668.5,451.5Q680,463 680,480L680,560Q680,577 668.5,588.5Q657,600 640,600L640,600Q623,600 611.5,588.5Q600,577 600,560L600,480Q600,463 611.5,451.5Q623,440 640,440Q657,440 668.5,451.5ZM571,680L571,680L571,680Q571,680 571,680Q571,680 571,680L571,680Q571,680 571,680Q571,680 571,680L571,680L571,680Q571,680 571,680Q571,680 571,680Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/swipe_vertical_24px.xml b/app/src/main/res/drawable/swipe_vertical_24px.xml
deleted file mode 100644
index 48048f334..000000000
--- a/app/src/main/res/drawable/swipe_vertical_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M161,820Q102,748 71,661Q40,574 40,480Q40,386 71,299Q102,212 161,140L110,140Q97,140 88.5,131.5Q80,123 80,110Q80,97 88.5,88.5Q97,80 110,80L240,80Q257,80 268.5,91.5Q280,103 280,120L280,250Q280,263 271.5,271.5Q263,280 250,280Q237,280 228.5,271.5Q220,263 220,250L220,164Q162,230 131,311Q100,392 100,480Q100,568 131,649Q162,730 220,796L220,710Q220,697 228.5,688.5Q237,680 250,680Q263,680 271.5,688.5Q280,697 280,710L280,840Q280,857 268.5,868.5Q257,880 240,880L110,880Q97,880 88.5,871.5Q80,863 80,850Q80,837 88.5,828.5Q97,820 110,820L161,820ZM658,833Q635,841 611.5,840.5Q588,840 566,829L340,724Q325,717 319,701.5Q313,686 320,671L322,667Q332,647 350,634.5Q368,622 390,620L458,615L346,308Q340,292 347,277.5Q354,263 370,257Q386,251 400.5,258Q415,265 421,281L551,638Q558,657 547,673.5Q536,690 516,692L469,695L600,756Q607,759 615,759.5Q623,760 630,758L787,701Q818,690 832,659.5Q846,629 835,598L780,448Q774,432 781,417.5Q788,403 804,397Q820,391 834.5,398Q849,405 855,421L910,571Q933,634 905.5,693.5Q878,753 815,776L658,833ZM514,417Q508,401 515,386.5Q522,372 538,366Q554,360 568.5,367Q583,374 589,390L630,502Q636,518 629,533Q622,548 606,554L606,554Q590,560 575,553Q560,546 554,530L514,417ZM640,414Q634,398 641,383.5Q648,369 664,363Q680,357 694.5,364Q709,371 715,387L742,462Q748,478 741.5,492.5Q735,507 719,513L719,513Q703,519 688,512Q673,505 667,489L640,414ZM689,605L689,605L689,605Q689,605 689,605Q689,605 689,605L689,605Q689,605 689,605Q689,605 689,605L689,605L689,605Q689,605 689,605Q689,605 689,605Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/text_ad_off_24px.xml b/app/src/main/res/drawable/text_ad_off_24px.xml
deleted file mode 100644
index 2a108446b..000000000
--- a/app/src/main/res/drawable/text_ad_off_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M840,720Q825,720 812.5,709.5Q800,699 800,679L800,240Q800,240 800,240Q800,240 800,240L361,240Q341,240 331,227.5Q321,215 321,200Q321,185 331,172.5Q341,160 361,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,680Q880,700 867.5,710Q855,720 840,720ZM577,463L577,463L577,463L577,463Q577,463 577,463Q577,463 577,463ZM383,497L383,497L383,497Q383,497 383,497Q383,497 383,497L383,497Q383,497 383,497Q383,497 383,497ZM790,903L686,800L160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L160,160L240,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L606,720L54,168Q42,156 42,139.5Q42,123 54,111Q66,99 82.5,99Q99,99 111,111L847,847Q859,859 859,875Q859,891 847,903Q835,915 818.5,915Q802,915 790,903ZM680,680L240,680Q223,680 211.5,668.5Q200,657 200,640Q200,623 211.5,611.5Q223,600 240,600L600,600L680,680ZM520,520L240,520Q223,520 211.5,508.5Q200,497 200,480Q200,463 211.5,451.5Q223,440 240,440L440,440L520,520ZM360,360L240,360Q223,360 211.5,348.5Q200,337 200,320Q200,303 211.5,291.5Q223,280 240,280L280,280L360,360ZM720,520Q737,520 748.5,508.5Q760,497 760,480Q760,463 748.5,451.5Q737,440 720,440L651,440Q631,440 621,452.5Q611,465 611,480L611,480Q611,495 621,507.5Q631,520 651,520L720,520ZM560,360Q577,360 588.5,348.5Q600,337 600,320Q600,303 588.5,291.5Q577,280 560,280L491,280Q471,280 461,292.5Q451,305 451,320L451,320Q451,335 461,347.5Q471,360 491,360L560,360Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/text_fields_24px.xml b/app/src/main/res/drawable/text_fields_24px.xml
deleted file mode 100644
index 49153d403..000000000
--- a/app/src/main/res/drawable/text_fields_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M297.5,782.5Q280,765 280,740L280,280L140,280Q115,280 97.5,262.5Q80,245 80,220Q80,195 97.5,177.5Q115,160 140,160L540,160Q565,160 582.5,177.5Q600,195 600,220Q600,245 582.5,262.5Q565,280 540,280L400,280L400,740Q400,765 382.5,782.5Q365,800 340,800Q315,800 297.5,782.5ZM657.5,782.5Q640,765 640,740L640,480L580,480Q555,480 537.5,462.5Q520,445 520,420Q520,395 537.5,377.5Q555,360 580,360L820,360Q845,360 862.5,377.5Q880,395 880,420Q880,445 862.5,462.5Q845,480 820,480L760,480L760,740Q760,765 742.5,782.5Q725,800 700,800Q675,800 657.5,782.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/text_select_move_up_24px.xml b/app/src/main/res/drawable/text_select_move_up_24px.xml
deleted file mode 100644
index 7311798a9..000000000
--- a/app/src/main/res/drawable/text_select_move_up_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M800,840L160,840Q143,840 131.5,828.5Q120,817 120,800Q120,783 131.5,771.5Q143,760 160,760L800,760Q817,760 828.5,771.5Q840,783 840,800Q840,817 828.5,828.5Q817,840 800,840ZM440,433L404,469Q393,480 376.5,480Q360,480 348,468Q337,457 337,440Q337,423 348,412L452,308Q464,296 480,296Q496,296 508,308L612,412Q623,423 623.5,439.5Q624,456 612,468Q601,479 584,479Q567,479 556,468L520,433L520,640Q520,657 508.5,668.5Q497,680 480,680Q463,680 451.5,668.5Q440,657 440,640L440,433ZM800,200L160,200Q143,200 131.5,188.5Q120,177 120,160Q120,143 131.5,131.5Q143,120 160,120L800,120Q817,120 828.5,131.5Q840,143 840,160Q840,177 828.5,188.5Q817,200 800,200Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/tooltip_24px.xml b/app/src/main/res/drawable/tooltip_24px.xml
deleted file mode 100644
index 5770d07b4..000000000
--- a/app/src/main/res/drawable/tooltip_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,880L373,720L160,720Q127,720 103.5,696.5Q80,673 80,640L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L587,720L480,880ZM480,736L544,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,640Q160,640 160,640Q160,640 160,640L416,640L480,736ZM480,400L480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/touch_double_24px.xml b/app/src/main/res/drawable/touch_double_24px.xml
deleted file mode 100644
index f008bd374..000000000
--- a/app/src/main/res/drawable/touch_double_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M638,360Q621,360 610,348.5Q599,337 599,320Q599,316 604,300Q612,286 616,271Q620,256 620,240Q620,220 614.5,200.5Q609,181 595,166Q589,159 585,150.5Q581,142 581,133Q581,118 591.5,107Q602,96 617,96Q630,96 640.5,102.5Q651,109 659,119Q681,144 690.5,175.5Q700,207 700,240Q700,266 693.5,291.5Q687,317 673,340Q668,349 658.5,354.5Q649,360 638,360ZM419,880Q391,880 366.5,868Q342,856 325,834L124,579Q116,570 117,557.5Q118,545 126,537L126,537Q146,516 174,512Q202,508 226,523L300,568L300,240Q300,223 311.5,211.5Q323,200 340,200Q357,200 369,211.5Q381,223 381,240L381,640Q381,663 360.5,674.5Q340,686 320,674L284,652L388,785Q394,792 402,796Q410,800 419,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 708.5,531.5Q697,520 680,520L501,520Q484,520 472.5,508.5Q461,497 461,480L461,480Q461,463 472.5,451.5Q484,440 501,440L680,440Q730,440 765,475Q800,510 800,560L800,720Q800,786 753,833Q706,880 640,880L419,880ZM502,620L502,620L502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620L502,620Q502,620 502,620Q502,620 502,620ZM479,360Q462,360 450.5,348.5Q439,337 439,320Q439,318 444,300Q452,286 456,271.5Q460,257 460,240Q460,190 425,155Q390,120 340,120Q290,120 255,155Q220,190 220,240Q220,257 224,271.5Q228,286 236,300Q239,305 240,310Q241,315 241,320Q241,337 230,348.5Q219,360 202,360Q191,360 181.5,354Q172,348 167,339Q154,317 147,292Q140,267 140,240Q140,157 198.5,98.5Q257,40 340,40Q423,40 481.5,98.5Q540,157 540,240Q540,267 533,292Q526,317 513,339Q508,348 499,354Q490,360 479,360Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/undo_24px.xml b/app/src/main/res/drawable/undo_24px.xml
deleted file mode 100644
index 89a3f5b80..000000000
--- a/app/src/main/res/drawable/undo_24px.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M320,760Q303,760 291.5,748.5Q280,737 280,720Q280,703 291.5,691.5Q303,680 320,680L564,680Q627,680 673.5,640Q720,600 720,540Q720,480 673.5,440Q627,400 564,400L312,400L388,476Q399,487 399,504Q399,521 388,532Q377,543 360,543Q343,543 332,532L188,388Q182,382 179.5,375Q177,368 177,360Q177,352 179.5,345Q182,338 188,332L332,188Q343,177 360,177Q377,177 388,188Q399,199 399,216Q399,233 388,244L312,320L564,320Q661,320 730.5,383Q800,446 800,540Q800,634 730.5,697Q661,760 564,760L320,760Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/uppercase_24px.xml b/app/src/main/res/drawable/uppercase_24px.xml
deleted file mode 100644
index 68b9166ae..000000000
--- a/app/src/main/res/drawable/uppercase_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M671.5,708.5Q660,697 660,680L660,472L624,508Q613,519 596,519Q579,519 568,508Q557,497 557,480Q557,463 568,452L672,348Q684,336 700,336Q716,336 728,348L832,452Q843,463 843,480Q843,497 832,508Q821,519 804,519Q787,519 776,508L740,472L740,680Q740,697 728.5,708.5Q717,720 700,720Q683,720 671.5,708.5ZM236,607L204,697Q200,708 191,714Q182,720 171,720Q152,720 141.5,704.5Q131,689 138,672L276,304Q280,293 290,286.5Q300,280 311,280L338,280Q349,280 359,286.5Q369,293 373,304L511,673Q518,690 507.5,705Q497,720 479,720Q468,720 458.5,713.5Q449,707 445,696L414,607L236,607ZM259,543L390,543L325,361L321,361L259,543Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/visibility_off_24px.xml b/app/src/main/res/drawable/visibility_off_24px.xml
deleted file mode 100644
index 50ba19a57..000000000
--- a/app/src/main/res/drawable/visibility_off_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M607,333Q636,362 649.5,399Q663,436 659,475Q659,490 648,500.5Q637,511 622,511Q607,511 596.5,500.5Q586,490 586,475Q591,449 583,425Q575,401 558,384Q541,367 517,358Q493,349 466,354Q451,354 440.5,343Q430,332 430,317Q430,302 440.5,291.5Q451,281 466,281Q504,277 541,290.5Q578,304 607,333ZM480,240Q461,240 443,241.5Q425,243 407,247Q390,250 376.5,242Q363,234 358,218Q353,202 361.5,187Q370,172 386,169Q409,164 432.5,162Q456,160 480,160Q617,160 730.5,232Q844,304 904,426Q908,434 910,442.5Q912,451 912,460Q912,469 910.5,477.5Q909,486 905,494Q887,534 860.5,569Q834,604 802,633Q790,644 774,642Q758,640 748,626Q738,612 739.5,595.5Q741,579 753,568Q777,545 797,518Q817,491 832,460Q782,359 687.5,299.5Q593,240 480,240ZM480,760Q346,760 235,687.5Q124,615 60,497Q55,489 52.5,479.5Q50,470 50,460Q50,450 52,441Q54,432 59,423Q79,383 105.5,346.5Q132,310 166,280L83,196Q72,184 72.5,167.5Q73,151 84,140Q95,129 112,129Q129,129 140,140L820,820Q831,831 831.5,847.5Q832,864 820,876Q809,887 792,887Q775,887 764,876L624,738Q589,749 553,754.5Q517,760 480,760ZM222,336Q193,362 169,393Q145,424 128,460Q178,561 272.5,620.5Q367,680 480,680Q500,680 519,677.5Q538,675 558,672L522,634Q511,637 501,638.5Q491,640 480,640Q405,640 352.5,587.5Q300,535 300,460Q300,449 301.5,439Q303,429 306,418L222,336ZM541,429L541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429ZM390,504Q390,504 390,504Q390,504 390,504L390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/wifi_proxy_24px.xml b/app/src/main/res/drawable/wifi_proxy_24px.xml
deleted file mode 100644
index 92798c29c..000000000
--- a/app/src/main/res/drawable/wifi_proxy_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M700,780L750,780L750,730L700,730L700,780ZM700,670L750,670L750,620L700,620L700,670ZM810,780L860,780L860,730L810,730L810,780ZM700,840Q675,840 657.5,822.5Q640,805 640,780L640,620Q640,595 657.5,577.5Q675,560 700,560L750,560Q775,560 792.5,577.5Q810,595 810,620L810,670L860,670Q885,670 902.5,687.5Q920,705 920,730L920,780Q920,805 902.5,822.5Q885,840 860,840L700,840ZM480,160Q593,160 698.5,195.5Q804,231 892,300Q906,311 913.5,326.5Q921,342 922,359Q923,376 916.5,392.5Q910,409 896,423L851,469Q839,480 822.5,480.5Q806,481 794,469Q782,457 782,440.5Q782,424 794,412L844,362Q844,362 844,362Q844,362 844,362Q765,302 672,271Q579,240 480,240Q381,240 288,271Q195,302 116,362Q116,362 116,362Q116,362 116,362L480,726Q480,726 480,726Q480,726 480,726L491,715Q503,703 519.5,703Q536,703 548,715Q560,727 560,743.5Q560,760 548,772L537,783Q525,795 510,801Q495,807 480,807Q465,807 450,801Q435,795 423,783L63,423Q50,410 43.5,393.5Q37,377 38,360Q39,343 46,327.5Q53,312 67,300Q155,231 261,195.5Q367,160 480,160ZM480,483Q480,483 480,483Q480,483 480,483L480,483Q480,483 480,483Q480,483 480,483L480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483L480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Q480,483 480,483Z"/>
-</vector>
diff --git a/app/src/main/res/layout-port/player_select_source_priority.xml b/app/src/main/res/layout-port/player_select_source_priority.xml
index 926227c58..2cba9c869 100644
--- a/app/src/main/res/layout-port/player_select_source_priority.xml
+++ b/app/src/main/res/layout-port/player_select_source_priority.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:layout_width="match_parent"
@@ -13,13 +14,13 @@
         android:layout_weight="1"
         android:orientation="vertical"
         android:paddingBottom="8dp">
-
+        
         <LinearLayout
             android:id="@+id/subtitles_click_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:gravity="center_vertical"
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
@@ -32,21 +33,14 @@
                 android:textSize="20sp"
                 android:textStyle="bold" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/settings_btt"
-                style="@style/WhiteButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/title_settings" />
-
             <ImageView
                 android:id="@+id/help_btt"
                 android:layout_width="44dp"
                 android:layout_height="44dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/help"
                 android:padding="10dp"
-                android:src="@drawable/baseline_help_outline_24" />
+                android:src="@drawable/baseline_help_outline_24"
+                android:contentDescription="@string/help" />
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -68,7 +62,7 @@
         android:layout_weight="1"
         android:orientation="vertical"
         android:paddingBottom="8dp">
-
+        
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -99,8 +93,8 @@
         android:id="@+id/apply_btt_holder"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:gravity="center_vertical"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:paddingHorizontal="?android:attr/listPreferredItemPaddingStart">
 
         <EditText
@@ -114,19 +108,19 @@
             android:textColor="?attr/textColor"
             android:textSize="20sp"
             android:textStyle="bold"
-            tools:ignore="LabelFor"
-            tools:text="@string/profile_number" />
+            tools:text="@string/profile_number"
+            tools:ignore="LabelFor" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/save_btt"
-            style="@style/WhiteButton"
             android:layout_width="wrap_content"
-            android:text="@string/sort_save" />
+            android:text="@string/sort_save"
+            style="@style/WhiteButton" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/close_btt"
-            style="@style/BlackButton"
             android:layout_width="wrap_content"
-            android:text="@string/sort_close" />
+            android:text="@string/sort_close"
+            style="@style/BlackButton" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/account_edit_dialog.xml b/app/src/main/res/layout/account_edit_dialog.xml
index ae91c16a5..f52c8ea51 100644
--- a/app/src/main/res/layout/account_edit_dialog.xml
+++ b/app/src/main/res/layout/account_edit_dialog.xml
@@ -37,58 +37,32 @@
         android:layout_marginBottom="60dp"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
+        <androidx.cardview.widget.CardView
+            android:layout_width="@dimen/account_select_linear_item_size"
+            android:layout_height="@dimen/account_select_linear_item_size"
+            android:layout_gravity="center"
+            app:cardCornerRadius="@dimen/rounded_image_radius">
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/account_image_holder"
-                android:layout_width="@dimen/account_select_linear_item_size"
-                android:layout_height="@dimen/account_select_linear_item_size"
+            <ImageView
+                android:id="@+id/account_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="center"
+                android:contentDescription="@string/preview_background_img_des"
+                android:focusable="true"
                 android:foreground="@drawable/outline_drawable_forced_round"
-                android:defaultFocusHighlightEnabled="false"
-                android:nextFocusRight="@id/edit_profile_photo_button_holder"
-                android:nextFocusDown="@id/edit_profile_photo_button_holder"
-                app:cardCornerRadius="100dp"
-                app:cardElevation="0dp">
+                android:scaleType="centerCrop"
+                android:src="@drawable/profile_bg_blue" />
 
-                <requestFocus />
-
-                <ImageView
-                    android:id="@+id/account_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/preview_background_img_des"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/profile_bg_blue" />
-            </androidx.cardview.widget.CardView>
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/edit_profile_photo_button_holder"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
+            <ImageView
+                android:id="@+id/edit_profile_photo_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="bottom|end"
-                android:defaultFocusHighlightEnabled="false"
-                android:foreground="@drawable/outline_drawable_forced_round"
-                android:nextFocusLeft="@id/account_image_holder"
-                android:nextFocusUp="@id/account_image_holder"
-                android:nextFocusDown="@id/account_name"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/primaryGrayBackground">
-
-                <ImageView
-                    android:id="@+id/edit_profile_photo_button"
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_baseline_edit_24"
-                    app:tint="@color/white" />
-            </androidx.cardview.widget.CardView>
-        </FrameLayout>
+                android:background="@color/skipOpTransparent"
+                android:padding="5dp"
+                android:src="@drawable/ic_baseline_edit_24" />
+        </androidx.cardview.widget.CardView>
 
         <EditText
             android:id="@+id/account_name"
@@ -97,8 +71,9 @@
             android:autofillHints="username"
             android:hint="@string/default_account"
             android:inputType="text"
-            android:nextFocusUp="@id/edit_profile_photo_button_holder"
-            android:nextFocusDown="@id/lockProfileCheckbox"
+            android:nextFocusLeft="@id/apply_btt"
+            android:nextFocusRight="@id/cancel_btt"
+            android:nextFocusDown="@id/site_url_input"
             android:requiresFadingEdge="vertical"
             android:textColorHint="?attr/grayTextColor"
             tools:ignore="LabelFor" />
@@ -108,11 +83,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:buttonTint="?attr/textColor"
-            android:nextFocusUp="@id/account_name"
-            android:nextFocusDown="@id/apply_btt"
             android:text="@string/lock_profile"
             android:textColor="?attr/grayTextColor" />
 
+
     </LinearLayout>
 
     <RelativeLayout
@@ -130,7 +104,6 @@
             android:layout_width="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_gravity="center_vertical"
-            android:nextFocusUp="@id/lockProfileCheckbox"
             android:nextFocusRight="@id/apply_btt"
             android:text="@string/delete" />
 
@@ -140,8 +113,6 @@
             android:layout_width="wrap_content"
             android:layout_gravity="center_vertical|end"
             android:layout_toStartOf="@+id/cancel_btt"
-            android:nextFocusUp="@id/lockProfileCheckbox"
-            android:nextFocusDown="@id/cancel_btt"
             android:nextFocusLeft="@id/delete_btt"
             android:nextFocusRight="@id/cancel_btt"
             android:text="@string/sort_apply" />
@@ -152,8 +123,6 @@
             android:layout_width="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_gravity="center_vertical|end"
-            android:nextFocusUp="@id/apply_btt"
-            android:nextFocusDown="@id/apply_btt"
             android:nextFocusLeft="@id/apply_btt"
             android:text="@string/sort_cancel" />
 
diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml
index 9b3cef349..3cbfc72fb 100644
--- a/app/src/main/res/layout/account_list_item.xml
+++ b/app/src/main/res/layout/account_list_item.xml
@@ -1,70 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/item_root"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
+    android:id="@+id/card_view"
+    android:layout_width="110dp"
+    android:layout_height="110dp"
     android:layout_margin="10dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="@color/primaryGrayBackground"
     android:focusable="true"
-    android:clickable="true"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:defaultFocusHighlightEnabled="false">
+    android:foreground="?attr/selectableItemBackground"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_percent="0.4"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-    <FrameLayout
+    <ImageView
+        android:id="@+id/account_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.4"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/outline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:clipToPadding="false"
-        android:duplicateParentState="true">
+        android:background="@drawable/outline_card"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/card_view"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_gravity="center"
-            android:backgroundTint="?attr/primaryGrayBackground"
-            android:foreground="@drawable/rounded_outline"
-            android:duplicateParentState="true"
-            app:cardCornerRadius="100dp"
-            app:cardElevation="0dp">
-
-            <ImageView
-                android:id="@+id/account_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop" />
-
-        </androidx.cardview.widget.CardView>
-
-        <ImageView
-            android:id="@+id/lock_icon"
-            android:layout_width="26dp"
-            android:layout_height="26dp"
-            android:layout_gravity="top|end"
-            android:background="@drawable/lock_icon_bg"
-            android:padding="5dp"
-            android:src="@drawable/video_locked"
-            android:visibility="gone"
-            app:tint="@color/white"
-            tools:visibility="visible" />
-
-    </FrameLayout>
+    <ImageView
+        android:id="@+id/lock_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="4dp"
+        android:src="@drawable/video_locked"
+        android:visibility="gone"
+        app:tint="@color/textColor"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/account_name"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_gravity="center"
         android:gravity="center"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:textColor="?attr/textColor"
-        android:textSize="15sp"
-        tools:text="anime" />
+        android:padding="10dp"
+        android:textColor="@color/textColor"
+        android:textSize="16sp"
+        tools:text="Hello World!" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item_add.xml b/app/src/main/res/layout/account_list_item_add.xml
index 7f91f6580..dea64484f 100644
--- a/app/src/main/res/layout/account_list_item_add.xml
+++ b/app/src/main/res/layout/account_list_item_add.xml
@@ -1,51 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/item_root"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
+    android:id="@+id/card_view"
+    android:layout_width="110dp"
+    android:layout_height="110dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="?attr/primaryGrayBackground"
+    android:foreground="?attr/selectableItemBackground"
     android:layout_margin="10dp"
     android:focusable="true"
-    android:clickable="true"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:defaultFocusHighlightEnabled="false">
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_percent="0.4"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_view"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_gravity="center_horizontal"
-        android:backgroundTint="?attr/primaryGrayBackground"
-        android:foreground="@drawable/outline_drawable_forced_round"
-        android:duplicateParentState="true"
-        app:cardCornerRadius="100dp"
-        app:cardElevation="0dp">
+    <ImageView
+        android:layout_gravity="center"
+        android:src="@drawable/ic_baseline_add_24"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/add_account" />
 
-        <ImageView
-            android:layout_gravity="center"
-            android:src="@drawable/ic_baseline_add_24"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/add_account"
-            app:tint="?attr/textColor" />
-
-    </androidx.cardview.widget.CardView>
-
-    <TextView
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:gravity="center"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:textColor="?attr/textColor"
-        android:textSize="15sp"
-        android:text="@string/add_account" />
-
-</LinearLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item_edit.xml b/app/src/main/res/layout/account_list_item_edit.xml
index d1dbef2ef..3f41a23c2 100644
--- a/app/src/main/res/layout/account_list_item_edit.xml
+++ b/app/src/main/res/layout/account_list_item_edit.xml
@@ -1,79 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/item_root"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
+    android:id="@+id/card_view"
+    android:layout_width="110dp"
+    android:layout_height="110dp"
     android:layout_margin="10dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="@color/primaryGrayBackground"
     android:focusable="true"
-    android:clickable="true"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:defaultFocusHighlightEnabled="false">
+    android:foreground="?attr/selectableItemBackground"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_percent="0.4"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-    <FrameLayout
+    <ImageView
+        android:id="@+id/account_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.1"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/outline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:clipToPadding="false"
-        android:duplicateParentState="true">
+        android:background="@drawable/outline_card"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/card_view"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_gravity="center"
-            android:backgroundTint="?attr/primaryGrayBackground"
-            android:foreground="@drawable/rounded_outline"
-            android:duplicateParentState="true"
-            app:cardCornerRadius="100dp"
-            app:cardElevation="0dp">
+    <ImageView
+        android:id="@+id/lock_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="4dp"
+        android:src="@drawable/video_locked"
+        android:visibility="gone"
+        app:tint="@color/textColor"
+        tools:visibility="visible" />
 
-            <ImageView
-                android:id="@+id/account_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.4"
-                android:scaleType="centerCrop" />
-
-            <ImageView
-                android:id="@+id/pencil_icon"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_baseline_edit_24"
-                app:tint="?attr/textColor" />
-
-        </androidx.cardview.widget.CardView>
-
-        <ImageView
-            android:id="@+id/lock_icon"
-            android:layout_width="26dp"
-            android:layout_height="26dp"
-            android:layout_gravity="top|end"
-            android:background="@drawable/lock_icon_bg"
-            android:padding="5dp"
-            android:src="@drawable/video_locked"
-            android:visibility="gone"
-            app:tint="@color/white"
-            tools:visibility="visible" />
-
-    </FrameLayout>
+    <ImageView
+        android:id="@+id/pencil_icon"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="top|start"
+        android:src="@drawable/ic_baseline_edit_24"
+        app:tint="@color/textColor" />
 
     <TextView
         android:id="@+id/account_name"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_gravity="center"
         android:gravity="center"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:textColor="?attr/textColor"
-        android:textSize="15sp"
-        tools:text="anime" />
+        android:padding="10dp"
+        android:textColor="@color/textColor"
+        android:textSize="16sp"
+        tools:text="Hello World!" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_select_linear.xml b/app/src/main/res/layout/account_select_linear.xml
index 65c2ffba9..b78c0d44c 100644
--- a/app/src/main/res/layout/account_select_linear.xml
+++ b/app/src/main/res/layout/account_select_linear.xml
@@ -26,8 +26,6 @@
         android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:itemCount="4"
         tools:listitem="@layout/account_list_item" />
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index 444a04a18..9f62d5601 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -18,7 +18,7 @@
         android:nextFocusDown="@id/account_recycler_view"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/manage_accounts"
-        app:tint="@color/account_edit_btn_tint" />
+        app:tint="@color/player_on_button_tv_attr" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,7 +32,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/select_an_account"
-            android:textColor="?attr/textColor"
             android:textSize="24sp"
             android:textStyle="bold"
             android:layout_marginTop="16dp"
@@ -43,9 +42,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:descendantFocusability="afterDescendants"
-            android:clipChildren="false"
-            android:clipToPadding="false"
             android:paddingLeft="16dp"
             android:paddingRight="16dp" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index eb7c67145..2483a3714 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -82,9 +82,4 @@
                 tools:ignore="FragmentTagUsage" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/compose_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 </FrameLayout>
\ 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 0d81285a6..c51d77d16 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -93,11 +93,6 @@
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/compose_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/bottom_input_dialog.xml b/app/src/main/res/layout/bottom_input_dialog.xml
index 63f5e876d..bfb728052 100644
--- a/app/src/main/res/layout/bottom_input_dialog.xml
+++ b/app/src/main/res/layout/bottom_input_dialog.xml
@@ -4,7 +4,7 @@
     android:nextFocusDown="@id/nginx_text_input"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/text1"
@@ -24,13 +24,13 @@
         android:id="@+id/nginx_text_input"
         android:nextFocusRight="@id/cancel_btt"
         android:nextFocusLeft="@id/apply_btt"
-        android:nextFocusDown="@id/apply_btt"
         android:layout_marginBottom="60dp"
         android:layout_marginHorizontal="10dp"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_rowWeight="1"
         android:autofillHints="no"
         android:inputType="text"
         tools:text="nginx.com"
@@ -42,7 +42,6 @@
         android:layout_gravity="bottom"
         android:gravity="bottom|end"
         android:layout_marginTop="-60dp"
-        android:padding="10dp"
         android:layout_width="match_parent"
         android:layout_height="60dp">
 
@@ -51,8 +50,6 @@
             android:layout_gravity="center_vertical|end"
             android:text="@string/sort_apply"
             android:id="@+id/apply_btt"
-            android:nextFocusUp="@id/nginx_text_input"
-            android:nextFocusRight="@id/cancel_btt"
             style="@style/WhiteButton" />
 
         <com.google.android.material.button.MaterialButton
@@ -60,8 +57,6 @@
             android:layout_gravity="center_vertical|end"
             android:text="@string/sort_cancel"
             android:id="@+id/cancel_btt"
-            android:nextFocusUp="@id/nginx_text_input"
-            android:nextFocusLeft="@id/apply_btt"
             style="@style/BlackButton" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_selection_dialog.xml b/app/src/main/res/layout/bottom_selection_dialog.xml
index 78916970b..55ca6562e 100644
--- a/app/src/main/res/layout/bottom_selection_dialog.xml
+++ b/app/src/main/res/layout/bottom_selection_dialog.xml
@@ -37,7 +37,6 @@
         android:paddingTop="10dp"
         android:dividerHeight="1dp"
         android:requiresFadingEdge="vertical"
-        android:paddingBottom="32dp"
         android:nextFocusRight="@id/cancel_btt"
         android:nextFocusLeft="@id/apply_btt"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index dc1635392..99a764dee 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -227,12 +227,6 @@
         tools:listitem="@layout/homepage_parent"
         tools:visibility="gone" />
 
-    <TextClock
-            android:id="@+id/home_clock"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/home_api_fab"
         style="@style/ExtendedFloatingActionButton"
@@ -260,11 +254,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:visibility="gone" />
-
-    <!-- Placeholder for TV layout settings button - always hidden on phone -->
-    <ImageView
-        android:id="@+id/home_preview_settings_button"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:visibility="gone" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index f8559ab14..d1d5c9e3b 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -93,7 +93,6 @@
                 </LinearLayout>
             </LinearLayout>
         </com.facebook.shimmer.ShimmerFrameLayout>
-
     </FrameLayout>
 
     <LinearLayout
@@ -164,22 +163,6 @@
         tools:listitem="@layout/homepage_parent_tv"
         tools:visibility="gone" />
 
-    <TextClock
-            android:id="@+id/home_clock"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxWidth="600dp"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            android:visibility="visible"
-            android:format12Hour="hh:mm a"
-            android:format24Hour="HH:mm"
-            android:fontFamily="@font/google_sans"
-            android:textStyle="bold"
-            android:gravity="start"
-            android:layout_gravity="start"
-            android:layout_margin="10dp" />
-
     <LinearLayout
         android:id="@+id/home_api_holder"
         android:layout_width="wrap_content"
@@ -200,28 +183,11 @@
             android:gravity="center"
             android:nextFocusLeft="@id/navigation_home"
             tools:text="Hello!"
-            android:nextFocusRight="@id/home_preview_settings_button"
+            android:nextFocusRight="@id/home_preview_reload_provider"
             android:nextFocusDown="@id/home_preview_info_btt" >
             <requestFocus />
         </com.google.android.material.button.MaterialButton>
 
-        <ImageView
-            android:id="@+id/home_preview_settings_button"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:background="@drawable/player_button_tv_attr_no_bg"
-            android:contentDescription="@string/title_settings"
-            android:focusable="true"
-            android:nextFocusLeft="@id/home_change_api"
-            android:nextFocusRight="@id/home_preview_reload_provider"
-            android:nextFocusDown="@id/home_preview_info_btt"
-            android:padding="10dp"
-            android:src="@drawable/ic_baseline_tune_24"
-            android:tag="@string/tv_no_focus_tag"
-            android:visibility="gone"
-            app:tint="@color/player_on_button_tv_attr" />
-
         <ImageView
             android:id="@+id/home_preview_reload_provider"
             android:layout_width="50dp"
@@ -230,7 +196,7 @@
             android:background="@drawable/player_button_tv_attr_no_bg"
             android:contentDescription="@string/reload_provider"
             android:focusable="true"
-            android:nextFocusLeft="@id/home_preview_settings_button"
+            android:nextFocusLeft="@id/home_change_api"
             android:nextFocusRight="@id/home_preview_search_button"
             android:nextFocusUp="@id/home_preview_reload_provider"
             android:nextFocusDown="@id/home_preview_info_btt"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 9db120ad0..a5c933d6a 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -553,8 +553,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:paddingTop="20dp"
-                        android:paddingBottom="20dp"
+                        android:paddingTop="50dp"
                         android:text="@string/coming_soon"
                         android:textColor="?attr/textColor"
                         android:textSize="20sp"
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index b06886a97..3dff8f0d5 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -631,18 +631,6 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 </LinearLayout>
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/result_cast_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                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"
@@ -666,8 +654,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
+                android:paddingTop="50dp"
                 android:text="@string/coming_soon"
                 android:textColor="?attr/textColor"
                 android:textSize="20sp"
@@ -1005,6 +992,17 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 </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"
@@ -1038,8 +1036,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
+                android:paddingTop="50dp"
                 android:text="@string/coming_soon"
                 android:textColor="?attr/textColor"
                 android:textSize="20sp"
diff --git a/app/src/main/res/layout/fragment_setup_extensions.xml b/app/src/main/res/layout/fragment_setup_extensions.xml
index 151c9e0ec..e52885046 100644
--- a/app/src/main/res/layout/fragment_setup_extensions.xml
+++ b/app/src/main/res/layout/fragment_setup_extensions.xml
@@ -55,8 +55,6 @@
         android:id="@+id/repo_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:nextFocusLeft="@id/prev_btt"
-        android:nextFocusRight="@id/next_btt"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/repository_item"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_setup_language.xml b/app/src/main/res/layout/fragment_setup_language.xml
index bdba3f209..93afe823e 100644
--- a/app/src/main/res/layout/fragment_setup_language.xml
+++ b/app/src/main/res/layout/fragment_setup_language.xml
@@ -31,8 +31,6 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/skip_btt"
-        android:nextFocusRight="@id/next_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_setup_layout.xml b/app/src/main/res/layout/fragment_setup_layout.xml
index 9e891e1aa..18815ced3 100644
--- a/app/src/main/res/layout/fragment_setup_layout.xml
+++ b/app/src/main/res/layout/fragment_setup_layout.xml
@@ -29,8 +29,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/prev_btt"
-        android:nextFocusRight="@id/next_btt"
+        android:nextFocusLeft="@id/apply_btt"
+        android:nextFocusRight="@id/cancel_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_setup_media.xml b/app/src/main/res/layout/fragment_setup_media.xml
index c1154405e..154db3386 100644
--- a/app/src/main/res/layout/fragment_setup_media.xml
+++ b/app/src/main/res/layout/fragment_setup_media.xml
@@ -26,8 +26,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/prev_btt"
-        android:nextFocusRight="@id/next_btt"
+        android:nextFocusLeft="@id/apply_btt"
+        android:nextFocusRight="@id/cancel_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/fragment_setup_provider_languages.xml b/app/src/main/res/layout/fragment_setup_provider_languages.xml
index e92f1135b..8dc889178 100644
--- a/app/src/main/res/layout/fragment_setup_provider_languages.xml
+++ b/app/src/main/res/layout/fragment_setup_provider_languages.xml
@@ -29,8 +29,8 @@
         android:layout_height="match_parent"
         android:layout_rowWeight="1"
         android:layout_marginBottom="60dp"
-        android:nextFocusLeft="@id/prev_btt"
-        android:nextFocusRight="@id/next_btt"
+        android:nextFocusLeft="@id/apply_btt"
+        android:nextFocusRight="@id/cancel_btt"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 5ccc3ff09..04a2a1f1f 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -264,15 +264,6 @@
                             tools:visibility="visible"
                             android:layout_gravity="center"/>
                     </LinearLayout>
-
-                    <TextClock
-                        android:id="@+id/player_video_clock"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:gravity="end"
-                        android:visibility="gone"
-                        android:textStyle="bold" />
                 </LinearLayout>
 
                 <!-- Removed as it has no use anymore-->
@@ -1085,8 +1076,6 @@
 
     <FrameLayout
         android:id="@+id/subtitle_holder"
-        android:clipChildren="false"
-        android:clipToPadding="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
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 c6445d80f..077929d87 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -352,22 +352,6 @@
                     android:layout_marginEnd="32dp"
                     android:orientation="vertical">
 
-                    <TextClock
-                            android:id="@+id/player_video_clock"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end"
-                            android:gravity="end"
-                            android:maxWidth="600dp"
-                            android:textAlignment="viewEnd"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            android:visibility="visible"
-                            android:format12Hour="hh:mm a"
-                            android:format24Hour="HH:mm"
-                            android:fontFamily="@font/google_sans"
-                            android:textStyle="bold" />
-
                     <LinearLayout
                         android:id="@+id/player_video_title_holder"
                         android:layout_width="wrap_content"
@@ -1132,8 +1116,6 @@
 
     <FrameLayout
         android:id="@+id/subtitle_holder"
-        android:clipChildren="false"
-        android:clipToPadding="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/player_select_source_priority.xml b/app/src/main/res/layout/player_select_source_priority.xml
index 0d825de77..182cd1861 100644
--- a/app/src/main/res/layout/player_select_source_priority.xml
+++ b/app/src/main/res/layout/player_select_source_priority.xml
@@ -160,13 +160,6 @@
         <!--            android:layout_gravity="center"-->
         <!--            android:src="@drawable/outline_edit_24" />-->
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/settings_btt"
-            style="@style/WhiteButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:text="@string/title_settings" />
-
         <Space
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/sort_bottom_single_provider_choice.xml b/app/src/main/res/layout/sort_bottom_single_provider_choice.xml
index ea778c488..657e2f2b8 100644
--- a/app/src/main/res/layout/sort_bottom_single_provider_choice.xml
+++ b/app/src/main/res/layout/sort_bottom_single_provider_choice.xml
@@ -10,31 +10,13 @@
         style="@style/CheckLabel"
         android:layout_gravity="center"
         tools:text="hello" />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <ImageView
+        android:id="@+id/pinicon"
+        android:layout_width="50dp"
+        android:layout_height="24dp"
         android:layout_gravity="end|center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/action_settings"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_baseline_tune_24"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:contentDescription="@string/title_settings" />
-
-        <ImageView
-            android:id="@+id/pinicon"
-            android:layout_width="50dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/pin_ic"
-            android:visibility="gone"
-            tools:visibility="visible"
-            tools:ignore="RtlHardcoded" />
-    </LinearLayout>
+        android:src="@drawable/pin_ic"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:ignore="RtlHardcoded" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/source_profile_settings_dialog.xml b/app/src/main/res/layout/source_profile_settings_dialog.xml
deleted file mode 100644
index 3f1f39fed..000000000
--- a/app/src/main/res/layout/source_profile_settings_dialog.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/profile_settings_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/primaryBlackBackground"
-    android:orientation="vertical">
-
-    <!--    <ScrollView-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="match_parent">-->
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/profile_settings"
-            android:textColor="?attr/textColor"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/profile_hide_negative_sources"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusDown="@id/profile_hide_error_sources"
-            android:text="@string/profile_hide_negative_sources"
-            app:drawableEndCompat="@null"
-            app:trackTint="@color/toggle_selector" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/profile_hide_error_sources"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/profile_hide_negative_sources"
-            android:nextFocusDown="@id/apply_btt"
-            android:text="@string/profile_hide_error_sources"
-            app:drawableEndCompat="@null"
-            app:trackTint="@color/toggle_selector" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_gravity="bottom"
-                android:gravity="bottom|end"
-                android:orientation="horizontal"
-                tools:ignore="UselessParent">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/apply_btt"
-                    style="@style/WhiteButton"
-                    android:layout_width="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:nextFocusRight="@id/cancel_btt"
-                    android:nextFocusUp="@id/subtitles_italic"
-                    android:text="@string/sort_apply"
-                    android:visibility="visible">
-
-                    <requestFocus />
-                </com.google.android.material.button.MaterialButton>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/cancel_btt"
-                    style="@style/BlackButton"
-                    android:layout_width="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:nextFocusLeft="@id/apply_btt"
-                    android:nextFocusUp="@id/subtitles_remove_captions"
-                    android:text="@string/sort_cancel" />
-            </LinearLayout>
-        </LinearLayout>
-
-
-    </LinearLayout>
-    <!--    </ScrollView>-->
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index b1dc96479..88a318874 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -102,8 +102,6 @@
 
     <FrameLayout
         android:id="@+id/subtitle_holder"
-        android:clipChildren="false"
-        android:clipToPadding="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -171,12 +169,6 @@
             android:layout_marginEnd="32dp"
             android:orientation="vertical">
 
-            <TextClock
-                android:id="@+id/player_video_clock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
-
             <LinearLayout
                 android:id="@+id/player_video_title_holder"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index a65e3706d..27f186a00 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -137,7 +137,7 @@
 
     <fragment
         android:id="@+id/navigation_settings_player"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsPlayer2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsPlayer"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
@@ -161,7 +161,7 @@
 
     <fragment
         android:id="@+id/navigation_settings_ui"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsUI2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsUI"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
@@ -179,7 +179,7 @@
 
     <fragment
         android:id="@+id/navigation_settings_general"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsGeneral2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsGeneral"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
@@ -247,7 +247,7 @@
 
     <fragment
         android:id="@+id/navigation_settings_providers"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsProviders2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsProviders"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
@@ -256,7 +256,7 @@
 
     <fragment
         android:id="@+id/navigation_settings_updates"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsUpdates2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsUpdates"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
@@ -265,7 +265,7 @@
 
     <fragment
         android:id="@+id/navigation_settings_account"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsAccount2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsAccount"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
@@ -356,7 +356,7 @@
     </fragment>
     <fragment
         android:id="@+id/navigation_settings"
-        android:name="com.lagradost.cloudstream3.ui.settings.SettingsFragment2"
+        android:name="com.lagradost.cloudstream3.ui.settings.SettingsFragment"
         android:layout_height="match_parent"
         android:label="@string/title_settings"
         app:enterAnim="@anim/enter_anim"
@@ -416,7 +416,7 @@
 
     <fragment
         android:id="@+id/navigation_subtitles"
-        android:name="com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment2"
+        android:name="com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment"
         android:layout_height="match_parent"
         android:label="@string/subtitles_settings"
         app:enterAnim="@anim/enter_anim"
@@ -427,7 +427,7 @@
 
     <fragment
         android:id="@+id/navigation_chrome_subtitles"
-        android:name="com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment2"
+        android:name="com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment"
         android:layout_height="match_parent"
         android:label="@string/chromecast_subtitles_settings"
         app:enterAnim="@anim/enter_anim"
diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index 65fcc149d..f543136dc 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -756,9 +756,4 @@
     <string name="video_singular">مقطع</string>
     <string name="skip_type_preview">استعراض</string>
     <string name="player_is_live">البث قائم</string>
-    <string name="tv_layout_clock_settings">أظهر ساعة الوقت الحقيقي</string>
-    <string name="tv_layout_clock_settings_des">أظهر شاشة الوقت الحقيقي في قمة الشاشة. ينطبق على الصفحة الرئيسية و المشغل</string>
-    <string name="profile_settings">اعدادات الملف الشخصي</string>
-    <string name="profile_hide_negative_sources">أخفي المصادر صاحبة الأولوية السلبية</string>
-    <string name="profile_hide_error_sources">أخفي المصادر التي تحتوي أخطاء</string>
 </resources>
diff --git a/app/src/main/res/values-b+bn/strings.xml b/app/src/main/res/values-b+bn/strings.xml
index 39ca9396e..adc1b3f19 100644
--- a/app/src/main/res/values-b+bn/strings.xml
+++ b/app/src/main/res/values-b+bn/strings.xml
@@ -3,7 +3,7 @@
     <string name="result_poster_img_des">পোস্টার</string>
     <string name="play_with_app_name">ক্লাউডস্ট্রিম দিয়ে চালান</string>
     <string name="title_home">হোম</string>
-    <string name="cast_format" formatted="true">অভিনয়ে: %s</string>
+    <string name="cast_format" formatted="true">অভিনয়েঃ %s</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dদিন %2$dঘন্টা %3$dমিনিট</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dঘন্টা %2$dমিনিট</string>
     <string name="next_episode_time_min_format" formatted="true">%d মিনিট</string>
@@ -22,7 +22,7 @@
     <string name="title_search">খুঁজুন</string>
     <string name="title_downloads">ডাউনলোডসমূহ</string>
     <string name="title_settings">সেটিংস</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s পর্ব %2$d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s এপি %2$d</string>
     <string name="next_episode_format" formatted="true">পর্ব %d মুক্তির তারিখ</string>
     <string name="result_share">শেয়ার</string>
     <string name="result_open_in_browser">ব্রাউজারে খুলুন</string>
@@ -131,8 +131,8 @@
     <string name="backup_failed">স্টোরেজ এর অনুমতি অনুপস্থিত। দয়া করে আবার চেষ্টা করুন।</string>
     <string name="settings_info">তথ্য</string>
     <string name="show_trailers_settings">ট্রেইলার প্রদর্শন করুন</string>
-    <string name="kitsu_settings">Kitsu থেকে পোস্টারসমূহ প্রদর্শন করুন</string>
-    <string name="automatic_plugin_updates">স্বয়ংক্রিয় প্লাগইন আপডেট</string>
+    <string name="kitsu_settings">কিটসু হতে পোস্টারসমূহ প্রদর্শন করুন</string>
+    <string name="automatic_plugin_updates">স্বয়ংক্রিয়ভাবে প্লাগিন এর হালনাগাদ</string>
     <string name="automatic_plugin_download">স্বয়ংক্রিয়ভাবে প্লাগিনসমুহের ডাউনলোড</string>
     <string name="category_updates">হালনাগাদ ও ব্যাকআপ</string>
     <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
@@ -148,9 +148,9 @@
     <string name="double_tap_to_seek_settings_des">সামনে বা পিছনের দিকে যেতে ডান বা বাম দিকে দুবার আলতো চাপুন</string>
     <string name="delete_file">ফাইল ডিলিট</string>
     <string name="subs_default_reset_toast">মান ডিফল্ট এ রিসেট করুন</string>
-    <string name="updates_settings_des">স্টার্টআপে নতুন আপডেটের জন্য স্বয়ংক্রিয়ভাবে অনুসন্ধান করুন যোগ।</string>
+    <string name="updates_settings_des">স্টার্টআপে নতুন আপডেটের জন্য স্বয়ংক্রিয়ভাবে অনুসন্ধান করুন</string>
     <string name="movies_singular">সিনেমা</string>
-    <string name="show_fillers_settings">অ্যানিমে ফিলার পর্ব প্রদর্শন</string>
+    <string name="show_fillers_settings">এনিমে এর ফিলার পর্ব দেখায়</string>
     <string name="tv_series">টিভি সিরিজ</string>
     <string name="no_links_found_toast">লিংক পাওয়া যায়নি</string>
     <string name="benene_des">চা খাওয়ানো হয়েছে</string>
@@ -174,7 +174,7 @@
     <string name="delete">ডিলিট</string>
     <string name="start">শুরু</string>
     <string name="cartoons">কার্টুন</string>
-    <string name="apk_installer_settings_des">Some devices do not support the new package installer. Try the legacy option if updates do not install।</string>
+    <string name="apk_installer_settings_des">কিছু ফোন নতুন প্যাকেজ ইনস্টলার সাপোর্ট করে না। যদি আপডেটগুলি ইনস্টল না হয় তবে পুরোনো পদ্ধতি ব্যবহার করে দেখুন।</string>
     <string name="no_subtitles">সাবটাইটেল নেই</string>
     <string name="no_chromecast_support_toast">এই প্রোভাইডার ক্রোমকাস্ট সাপোর্ট করে না</string>
     <string name="advanced_search">উন্নত অনুসন্ধান</string>
@@ -204,7 +204,7 @@
     <string name="anim">আমাদের তৈরি Anime দেখার অ্যাপ্লিকেশন</string>
     <string name="nsfw">18+</string>
     <string name="anime">এনিমে</string>
-    <string name="pref_filter_search_quality">অনুসন্ধানের ফলে নির্বাচিত ভিডিওর মান লুকান</string>
+    <string name="pref_filter_search_quality">অনুসন্ধান ফলাফলে নির্বাচিত ভিডিও কুয়ালিটি লুকান</string>
     <string name="app_storage">অ্যাপ</string>
     <string name="livestreams">লাইভস্ট্রিম</string>
     <string name="apk_installer_settings">APK ইনস্টলার</string>
@@ -220,7 +220,7 @@
     <string name="episode_sync_settings_des">আপনার বর্তমান পর্বের অগ্রগতি স্বয়ংক্রিয়ভাবে সিঙ্ক করুন</string>
     <string name="automatic_plugin_download_mode_title">প্লাগইন ডাউনলোড ফিল্টার করতে মোড নির্বাচন করুন</string>
     <string name="links_reloaded_toast">লিঙ্ক পুনরায় লোড হয়েছে</string>
-    <string name="switch_account">অ্যাকাউন্ট পরিবর্তন</string>
+    <string name="switch_account">সুইচ অ্যাকাউন্ট</string>
     <string name="legal_notice">দাবিত্যাগ</string>
     <string name="asian_drama_singular">এশিয়ান ড্রামা</string>
     <string name="video_source">সোর্স</string>
@@ -256,7 +256,7 @@
     <string name="tv_layout">টিভি লেআউট</string>
     <string name="example_username">ব্যবহারকারীর নাম</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="example_site_name">নতুন সাইটের নাম</string>
+    <string name="example_site_name">NewSiteName</string>
     <string name="action_default">ডিফল্ট</string>
     <string name="ova">OVA</string>
     <string name="ova_singular">ওভিয়ে</string>
@@ -302,7 +302,7 @@
     <string name="subscribe_tooltip">নতুন এপিসোডের নোটিফিকেশন</string>
     <string name="result_search_tooltip">অন্য এক্সটেনশনের মধ্যে খুঁজুন</string>
     <string name="no_update_found">কোন আপডেট পাওয়া যায়নি</string>
-    <string name="example_password">অ আ ক খ ১২৩</string>
+    <string name="example_password">password123</string>
     <string name="episode_upcoming_format" formatted="true">আসছে %s সময়ের মধ্যে</string>
     <string name="cancel">বাতিল করুন</string>
     <string name="resume_remaining" formatted="true">%s \nঅবশিষ্ট</string>
@@ -322,7 +322,7 @@
     <string name="update">আপডেট</string>
     <string name="watch_quality_pref">ওয়াইফাই তে যে কোয়ালিটিতে দেখতে চান</string>
     <string name="watch_quality_pref_data">মোবাইল ডাটায় যে কোয়ালিটিতে দেখতে চান</string>
-    <string name="limit_title_rez">প্লেয়ারের তথ্য দেখুন</string>
+    <string name="limit_title_rez">ভিডিও প্লেয়ারে রেজুলেশন</string>
     <string name="video_buffer_size_settings">ভিডিও বাফার সাইজ</string>
     <string name="video_buffer_length_settings">ভিডিও বাফার লেনথ</string>
     <string name="dns_pref_summary">যখন আইএসপি ব্লক করবে তখন কার্যকরী</string>
@@ -353,73 +353,4 @@
     <string name="play_from_beginning_img_des">শুরু থেকে চালু করুন</string>
     <string name="speech_recognition_unavailable">স্পিচ রিকগনিশন উপলব্ধ নেই</string>
     <string name="begin_speaking">কথা বলা শুরু করুন…</string>
-    <string name="download_queue">ডাউনলোড তালিকা</string>
-    <string name="play_full_series_button">সম্পূর্ণ সিরিজ প্লে করুন</string>
-    <string name="torrent_info">এই ভিডিওটি একটি টরেন্ট, অর্থাৎ আপনার ভিডিও অ্যাক্টিভিটি ট্র্যাক করা সম্ভব।\nএগোনোর আগে টরেন্টিং সম্পর্কে ভালোভাবে বুঝে নিন।</string>
-    <string name="downloads_delete_select">ডিলিট করার জন্য আইটেম সিলেক্ট করুন</string>
-    <string name="downloads_empty">বর্তমানে কোনো ডাউনলোড নেই।</string>
-    <string name="queue_empty_message">বর্তমানে কোনো ডাউনলোড অপেক্ষায় নেই।</string>
-    <string name="offline_file">অফলাইনে দেখার জন্য উপলব্ধ</string>
-    <string name="select_all">সব সিলেক্ট করুন</string>
-    <string name="deselect_all">সব ডিসিলেক্ট করুন</string>
-    <string name="open_local_video">লোকাল ভিডিও খুলুন</string>
-    <string name="extra_brightness_settings">অতিরিক্ত ব্রাইটনেস</string>
-    <string name="extra_brightness_settings_des">ডিসপ্লে ব্রাইটনেস ১০০% ছাড়িয়ে গেলে ব্রাইটনেস ফিল্টার চালু করুন</string>
-    <string name="search_suggestions">সার্চ সাজেশন</string>
-    <string name="search_suggestions_des">টাইপ করার সময় সার্চ সাজেশন দেখান</string>
-    <string name="clear_suggestions">সাজেশন মুছে ফেলুন</string>
-    <string name="show_player_metadata_overlay">প্লেয়ার মেটাডেটা ওভারলে প্রদর্শন</string>
-    <string name="show_cast_in_details">কাস্ট প্যানেল প্রদর্শন</string>
-    <string name="install_prerelease">প্রাক-মুক্তি সংস্করণ ইনস্টলেশন</string>
-    <string name="prerelease_already_installed">প্রাক-মুক্তি সংস্করণ ইতোমধ্যে ইনস্টল রয়েছে।</string>
-    <string name="prerelease_install_failed">প্রাক-মুক্তি সংস্করণ ইনস্টল করতে সমস্যা হয়েছে।</string>
-    <string name="delete_format" formatted="true">(%1$d | %2$s) মুছুন</string>
-    <string name="test_warning">সাবধান</string>
-    <string name="delete_message_multiple" formatted="true">আপনি কি নিম্নলিখিত আইটেমগুলো স্থায়ীভাবে মুছতে চান?\n\n%s</string>
-    <string name="delete_files">ফাইল মুছুন</string>
-    <string name="delete_message_series_episodes" formatted="true">আপনি কি নিশ্চিত যে আপনি %1$s-এ নিচের এপিসোডগুলো স্থায়ীভাবে মুছে ফেলতে চান?\n\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">আপনি নিচের সিরিজগুলোর সব এপিসোডও স্থায়ীভাবে মুছে ফেলবেন:\n\n%s</string>
-    <string name="delete_message_series_only" formatted="true">আপনি কি নিশ্চিত যে আপনি নিচের সিরিজটির সব এপিসোড স্থায়ীভাবে মুছে ফেলতে চান?\n\n%s</string>
-    <string name="music_singular">সঙ্গীত</string>
-    <string name="audio_book_singular">অডিও বই</string>
-    <string name="custom_media_singular">মিডিয়া</string>
-    <string name="audio_singular">অডিও</string>
-    <string name="podcast_singular">পডকাস্ট</string>
-    <string name="video_singular">ভিডিও</string>
-    <string name="encoding_error">এনকোডিং ত্রুটি</string>
-    <string name="unsupported_error">অসমর্থিত ত্রুটি</string>
-    <string name="episode_action_cast_mirror">কাস্ট মিরর</string>
-    <string name="episode_action_play_mirror">প্লে মিরর</string>"
-    <string name="show_rating">রেটিং লেবেল</string>
-    <string name="show_episode_text">পর্বের বিবরণ</string>
-    <string name="android_tv_interface_on_seek_settings">প্লেয়ারে প্রদর্শিত - স্কিপের পরিমাণ</string>
-    <string name="android_tv_interface_on_seek_settings_summary">প্লেয়ার দৃশ্যমান থাকলে যে সময় পরিমাণ স্কিপ করা হয়</string>
-    <string name="jsdelivr_enabled">GitHub-এর সাথে সংযোগ করা যায়নি। jsDelivr proxy চালু করা হচ্ছে।</string>
-    <string name="jsdelivr_proxy_summary">jsDelivr ব্যবহার করে GitHub-এর সরাসরি লিংক ব্লক করা এড়িয়ে যান। এতে আপডেট কয়েকদিন বিলম্বিত হতে পারে।</string>
-    <string name="pref_category_security">নিরাপত্তা</string>
-    <string name="pref_category_accounts">অ্যাকাউন্টসমূহ</string>
-    <string name="tv_layout_clock_settings">লাইভ ঘড়ি দেখান</string>
-    <string name="tv_layout_clock_settings_des">পর্দার উপরের অংশে লাইভ ঘড়ি দেখায়। হোমপেজ ও প্লেয়ারে প্রযোজ্য</string>
-    <string name="login_format" formatted="true">%1$s %2$s</string>
-    <string name="extra_brightness_key">অতিরিক্ত_উজ্জ্বলতা_সক্রিয়</string>
-    <string name="auth_locally">স্থানীয়ভাবে ব্যবহারকারী যাচাই</string>
-    <string name="add_sync">ট্র্যাকিং যোগ করা</string>
-    <string name="upload_sync">সমন্বয়</string>
-    <string name="sync_score">মূল্যায়ন</string>
-    <string name="authenticated_user" formatted="true">%s ব্যবহারকারী প্রমাণিত</string>
-    <string name="added_sync_format" formatted="true">%s যোগ করা হয়েছে</string>
-    <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user_fail" formatted="true">%s-এ লগইন করা যায়নি</string>
-    <string name="none">কোনোটি নয়</string>
-    <string name="normal">স্বাভাবিক</string>
-    <string name="all">সব</string>
-    <string name="max">সর্বোচ্চ</string>
-    <string name="min">সর্বনিম্ন</string>
-    <string name="subtitles_outline">সীমারেখা</string>
-    <string name="subtitles_shadow">ছায়া</string>
-    <string name="subtitles_raised">উত্থিত</string>
-    <string name="subtitle_offset">সাবটাইটেল সিঙ্ক করুন</string>
-    <string name="subtitle_offset_hint">১০০০ মিলিসেকেন্ড</string>
-    <string name="subtitle_offset_title">সাবটাইটেল বিলম্ব</string>
-    <string name="subtitle_offset_extra_hint_later_format">সাবটাইটেল যদি %d মিলিসেকেন্ড আগে দেখায় তবে এটি ব্যবহার করুন</string>
 </resources>
diff --git a/app/src/main/res/values-b+cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
index a441d894a..983a03db7 100644
--- a/app/src/main/res/values-b+cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -322,8 +322,8 @@
     <string name="home_random">Náhodný</string>
     <string name="coming_soon">Již brzy…</string>
     <string name="quality_cam">Kam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Kam</string>
+    <string name="quality_cam_hd">Kam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -344,7 +344,7 @@
     <string name="resolution">Rozlišení</string>
     <string name="error_invalid_id">Neplatné ID</string>
     <string name="subtitles_remove_captions">Odstranit skryté titulky z titulků</string>
-    <string name="subtitles_remove_bloat">Odstranit reklamy z titulků</string>
+    <string name="subtitles_remove_bloat">Odstranit nadbytečné titulky</string>
     <string name="extras">Extra</string>
     <string name="action_mark_as_watched">Označit jako zhlédnuté</string>
     <string name="history">Historie</string>
@@ -660,7 +660,7 @@
     <string name="starting_plugin_update_manually">Spouštím proces aktualizace doplňků!</string>
     <string name="no_plugins_updated_manually">Nebyly aktualizovány žádné doplňky.</string>
     <string name="sort_button_episode">Ep %s</string>
-    <string name="plugins_updated_manually">Úspěšně aktualizováno %d doplňků</string>
+    <string name="plugins_updated_manually">Úspěšně aktualizováno %d doplňků!</string>
     <string name="sort_episodes_number_desc">Epizoda (sestupně)</string>
     <string name="sort_episodes_rating_low_high">Hodnocení (nejnižší)</string>
     <string name="update_plugins_manually">Ručně aktualizovat doplňky</string>
@@ -754,20 +754,4 @@
     <string name="video_singular">Video</string>
     <string name="skip_type_preview">Náhled</string>
     <string name="player_is_live">Živě</string>
-    <string name="profile_settings">Nastavení profilu</string>
-    <string name="profile_hide_negative_sources">Skrýt zdroje s negativní prioritou</string>
-    <string name="profile_hide_error_sources">Skrýt zdroje s chybami</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d skrytý odkaz</item>
-        <item quantity="few">%d skryté odkazy</item>
-        <item quantity="many">%d skrytých odkazů</item>
-        <item quantity="other">%d skrytých odkazů</item>
-    </plurals>
-    <string name="tv_layout_clock_settings">Zobrazit hodiny s reálným časem</string>
-    <string name="tv_layout_clock_settings_des">Zobrazit hodiny s reálným časem v horní části obrazovky. Platí pro domovskou obrazovku a přehrávač</string>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Spustit videa pozastavená</string>
-    <string name="start_paused_settings_des">Snížit stres při výběru zdrojů</string>
-    <string name="subs_edge">Hrana</string>
-    <string name="background">Pozadí</string>
 </resources>
diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index f00db9ab4..e674fafd6 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -639,7 +639,7 @@
     <string name="software_decoding_desc">Softwaredekodierung ermöglicht es dem Player, Videodateien abzuspielen, die von deinem Gerät nicht unterstützt werden, könnte jedoch bei hoher Auflösung zu ruckelnder oder instabiler Wiedergabe führen.</string>
     <string name="torrent_not_accepted">App neu starten und Stream Torrent Pop-Up akzeptieren, um fortzufahren.</string>
     <string name="update_plugins">Plugins aktualisieren</string>
-    <string name="plugins_updated_manually">%d Plugin(s) erfolgreich aktualisiert</string>
+    <string name="plugins_updated_manually">%d Plugin(s) erfolgreich aktualisiert!</string>
     <string name="update_plugins_manually">Plugins manuell aktualisieren</string>
     <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Nicht unterstützter Fehler</string>
@@ -735,13 +735,4 @@
     <string name="video_singular">Video</string>
     <string name="skip_type_preview">Vorschau</string>
     <string name="player_is_live">Live</string>
-    <string name="tv_layout_clock_settings">Echtzeituhr anzeigen</string>
-    <string name="tv_layout_clock_settings_des">Echtzeituhr oben auf dem Bildschirm anzeigen. Gilt für Startseite und Player</string>
-    <string name="profile_settings">Profil-Einstellungen</string>
-    <string name="profile_hide_negative_sources">Quellen mit negativer Priorität verbergen</string>
-    <string name="profile_hide_error_sources">Quellen mit Fehlern ausblenden</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d ausgeblendeter Link</item>
-        <item quantity="other">%d ausgeblendete Links</item>
-    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+es/strings.xml b/app/src/main/res/values-b+es/strings.xml
index df6b181f1..167de546d 100644
--- a/app/src/main/res/values-b+es/strings.xml
+++ b/app/src/main/res/values-b+es/strings.xml
@@ -647,7 +647,7 @@
     <string name="update_plugins">Actualizar complementos</string>
     <string name="sort_episodes_date_oldest">Fecha de emisión (más antigua)</string>
     <string name="sort_button_rating">Puntuar %s</string>
-    <string name="plugins_updated_manually">%d complemento(s) actualizados correctamente</string>
+    <string name="plugins_updated_manually">¡%d complemento(s) actualizados correctamente!</string>
     <string name="no_plugins_updated_manually">No se actualizó ningún complemento.</string>
     <string name="sort_episodes_number_asc">Episodio (Ascendente)</string>
     <string name="speech_recognition_unavailable">Reconocimiento de habla no disponible</string>
@@ -737,14 +737,4 @@
     <string name="video_singular">Vídeo</string>
     <string name="skip_type_preview">Vista previa</string>
     <string name="player_is_live">En Vivo</string>
-    <string name="tv_layout_clock_settings">Mostrar reloj en tiempo real</string>
-    <string name="tv_layout_clock_settings_des">Muestra un reloj en tiempo real en la parte superior de la pantalla. Se aplica a la página de inicio y al reproductor</string>
-    <string name="profile_settings">Configuración del perfil</string>
-    <string name="profile_hide_negative_sources">Ocultar fuentes con prioridad negativa</string>
-    <string name="profile_hide_error_sources">Ocultar fuentes con errores</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d enlace oculto</item>
-        <item quantity="many">%d enlaces ocultos</item>
-        <item quantity="other">%d enlaces ocultos</item>
-    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
index bcfb3608a..bf401b20a 100644
--- a/app/src/main/res/values-b+fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -366,7 +366,7 @@
     <string name="quality_uhd">UHD</string>
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_4k">4K</string>
@@ -384,7 +384,7 @@
     <string name="go_forward_30">+30</string>
     <string name="quality_cam">Cam</string>
     <string name="subtitles_remove_bloat">Supprimer les éléments superflus des sous-titres</string>
-    <string name="quality_cam_rip">CamRip</string>
+    <string name="quality_cam_rip">Cam</string>
     <string name="trailer">Trailer</string>
     <string name="provider_languages_tip">Regardez les vidéos dans ces langues</string>
     <string name="app_layout_subtext">Modifier le style de l\'application pour être assortie à votre appareil</string>
@@ -641,7 +641,7 @@
     <string name="sort_button_rating">Note %s</string>
     <string name="sort_button_date">Date %s</string>
     <string name="update_plugins">Mettre à jour les plugins</string>
-    <string name="plugins_updated_manually">%d plugin(s) mis à jour avec succès</string>
+    <string name="plugins_updated_manually">%d plugin(s) mis à jour avec succès !</string>
     <string name="no_plugins_updated_manually">Aucun plugin n\'a été mis à jour.</string>
     <string name="sort_episodes_rating_high_low">Note (Plus Haute)</string>
     <string name="update_plugins_manually">Mettre à jour les plugins manuellement</string>
@@ -737,18 +737,5 @@
     <string name="show_player_metadata_overlay">Afficher les métadata de l\'overlay du lecteur vidéo</string>
     <string name="video_singular">Vidéo</string>
     <string name="skip_type_preview">Prévisualisation</string>
-    <string name="player_is_live">Live</string>
-    <string name="profile_hide_negative_sources">Cacher les sources avec une priorité négative</string>
-    <string name="tv_layout_clock_settings">Afficher l\'heure</string>
-    <string name="tv_layout_clock_settings_des">Affiche l\'heure en haut de l\'écran. S\'applique à la page d\'Accueil et au lecteur</string>
-    <string name="profile_settings">Paramètres du profil</string>
-    <string name="profile_hide_error_sources">Cacher les sources avec des erreurs</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d lien caché</item>
-        <item quantity="many">%d liens cachés</item>
-        <item quantity="other">%d liens cachés</item>
-    </plurals>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Commencer des vidéos en pause</string>
-    <string name="start_paused_settings_des">Réduire le stress lors du choix des sources</string>
+    <string name="player_is_live">Direct</string>
 </resources>
diff --git a/app/src/main/res/values-b+in/strings.xml b/app/src/main/res/values-b+in/strings.xml
index e9df06fc4..7d6475f31 100644
--- a/app/src/main/res/values-b+in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -313,8 +313,8 @@
     <string name="home_random">Acak</string>
     <string name="coming_soon">Segera hadir…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -444,7 +444,7 @@
     <string name="action_mark_as_watched">Telah ditonton</string>
     <string name="error_invalid_data">Data salah</string>
     <string name="subtitles_remove_captions">Hapus closed caption dari subtitlel</string>
-    <string name="subtitles_remove_bloat">Hapus iklan dari subtitle</string>
+    <string name="subtitles_remove_bloat">Hapus teks tidak perlu pada subtitel</string>
     <string name="audio_tracks">Audio Trek</string>
     <string name="video_tracks">Video Trek</string>
     <string name="extension_types">Dukungan</string>
@@ -661,7 +661,7 @@
     <string name="sort_button_rating">Rating %s</string>
     <string name="update_plugins">Perbarui Plugin</string>
     <string name="starting_plugin_update_manually">Mulai proses pembaruan plugin!</string>
-    <string name="plugins_updated_manually">Berhasil memperbarui %d plugin(s)</string>
+    <string name="plugins_updated_manually">Berhasil memperbarui %d plugin!</string>
     <string name="update_plugins_manually">Perbarui plugin secara manual</string>
     <string name="no_plugins_updated_manually">Tidak ada plugin yang diperbarui.</string>
     <string name="player_notification_channel_description">Pemberitahuan pemutar untuk mengontrol pemutaran dari latar belakang</string>
@@ -747,17 +747,4 @@
     <string name="player_is_live">Live</string>
     <string name="video_singular">Video</string>
     <string name="skip_type_preview">Pratinjau</string>
-    <string name="tv_layout_clock_settings">Tampilkan jam waktu nyata</string>
-    <string name="tv_layout_clock_settings_des">Tampilkan jam waktu nyata di bagian atas layar. Berlaku untuk halaman rumah dan pemain</string>
-    <string name="profile_settings">Pengaturan profil</string>
-    <string name="profile_hide_negative_sources">Sembunyikan sumber dengan prioritas negatif</string>
-    <string name="profile_hide_error_sources">Sembunyikan sumber dengan kesalahan</string>
-    <plurals name="links_hidden">
-        <item quantity="other">%d link tersembunyi</item>
-    </plurals>
-    <string name="subs_edge">Edge</string>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Memulai video yang sedang dijeda</string>
-    <string name="start_paused_settings_des">Kurangi stres saat memilih sumber informasi</string>
-    <string name="background">Latar Belakang</string>
 </resources>
diff --git a/app/src/main/res/values-b+it/strings.xml b/app/src/main/res/values-b+it/strings.xml
index 2211ec1dd..c47a84842 100644
--- a/app/src/main/res/values-b+it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -225,7 +225,7 @@
     <string name="live_singular">Livestream</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Altro</string>
-    <string name="source_error">Errore fonte</string>
+    <string name="source_error">Errore sorgente</string>
     <string name="remote_error">Errore remoto</string>
     <string name="render_error">Errore del renderer</string>
     <string name="unexpected_error">Errore imprevisto del lettore</string>
@@ -247,7 +247,7 @@
     <string name="check_for_update">Controlla aggiornamenti</string>
     <string name="video_lock">Blocca</string>
     <string name="video_aspect_ratio_resize">Ridimensiona</string>
-    <string name="video_source">Fonte</string>
+    <string name="video_source">Sorgente</string>
     <string name="video_skip_op">Salta OP</string>
     <string name="dont_show_again">Non mostrare di nuovo</string>
     <string name="skip_update">Salta questo aggiornamento</string>
@@ -346,12 +346,12 @@
     <string name="actor_main">Protagonista</string>
     <string name="actor_supporting">Supporto</string>
     <string name="actor_background">Secondario</string>
-    <string name="home_source">Fonte</string>
+    <string name="home_source">Sorgente</string>
     <string name="home_random">Casuale</string>
     <string name="coming_soon">Prossimamente…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -455,7 +455,7 @@
     <string name="skip_type_mixed_op">Opening misto</string>
     <string name="update_notification_installing">Installazione aggiornamento dell\'app…</string>
     <string name="subtitles_remove_captions">Rimuovi le didascalie chiuse dai sottotitoli</string>
-    <string name="subtitles_remove_bloat">Rimuovere gli annunci dai sottotitoli</string>
+    <string name="subtitles_remove_bloat">Rimuovi il bloat dai sottotitoli</string>
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
     <string name="skip_type_mixed_ed">Ending misto</string>
@@ -670,7 +670,7 @@
     <string name="sort_episodes_date_oldest">Data di messa in onda (più vecchia)</string>
     <string name="sort_button_rating">Valutazione %s</string>
     <string name="starting_plugin_update_manually">Avvio del processo di aggiornamento plugin!</string>
-    <string name="plugins_updated_manually">%d plugin aggiornati correttamente</string>
+    <string name="plugins_updated_manually">%d plugin aggiornati con successo!</string>
     <string name="no_plugins_updated_manually">Nessun plugin è stato aggiornato.</string>
     <string name="player_notification_channel_name">Notifiche lettore</string>
     <string name="player_notification_channel_description">La notifica del lettore per controllare la riproduzione in background</string>
@@ -733,7 +733,7 @@
     <string name="clear_suggestions">Cancella suggerimenti</string>
     <string name="show_cast_in_details">Mostra pannello cast</string>
     <string name="video_info">Info sui media</string>
-    <string name="source_name">Nome fonte</string>
+    <string name="source_name">Nome sorgente</string>
     <string name="extra_brightness_settings">Luminosità extra</string>
     <string name="extra_brightness_settings_des">Attiva il filtro di luminosità quando viene superato il 100% della luminosità dello schermo</string>
     <string name="extra_brightness_key">extra_brightness_enabled</string>
@@ -753,25 +753,10 @@
         <item quantity="many">%d download in coda</item>
         <item quantity="other">%d download in coda</item>
     </plurals>
-    <string name="source_priority">Priorità fonti</string>
-    <string name="source_priority_help">Decidi come le fonti video devono essere ordinate nel lettore</string>
+    <string name="source_priority">Priorità sorgente</string>
+    <string name="source_priority_help">Decidi come le sorgenti video devono essere ordinate nel lettore</string>
     <string name="show_player_metadata_overlay">Mostra sovrapposizione metadati lettore</string>
     <string name="video_singular">Video</string>
     <string name="skip_type_preview">Anteprima</string>
     <string name="player_is_live">Live</string>
-    <string name="profile_settings">Impostazioni profilo</string>
-    <string name="profile_hide_negative_sources">Nascondi fonti con priorità negativa</string>
-    <string name="profile_hide_error_sources">Nascondi fonti con errori</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d collegamento nascosto</item>
-        <item quantity="many">%d collegamenti nascosti</item>
-        <item quantity="other">%d collegamenti nascosti</item>
-    </plurals>
-    <string name="tv_layout_clock_settings">Mostra orologio in tempo reale</string>
-    <string name="tv_layout_clock_settings_des">Mostra un orologio in tempo reale nella parte superiore dello schermo. Si applica alla homepage e al lettore</string>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Avvia video in pausa</string>
-    <string name="start_paused_settings_des">Riduci lo stress nella scelta delle fonti</string>
-    <string name="background">Sfondo</string>
-    <string name="subs_edge">Bordo</string>
 </resources>
diff --git a/app/src/main/res/values-b+ja/strings.xml b/app/src/main/res/values-b+ja/strings.xml
index c7bdb4ef0..2b611ef69 100644
--- a/app/src/main/res/values-b+ja/strings.xml
+++ b/app/src/main/res/values-b+ja/strings.xml
@@ -383,7 +383,7 @@
     <string name="favorite">お気に入り</string>
     <string name="biometric_unsupported">生体認証は、このデバイスではサポートされていません</string>
     <string name="biometric_setting_summary">指紋、顔ID、PIN、パターン、パスワードでアプリをロック解除します.</string>
-    <string name="device_pin_url_message">スマホやパソコンで <b>%s</b> にアクセスし、上記のコードを入力してください</string>
+    <string name="device_pin_url_message">スマホやPCで<b>%s</b>にアクセスし、上記のコードを入力してください</string>
     <string name="device_pin_expired_message">PINコードが期限切れになりました！</string>
     <string name="empty_library_no_accounts_message">ライブラリが空です :(\nライブラリアカウントにログインするか、ローカルライブラリに表示を追加してください。</string>
     <string name="empty_library_logged_in_message">このリストは空です。 別のものに切り替えてみてください。</string>
@@ -645,7 +645,7 @@
     <string name="torrent_not_accepted">アプリを再起動し、ポップアップに同意して続行します。</string>
     <string name="software_decoding">ソフトウェアデコーディング</string>
     <string name="software_decoding_desc">ソフトウェアデコーディングにより、機器でサポートされていないビデオファイルを再生できますが、高解像度で遅延や不安定な再生を引き起こす可能性があります。</string>
-    <string name="plugins_updated_manually">%d 個のプラグインを更新しました</string>
+    <string name="plugins_updated_manually">%d 個のプラグインを正常に更新しました！</string>
     <string name="no_plugins_updated_manually">更新されたプラグインはありません。</string>
     <string name="player_notification_channel_name">プレーヤー通知</string>
     <string name="player_notification_channel_description">バックグラウンドから再生を制御するためのプレーヤー通知</string>
@@ -730,15 +730,4 @@
     <string name="source_priority">ソースの優先順位</string>
     <string name="source_priority_help">プレイヤーでのビデオソースの並び順を設定します</string>
     <string name="show_player_metadata_overlay">プレイヤーメタデータオーバーレイを表示</string>
-    <string name="video_singular">動画</string>
-    <string name="skip_type_preview">プレビュー</string>
-    <string name="player_is_live">ライブ</string>
-    <string name="tv_layout_clock_settings">現地時刻を表示</string>
-    <string name="tv_layout_clock_settings_des">画面上部に現地時刻を表示します。ホーム画面とプレイヤーに適用されます</string>
-    <string name="profile_settings">プロフィール設定</string>
-    <string name="profile_hide_negative_sources">優先度がマイナスのソースを非表示</string>
-    <string name="profile_hide_error_sources">エラーが発生したソースを非表示</string>
-    <plurals name="links_hidden">
-        <item quantity="other">%d件の非表示リンク</item>
-    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 3059bc3be..4feeabe33 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -262,7 +262,7 @@
     <string name="poster_image">포스터 이미지</string>
     <string name="title">제목</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
+    <string name="quality_cam_rip">Cam</string>
     <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
@@ -405,7 +405,7 @@
     <string name="player_load_subtitles_online">인터넷에서 불러오기</string>
     <string name="player_loaded_subtitles" formatted="true">로드됨 %s</string>
     <string name="coming_soon">공개 예정…</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="category_player">플레이어</string>
@@ -493,7 +493,7 @@
     <string name="subtitles_depressed">음각</string>
     <string name="subtitles_raised">양각</string>
     <string name="subtitles_example_text">다람쥐 헌 쳇바퀴에 타고파</string>
-    <string name="subtitles_remove_bloat">자막에서 광고 제거</string>
+    <string name="subtitles_remove_bloat">불필요한 요소/코드 제거</string>
     <string name="extras">엑스트라</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="tracks">트랙</string>
@@ -664,7 +664,7 @@
     <string name="update_plugins">플러그인 업데이트하기</string>
     <string name="update_plugins_manually">수동으로 플러그인 업데이트 하기</string>
     <string name="starting_plugin_update_manually">플러그인 업데이트 절차를 시작합니다!</string>
-    <string name="plugins_updated_manually">플러그인 %d개를 성공적으로 업데이트했습니다</string>
+    <string name="plugins_updated_manually">성공적으로 %d 플러그인을 업데이트 하였습니다!</string>
     <string name="no_plugins_updated_manually">업데이트 된 플러그인이 없습니다.</string>
     <string name="player_notification_channel_name">플레이어 알림</string>
     <string name="player_notification_channel_description">백그라운드에서 재생을 제어하기 위한 플레이어 알림</string>
@@ -733,17 +733,4 @@
     <string name="video_singular">비디오</string>
     <string name="skip_type_preview">프리뷰</string>
     <string name="player_is_live">라이브</string>
-    <string name="profile_settings">프로필 설정</string>
-    <string name="profile_hide_error_sources">오류가 있는 소스 숨기기</string>
-    <string name="profile_hide_negative_sources">우선순위가 음수인 소스 숨기기</string>
-    <plurals name="links_hidden">
-        <item quantity="other">숨겨진 링크 %d개</item>
-    </plurals>
-    <string name="tv_layout_clock_settings">실시간 시계 표시</string>
-    <string name="tv_layout_clock_settings_des">화면 상단에 실시간 시계를 표시합니다. 홈페이지와 플레이어에 적용됩니다</string>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">동영상을 정지한 채 시작</string>
-    <string name="start_paused_settings_des">소스를 선택할 때의 부하 줄이기</string>
-    <string name="background">배경</string>
-    <string name="subs_edge">윤곽선</string>
 </resources>
diff --git a/app/src/main/res/values-b+lt/strings.xml b/app/src/main/res/values-b+lt/strings.xml
index ff92ac093..db7e994f0 100644
--- a/app/src/main/res/values-b+lt/strings.xml
+++ b/app/src/main/res/values-b+lt/strings.xml
@@ -25,18 +25,18 @@
     <string name="sort_copy">Kopijuoti</string>
     <string name="benene_des">Duoti bananai</string>
     <string name="home_more_info">Daugiau informacijos</string>
-    <string name="title_downloads">Atsisiuntimai</string>
+    <string name="title_downloads">Atsiuntimai</string>
     <string name="subs_auto_select_language">Automatiškai pasirinkti kalbą</string>
     <string name="error_loading_links_toast">Klaida kraunant nuorodas</string>
     <string name="go_forward_30">+30</string>
-    <string name="download_done">Atsisiuntimas baigtas</string>
+    <string name="download_done">Atsiuntimas baigtas</string>
     <string name="continue_watching">Tęsti žiūrėjimą</string>
-    <string name="new_update_format" formatted="true">Rastas atnaujinimas!\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Rastas atnaujinimas! \n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Atsisiųsti kalbas</string>
     <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
     <string name="go_back_img_des">Grįžti atgal</string>
     <string name="downloading">Siunčiama</string>
-    <string name="episode_more_options_des">Daugiau parinkčių</string>
+    <string name="episode_more_options_des">Daugiau pasirinkčiu</string>
     <string name="play_episode">Paleisti seriją</string>
     <string name="player_speed">Grotuvo greitis</string>
     <string name="benene_count_text">%d Bananai duoti kūrėjams</string>
@@ -45,7 +45,7 @@
     <string name="result_tags">Žanrai</string>
     <string name="go_back_30">-30</string>
     <string name="episode_poster_img_des">Serijos plakatas</string>
-    <string name="vpn_might_be_needed">Gali reikėti VPN šiam tiekėjui, kad veiktų teisingai</string>
+    <string name="vpn_might_be_needed">Gali reikėti VPN šitam tiekėjui, kad veiktų teisingai</string>
     <string name="search_hint_site" formatted="true">Ieškoti %s…</string>
     <string name="github">Github</string>
     <string name="benene_count_text_none">Nėra duotu bananų</string>
@@ -66,7 +66,7 @@
     <string name="cancel">Atšaukti</string>
     <string name="start">Pradėti</string>
     <string name="cartoons_singular">Filmukas</string>
-    <string name="download_canceled">Atsisiuntimas atšauktas</string>
+    <string name="download_canceled">Atsiuntimas atšauktas</string>
     <string name="advanced_search">Išplėstinė paieška</string>
     <string name="empty_library_logged_in_message">Tuščias sąrašas. Pabandykite pasirinkti kitą sąrašą.</string>
     <string name="chromecast_subtitles_settings">Chromecast subtitrai</string>
@@ -93,10 +93,10 @@
     <string name="type_completed">Užbaigta</string>
     <string name="use_system_brightness_settings_des">Naudoti sistemos ryškumą programos grotuve vietoj tamsumo</string>
     <string name="restore_failed_format" formatted="true">Nepavyko atstatyti duomenis iš failo %s</string>
-    <string name="play_trailer_button">Paleisti anonsą</string>
-    <string name="play_livestream_button">Paleisti gyvą transliaciją</string>
+    <string name="play_trailer_button">Paleisti anonsa</string>
+    <string name="play_livestream_button">Paleisti gyva transliacija</string>
     <string name="no_episodes_found">Nerasta serijų</string>
-    <string name="vpn_torrent">Šis tiekėjas yra iš Torrent\'ų, rekomenduojamas VPN</string>
+    <string name="vpn_torrent">Šis tiekėjas yra iš Torrentų, VPN rekomenduojama naudoti</string>
     <string name="test_failed">Nepavyko</string>
     <string name="result_poster_img_des">Plakatas</string>
     <string name="popup_play_file">Paleisti failą</string>
@@ -108,21 +108,21 @@
     <string name="redo_setup_process">Perdaryti nustatymo procesą</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="benene">Duoti bananą kūrėjams</string>
-    <string name="go_back">Sugrįšti</string>
+    <string name="go_back">Sugryšti</string>
     <string name="copy_link_toast">Nuoroda nukopijuota į iškarpinę</string>
     <string name="search">Paieška</string>
     <string name="settings_info">Informacija</string>
-    <string name="skip_loading">Praleisti įkėlimą</string>
+    <string name="skip_loading">Praleisti įkėlima</string>
     <string name="home_info">Informacija</string>
     <string name="next_episode_format" formatted="true">Serija %d bus išleista</string>
     <string name="sort_save">Išsaugoti</string>
     <string name="clipboard_too_large">Perdaug teksto. Nepavyko išsaugoti i iškarpynę.</string>
-    <string name="download_failed">Atsisiuntimas nepavyko</string>
+    <string name="download_failed">Atsiuntimas nepavyko</string>
     <string name="result_share">Pasidalinti</string>
     <string name="home_main_poster_img_des">Pagrindinis Plakatas</string>
     <string name="pick_source">Šaltiniai</string>
     <string name="title_settings">Nustatymai</string>
-    <string name="title_search">Paieška</string>
+    <string name="title_search">Ieškoti</string>
     <string name="loading">Kraunama…</string>
     <string name="action_remove_watching">Pašalinti</string>
     <string name="action_open_watching">Daugiau informacijos</string>
@@ -138,7 +138,7 @@
     <string name="sort_close">Uždaryti</string>
     <string name="action_add_to_bookmarks">Nustatyti žiūrėjimo statusą</string>
     <string name="play_with_app_name">Paleisti su CloudStream</string>
-    <string name="subs_subtitle_elevation">Subtitrų lygis</string>
+    <string name="subs_subtitle_elevation">Subtitrų iškėlimas</string>
     <string name="episodes">Serijos</string>
     <string name="cast_format" formatted="true">Skleisti: %s</string>
     <string name="season">Sezonas</string>
@@ -248,51 +248,4 @@
     <string name="confirm_exit_dialog">Ar tikrai norite išeiti?</string>
     <string name="action_remove_from_watched">Pašalinti iš žiūrimų</string>
     <string name="audio_tracks">Garso takelis</string>
-    <string name="filler" formatted="true">Užpildymas</string>
-    <string name="duration_format" formatted="true">%d min</string>
-    <string name="title_home">Namai</string>
-    <string name="download_queue">Atsisiuntimų eilė</string>
-    <string name="speech_recognition_unavailable">Balso atpažinimas nepasiekiamas</string>
-    <string name="begin_speaking">Pradėkite kalbėti…</string>
-    <string name="type_dropped">Nežiūrimas</string>
-    <string name="play_full_series_button">Paleisti visą seriją</string>
-    <string name="torrent_info">Šis įrašas yra Torrent\'e, tai reiškia, kad tavo įrašo veikla gali būti sekama. Įsitikinkite, kad suprantate Torrenting prieš tęsiant.</string>
-    <string name="reload_error">Atkurti ryšį…</string>
-    <string name="downloads_delete_select">Pasirinkite elementus, kuriuos norite pašalinti</string>
-    <string name="downloads_empty">Šiuo metu atsisiuntimų nėra.</string>
-    <string name="queue_empty_message">Šiuo metu atsisiuntimų eilėje nėra.</string>
-    <string name="offline_file">Pasiekiama žiūrėti neprisijungus</string>
-    <string name="select_all">Pasirinkti viską</string>
-    <string name="deselect_all">Panaikinti visus pasirinkimus</string>
-    <string name="stream">Tinklo srautas</string>
-    <string name="open_local_video">Atidaryti vietinį video</string>
-    <string name="links_reloaded_toast">Nuorodos perkrautos</string>
-    <string name="app_subbed_text">Subtitrai</string>
-    <string name="repo_copy_label">Repozitorijos pavadinimas ir adresas</string>
-    <string name="toast_copied">nukopijuota!</string>
-    <string name="subscribe_tooltip">Naujos serijos pranešimas</string>
-    <string name="result_search_tooltip">Ieškoti kituose plėtiniuose</string>
-    <string name="recommendations_tooltip">Rodyti rekomendacijas</string>
-    <string name="subs_outline_color">Apvado spalva</string>
-    <string name="subs_edge_type">Rėmelio tipas</string>
-    <string name="search_provider_text_types">Ieškoti naudojant tipus</string>
-    <string name="subs_hold_to_reset_to_default">Laikyti ilgai, kad sugražinti pradinius nustatymus</string>
-    <string name="subs_import_text" formatted="true">Įkelti šriftus sudedant juos į %s</string>
-    <string name="provider_info_meta">Metaduomenys nesuteikiamos svetainės, vaizdo įkėlimas nepavyks, jeigu jo nebus svetainėje.</string>
-    <string name="torrent_plot">Aprašymas</string>
-    <string name="normal_no_plot">Nėra siužeto aprašymo</string>
-    <string name="torrent_no_plot">Aprašymas nerastas</string>
-    <string name="show_log_cat">Rodyti Logcat</string>
-    <string name="picture_in_picture">Vaizdas vaizde</string>
-    <string name="picture_in_picture_des">Tęsia atkūrimą mažame grotuve virš kitų programų</string>
-    <string name="player_size_settings">Grotuvo dydžio pakeitimo mygtukas</string>
-    <string name="player_size_settings_des">Pašalinti juodas paraštes</string>
-    <string name="player_subtitles_settings">Subtitrai</string>
-    <string name="chromecast_subtitles_settings_des">Chromecast subtitrų nustatymai</string>
-    <string name="eigengraumode_settings">Atkūrimo sparta</string>
-    <string name="speed_setting_summary">Prideda greičio pasirinkimą grotuve</string>
-    <string name="swipe_to_seek_settings">Braukite, kas ieškotumėte</string>
-    <string name="swipe_to_seek_settings_des">Braukite į šonus, kad kontroliuotumėte padėtį vaizdo įraše</string>
-    <string name="swipe_to_change_settings">Braukite, kad pakeistumėte nustatymus</string>
-    <string name="swipe_to_change_settings_des">Braukite aukštyn arba žemyn ekrano kairėje arba dešinėje, jei norite pakeisti ryškumą arba garsą</string>
 </resources>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index a8ecaa68a..9ab29cd43 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -8,7 +8,7 @@
     <string name="home_main_poster_img_des">Galvenais plakāts</string>
     <string name="home_next_random_img_des">Nākamais nejaušais</string>
     <string name="go_back_img_des">Iet atpakaļ</string>
-    <string name="home_change_provider_img_des">Nomainīt pakalpojumu sniedzēju</string>
+    <string name="home_change_provider_img_des">Nomainīt dvēju</string>
     <string name="preview_background_img_des">Apskatīt background</string>
     <string name="player_speed_text_format" formatted="true">Ātrums (%.2fx)</string>
     <string name="rated_format" formatted="true">Lidzīgi: %.1f</string>
@@ -24,7 +24,7 @@
     <string name="next_episode">Nākamā epizode</string>
     <string name="browser">Pārlūks</string>
     <string name="skip_loading">Izlaist ladešanos</string>
-    <string name="loading">Ielādē…</string>
+    <string name="loading">Lādējas…</string>
     <string name="type_watching">Skaties</string>
     <string name="type_on_hold">Aizturēts</string>
     <string name="type_completed">Pabeigts</string>
@@ -42,7 +42,7 @@
     <string name="play_episode">Palaist epizodi</string>
     <string name="download">Ieladēt</string>
     <string name="download_paused">Lejupielāde iepauzēta</string>
-    <string name="download_started">Lejupielāde sākta</string>
+    <string name="download_started">Lādēšana sakās</string>
     <string name="download_failed">Lejupielāde neizdevās</string>
     <string name="download_canceled">Lejupielāde atcelta</string>
     <string name="download_done">Lejupielāde pabeigta</string>
@@ -50,7 +50,7 @@
     <string name="stream">Tīkla plūsma</string>
     <string name="error_loading_links_toast">Kļūda, ielādējot saites</string>
     <string name="download_storage_text">Iekšējā atmiņa</string>
-    <string name="app_dubbed_text">Dublēts</string>
+    <string name="app_dubbed_text">Dub</string>
     <string name="popup_delete_file">Dzēst datni</string>
     <string name="popup_play_file">Atskaņot datni</string>
     <string name="popup_resume_download">Atsākt ielādi</string>
@@ -74,8 +74,8 @@
     <string name="subs_edge_type">Stūra tips</string>
     <string name="subs_font">Fonts</string>
     <string name="subs_font_size">Fonta lielums</string>
-    <string name="search_provider_text_providers">Meklēt pēc pakalpojumu sniedzējiem</string>
-    <string name="search_provider_text_types">Meklēt pēc tipiem</string>
+    <string name="search_provider_text_providers">Meklēt izmantojot devējus</string>
+    <string name="search_provider_text_types">Meklēt izmantojot tipus</string>
     <string name="benene_count_text">%d Banāni iedoti veidotājiem</string>
     <string name="next_episode_format" formatted="true">%d. epizode būs pieejama</string>
     <string name="filler" formatted="true">Filtrs</string>
@@ -105,9 +105,9 @@
     <string name="action_remove_watching">Noņemt</string>
     <string name="action_open_watching">Vairāk informācijas</string>
     <string name="action_open_play">@string/home_play</string>
-    <string name="vpn_might_be_needed">Lai šis pakalpojumu sniedzējs darbotos pareizi, var būt nepieciešams VPN</string>
-    <string name="vpn_torrent">Šis pakalpojumu sniedzējs piedāvā torrentus, tāpēc ļoti ieteicams izmantot VPN</string>
-    <string name="provider_info_meta">Vietne nenodrošina metadatus. Ja tie nebūs pieejami vietnē, video lejupielāde neizdosies.</string>
+    <string name="vpn_might_be_needed">VPNs varētu būt vajadzīgs lai šis devējs strādātu pareizi</string>
+    <string name="vpn_torrent">Šis devējs ir Torrents vpn ir rekomendēts</string>
+    <string name="provider_info_meta">Dati nav doti no saites, video lādēšanas neizdosies ja neiksestē saitē.</string>
     <string name="torrent_plot">Apraksts</string>
     <string name="normal_no_plot">Nav apraksts atrasts</string>
     <string name="torrent_no_plot">Apraksts nav atrasts</string>
@@ -150,7 +150,7 @@
     <string name="category_updates">Atjauninājumi un dublēšana</string>
     <string name="settings_info">Informācija</string>
     <string name="advanced_search">Advancēta meklēšana</string>
-    <string name="advanced_search_des">Sniedz meklēšanas rezultātus, kas sagrupēti pēc pakalpojumu sniedzēja</string>
+    <string name="advanced_search_des">Dod tev meklēšanas rezultātus citus no devēja</string>
     <string name="show_fillers_settings">Rādīt anime papilda epizodi</string>
     <string name="show_trailers_settings">Rādīt reklāmkadrus</string>
     <string name="kitsu_settings">Rādīt Kitsu vietnes plakātus</string>
@@ -168,7 +168,7 @@
     <string name="benene">Iedot banānu izstrādātājiem</string>
     <string name="benene_des">Iedotie banāni</string>
     <string name="app_language">Lietotnes valoda</string>
-    <string name="no_chromecast_support_toast">Šis pakalpojumu sniedzējs neatbalsta Chromecast</string>
+    <string name="no_chromecast_support_toast">Šim devējam nav Chromecast pieņemšana</string>
     <string name="no_links_found_toast">Nav linku strastu</string>
     <string name="copy_link_toast">Links kopēts cliobordā</string>
     <string name="subs_default_reset_toast">Restartēt uz parasto value</string>
@@ -193,7 +193,7 @@
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Šis pilnibā dzesīs %s \nEsat parliecināts?</string>
-    <string name="resume_time_left" formatted="true">%dmin.\natlikusi(-šas)</string>
+    <string name="resume_time_left" formatted="true">%dm \natlikušas</string>
     <string name="status_completed">Pabeigts</string>
     <string name="status">Statuss</string>
     <string name="year">Gads</string>
@@ -287,16 +287,16 @@
     <string name="pref_category_defaults">Parasts</string>
     <string name="pref_category_looks">Izskats</string>
     <string name="pref_category_ui_features">Funkcijas</string>
-    <string name="category_general">Vispārīgie</string>
+    <string name="category_general">Ģenerāls</string>
     <string name="random_button_settings">Randomā poga</string>
     <string name="random_button_settings_desc">Rādīt izlases pogu Sākums un Bibliotēka sadaļās</string>
     <string name="provider_lang_settings">Papildinājuma valodas</string>
     <string name="app_layout">Lietotnes izkārtojums</string>
-    <string name="preferred_media_settings">Vēlamie multimediji</string>
+    <string name="preferred_media_settings">Izvēlētā media</string>
     <string name="enable_nsfw_on_providers">Iespējot nepiedienīgu, izaicinošu saturu (NSFW) atbalstītajos papildinājumos</string>
     <string name="subtitles_encoding">Subtitru kodējums</string>
-    <string name="category_providers">Pakalpojumu sniedzēji</string>
-    <string name="category_provider_test">Pakalpojumu sniedzēja tests</string>
+    <string name="category_providers">Devēji</string>
+    <string name="category_provider_test">Devēju tests</string>
     <string name="category_ui">Izskats</string>
     <string name="automatic">Automātiski</string>
     <string name="tv_layout">Televizora izskats</string>
@@ -372,17 +372,17 @@
     <string name="error">Kļūda</string>
     <string name="subtitles_remove_captions">Noņemt slēgtos parakstus no subtitriem</string>
     <string name="subtitles_remove_bloat">Noņemt lieko no subtitriem (piemēram, reklāmu)</string>
-    <string name="subtitles_filter_lang">Atlasīt pēc vēlamās multimediju valodas</string>
+    <string name="subtitles_filter_lang">Filtrēt pēc vēlamās multivides valodas</string>
     <string name="extras">Ekstras</string>
     <string name="trailer">Treileris</string>
     <string name="network_adress_example">https://piemērs.com/piemērs.mp4</string>
     <string name="referer">Referents</string>
     <string name="next">Nākamais</string>
-    <string name="provider_languages_tip">Skatīties video šajās valodās</string>
+    <string name="provider_languages_tip">Skatieties videoklipus šajās valodās</string>
     <string name="previous">Iepriekšējais</string>
     <string name="skip_setup">Izlaist uzstādīšanu</string>
     <string name="app_layout_subtext">Mainiet lietotnes izskatu, lai tā atbilstu savai ierīcei</string>
-    <string name="preferred_media_subtext">Ko jūs vēlētos skatīt</string>
+    <string name="preferred_media_subtext">Ko tu vēlies redzēt</string>
     <string name="setup_done">Pabeigts</string>
     <string name="extensions">Papildinājumi</string>
     <string name="add_repository">Pievienot repozitoriju</string>
@@ -570,7 +570,7 @@
     <string name="update_plugins">Atjaunināt papildinājumus</string>
     <string name="update_plugins_manually">Atjaunināt papildinājumus manuāli</string>
     <string name="starting_plugin_update_manually">Sāk papildinājuma atjaunināšanas procesu!</string>
-    <string name="plugins_updated_manually">Veiksmīgi atjaunināts(-i) %d papildinājums(-i)</string>
+    <string name="plugins_updated_manually">Veiksmīgi atjaunināts(-i) %d papildinājums(-i)!</string>
     <string name="no_plugins_updated_manually">Neviens papildinājums netika atjaunināts.</string>
     <string name="result_search_tooltip">Meklēt citos papildinājumos</string>
     <string name="test_extensions">Pārbaudīt visus papildinājumus</string>
@@ -607,15 +607,4 @@
     <string name="delete_message_series_only" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst visas šī seriāla, raidījuma epizodes?\n\n%s</string>
     <string name="queue_empty_message">Pašlaik nav nevienas rindā ievietotas lejupielādes.</string>
     <string name="open_local_video">Atvērt vietējo video</string>
-    <string name="custom_media_singular">Multimedija</string>
-    <string name="video_info">Multimediju informācija</string>
-    <string name="torrent_preferred_media">Iespējojiet torrentu Iestatījumi/Pakalpojumu sniedzēji/Vēlamie multimediji sadaļā</string>
-    <string name="subscribe_tooltip">Paziņojums par jaunu epizodi</string>
-    <string name="extra_brightness_settings">Papildu spilgtums</string>
-    <string name="extra_brightness_key">Papildu spilgtums iespējots</string>
-    <string name="search_suggestions">Meklēšanas ieteikumi</string>
-    <string name="reload_provider">Pārlādēt pakalpojumu sniedzēju</string>
-    <string name="player_is_live">Tiešraide</string>
-    <string name="video_singular">Video</string>
-    <string name="links_reloaded_toast">Saites atkārtoti ielādētas</string>
 </resources>
diff --git a/app/src/main/res/values-b+mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
index 64068ee29..4e37afdea 100644
--- a/app/src/main/res/values-b+mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -310,7 +310,7 @@
     <string name="video_tracks">Видео резолуција</string>
     <string name="asian_drama">Азиски драми</string>
     <string name="plugin_loaded">Приклучокот е вчитан</string>
-    <string name="subtitles_remove_bloat">Отстрани реклами од преводите</string>
+    <string name="subtitles_remove_bloat">Отстрани непотребен текст од преводите</string>
     <string name="plugins_not_downloaded" formatted="true">Не е преземено: %d</string>
     <string name="subtitles_remove_captions">Remove closed captions from subtitles</string>
     <string name="audio_tracks">Аудио јазик</string>
@@ -642,7 +642,7 @@
     <string name="starting_plugin_update_manually">Започнување на процесот на ажурирање на приклучоци!</string>
     <string name="update_plugins">Ажурирај приклучоци</string>
     <string name="no_plugins_updated_manually">Ниту еден приклучок не е ажуриран.</string>
-    <string name="plugins_updated_manually">Успешно ажурирани %d приклучоци</string>
+    <string name="plugins_updated_manually">Успешно ажурирани %d приклучоци!</string>
     <string name="sort_episodes_number_asc">Епизода (Растечки)</string>
     <string name="sort_episodes_number_desc">Епизода (Опаѓачки)</string>
     <string name="sort_episodes_rating_high_low">Рејтинг (Највисок)</string>
@@ -738,9 +738,4 @@
         <item quantity="other">%d преземања во редицата</item>
     </plurals>
     <string name="player_is_live">Во живо</string>
-    <string name="start_paused_settings">Започни паузирани видеа</string>
-    <string name="profile_settings">Поставки на профил</string>
-    <string name="profile_hide_negative_sources">Сокриј извори со негативен приоритет</string>
-    <string name="profile_hide_error_sources">Сокриј извори со грешки</string>
-    <string name="background">Позадина</string>
 </resources>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index feec84263..3164e6b4e 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -677,22 +677,4 @@
     <string name="confirm_before_exiting_title">Bevestig voor afsluiten</string>
     <string name="confirm_before_exiting_desc">Toon dialoogvenster voordat de app wordt afgesloten</string>
     <string name="subs_edge_size">Randgrote</string>
-    <string name="show_player_metadata_overlay">Laat Speler Metadata Overlay zien</string>
-    <string name="device_pin_error_message">Kon de apparaat PIN niet vinden, probeer locale authenticatie</string>
-    <string name="torrent_preferred_media">Zet torrent aan in Instellingen/Providers/Media voorkeur</string>
-    <string name="torrent_not_accepted">Herstart de app en accepteer de Stream Torrent pop-up om verder te gaan.</string>
-    <string name="update_plugins_manually">Handmatige Update Knop</string>
-    <string name="biometric_setting_summary">Open de app met Vingerafdruk, Face ID, PIN, Pattern en Wachtwoord.</string>
-    <string name="preview_seekbar">Seekbar preview</string>
-    <string name="preview_seekbar_desc">Zet preview thumbnail aan op seekbar</string>
-    <string name="software_decoding">Software decodering</string>
-    <string name="software_decoding_desc">Software decodering staat de mogelijkheid toe om de speler videobestanden af te laten spelen op jouw apparaat, maar het kan een haperige of onstabiele kijkervaring zorgen op hoge resolutie.</string>
-    <string name="volume_exceeded_100">Volume heeft de 100% overschreden</string>
-    <string name="update_plugins">Update Plugins</string>
-    <string name="no_plugins_updated_manually">Geen plugins zijn geupdate.</string>
-    <string name="player_notification_channel_name">Speler meldingen</string>
-    <string name="player_notification_channel_description">De speler melding om de kijkervaring van de achtergrond de besturen</string>
-    <string name="subtitles_from_online">Online</string>
-    <string name="download_parallel_settings_des">Hoeveel verschillende items kunnen in parallel gedownload worden</string>
-    <string name="parallel_downloads">Parallel downloads</string>
 </resources>
diff --git a/app/src/main/res/values-b+pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
index 99adc74ee..35367a1b2 100644
--- a/app/src/main/res/values-b+pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -324,8 +324,8 @@
     <string name="home_random">Losowy</string>
     <string name="coming_soon">Już wkrótce…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -349,7 +349,7 @@
     <string name="error_invalid_url">Niepoprawny URL</string>
     <string name="error">Błąd</string>
     <string name="subtitles_remove_captions">Usuń CC z napisów</string>
-    <string name="subtitles_remove_bloat">Usuń reklamy z napisów</string>
+    <string name="subtitles_remove_bloat">Usuń nadmiarowe informacje z napisów</string>
     <string name="subtitles_filter_lang">Filtrowanie wg preferowanego języka</string>
     <string name="extras">Dodatki</string>
     <string name="trailer">Zwiastun</string>
@@ -649,7 +649,7 @@
     <string name="sort_episodes_number_desc">Odcinek (malejąco)</string>
     <string name="sort_episodes_rating_high_low">Ocena (najwyższa)</string>
     <string name="update_plugins">Zaktualizuj wtyczki</string>
-    <string name="plugins_updated_manually">Pomyślnie zaktualizowano wtyczki: %d</string>
+    <string name="plugins_updated_manually">Pomyślnie zaktualizowano wtyczki: %d!</string>
     <string name="no_plugins_updated_manually">Nie zaktualizowano żadnych wtyczek.</string>
     <string name="update_plugins_manually">Zaktualizuj wtyczki ręcznie</string>
     <string name="starting_plugin_update_manually">Rozpoczęcie procesu aktualizacji wtyczek!</string>
@@ -742,20 +742,4 @@
     <string name="video_singular">Wideo</string>
     <string name="skip_type_preview">Zapowiedź</string>
     <string name="player_is_live">Na żywo</string>
-    <string name="profile_settings">Ustawienia profilu</string>
-    <string name="profile_hide_negative_sources">Ukryj źródła z negatywnym priorytetem</string>
-    <string name="profile_hide_error_sources">Ukryj źródła z błędami</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d ukryty odnośnik</item>
-        <item quantity="few">%d ukryte odnośniki</item>
-        <item quantity="many">%d ukrytych odnośników</item>
-        <item quantity="other">%d ukrytych odnośników</item>
-    </plurals>
-    <string name="tv_layout_clock_settings">Pokaż zegar czasu rzeczywistego</string>
-    <string name="tv_layout_clock_settings_des">Wyświetl zegar czasu rzeczywistego u góry ekranu. Dotyczy strony głównej i odtwarzacza</string>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Uruchamiaj filmy wstrzymane</string>
-    <string name="start_paused_settings_des">Ogranicz obciążenie podczas wyboru źródeł</string>
-    <string name="background">Tło</string>
-    <string name="subs_edge">Krawędź</string>
 </resources>
diff --git a/app/src/main/res/values-b+pt+BR/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
index 97c5f9e4c..455478b5a 100644
--- a/app/src/main/res/values-b+pt+BR/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -340,8 +340,8 @@
     <string name="home_random">Aleatório</string>
     <string name="coming_soon">Em breve…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">Cam HD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -365,7 +365,7 @@
     <string name="error_invalid_url">URL inválida</string>
     <string name="error">Erro</string>
     <string name="subtitles_remove_captions">Remover legendas ocultas(CC) das legendas</string>
-    <string name="subtitles_remove_bloat">Remover anúncios das legendas</string>
+    <string name="subtitles_remove_bloat">Remover bloat das legendas</string>
     <string name="subtitles_filter_lang">Filtrar por linguagem preferida</string>
     <string name="extras">Extras</string>
     <string name="trailer">Trailer</string>
@@ -662,7 +662,7 @@
     <string name="sort_button_date">Data %s</string>
     <string name="update_plugins">Atualizar plugins</string>
     <string name="starting_plugin_update_manually">Iniciando o processo de atualização do plugin!</string>
-    <string name="plugins_updated_manually">Atualização bem-sucedida para %d plugin(s)</string>
+    <string name="plugins_updated_manually">Atualização bem-sucedida para %d plugin(s)!</string>
     <string name="no_plugins_updated_manually">Nenhum plugin foi atualizado.</string>
     <string name="update_plugins_manually">Atualizar plugins manualmente</string>
     <string name="player_notification_channel_name">Notificações de reprodução</string>
@@ -752,19 +752,4 @@
     <string name="video_singular">Vídeo</string>
     <string name="skip_type_preview">Visualização</string>
     <string name="player_is_live">Ao vivo</string>
-    <string name="tv_layout_clock_settings">Mostrar relógio em tempo real</string>
-    <string name="tv_layout_clock_settings_des">Exiba um relógio em tempo real na parte superior da tela. Aplica-se à página inicial e ao player</string>
-    <string name="profile_settings">Configurações de perfil</string>
-    <string name="profile_hide_negative_sources">Ocultar fontes com prioridade negativa</string>
-    <string name="profile_hide_error_sources">Ocultar fontes com erros</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d link oculto</item>
-        <item quantity="many">%d link ocultos</item>
-        <item quantity="other">%d link ocultos</item>
-    </plurals>
-    <string name="subs_edge">Borda</string>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Iniciar vídeos pausados</string>
-    <string name="start_paused_settings_des">Reduza o estresse ao selecionar fontes</string>
-    <string name="background">Fundo</string>
 </resources>
diff --git a/app/src/main/res/values-b+ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
index 7a174483f..38e576baa 100644
--- a/app/src/main/res/values-b+ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -739,15 +739,4 @@
     <string name="video_singular">Видео</string>
     <string name="skip_type_preview">Предпросмотр</string>
     <string name="player_is_live">Прямой эфир</string>
-    <string name="tv_layout_clock_settings">Отображать текущее время</string>
-    <string name="tv_layout_clock_settings_des">Отображать в верхней части экрана часы с текущим временем. Применяется к главной странице и плееру</string>
-    <string name="profile_settings">Настройки профиля</string>
-    <string name="profile_hide_negative_sources">Скрывать источники с отрицательным приоритетом</string>
-    <string name="profile_hide_error_sources">Скрывать источники с ошибками</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d скрытая ссылка</item>
-        <item quantity="few">%d скрытые ссылки</item>
-        <item quantity="many">%d скрытых ссылок</item>
-        <item quantity="other">%d скрытых ссылок</item>
-    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+so/strings.xml b/app/src/main/res/values-b+so/strings.xml
index 8a8f29095..0eb787311 100644
--- a/app/src/main/res/values-b+so/strings.xml
+++ b/app/src/main/res/values-b+so/strings.xml
@@ -65,7 +65,7 @@
     <string name="download_storage_text">Kaydka gudaha</string>
     <string name="app_dubbed_text">Trj</string>
     <string name="download_started">Way bilaabmatay soo dejintu</string>
-    <string name="stream">Khadka ka daaro</string>
+    <string name="stream">Daalaco</string>
     <string name="download_canceled">Waa la joojiyey dejintan</string>
     <string name="update_started">Way bilaabantay cuaboonaysiintu</string>
     <string name="error_loading_links_toast">Soo raridda lifaaqyadu way fashilantay</string>
@@ -91,7 +91,7 @@
     <string name="sort_clear">Tirtir</string>
     <string name="subs_edge_type">Nooca cidhifyada</string>
     <string name="use_system_brightness_settings_des">Isticmaal xaddiga iftiinka ee moobilkaaga halkii aad adigu habayn lahayd ugu horreynba</string>
-    <string name="category_updates">Cusboonaysiinta iyo Kaydinta</string>
+    <string name="category_updates">Gurmadka iyo cusbooneysiinta</string>
     <string name="restore_success">Waa la kaydiyet xogta gurmadka</string>
     <string name="advanced_search_des">Raadinta waxay kuugu kala qaybinaysaa mid kasta iyo qaybiyihiisa</string>
     <string name="restore_failed_format" formatted="true">Way fashilantay in xogta laga soo celiyo faylka gurmadka%s</string>
@@ -100,7 +100,7 @@
     <string name="backup_success">Xogta waa la kaydiyey</string>
     <string name="status">Heerka</string>
     <string name="backup_failed">Ogolaanshaha lagu kaydinayo ma hayno. Fadlan isku day mar kale.</string>
-    <string name="category_account">Akoonada iyo Amniga</string>
+    <string name="category_account">Koontooyinka</string>
     <string name="settings_info">Xog</string>
     <string name="automatic_plugin_download">Si iskii ah usoo deji sidkanaha</string>
     <string name="pref_filter_search_quality">Qari tayada muqaalka aad dooratay natiijada waxa aad raadiso</string>
@@ -153,7 +153,7 @@
     <string name="kitsu_settings">Tusi Boodhka Kitsu</string>
     <string name="automatic_plugin_updates">Si iskii ah u cusbooneysii sidkanaha</string>
     <string name="automatic_plugin_download_summary">Si iskii ah usoo deji dhamaan sidkanayaasha aan weli lasoo dejin ee ku jira kaydka aad keentay.</string>
-    <string name="updates_settings_des">Si toos ah u raadi update cusub markii aad furto appka.</string>
+    <string name="updates_settings_des">Marka ugu horreysa ee aad appka furto ayaad arkaysaa haddii wax cusub yihiin</string>
     <string name="lightnovel">Light novel app, isla dhiseyaasha appkan baa leh</string>
     <string name="updates_settings">Tus wixii appka ku cusub</string>
     <string name="redo_setup_process">Dib uso bilow fadhiisinta appka</string>
@@ -238,13 +238,13 @@
     <string name="player_size_settings_des">Hareeraha madow ka saar markaad daawanayso</string>
     <string name="player_subtitles_settings">Qoraal-hoosaadka</string>
     <string name="chromecast_subtitles_settings_des">Habaynta Qrl-hoosaadka Koromakaastiga</string>
-    <string name="eigengraumode_settings">Xawaaraha muuqaalka</string>
-    <string name="swipe_to_seek_settings_des">Midig iyo bidix u jiid si aad u xakameyso halka uu muuqaalku marayo</string>
+    <string name="eigengraumode_settings">Habka Xawaare-kordhinta</string>
+    <string name="swipe_to_seek_settings_des">Midig iyo bidix u jiid si aad marba dhinac ugu dhaafiso muqaalka</string>
     <string name="double_tap_to_seek_settings_des">Laba jeer taabo midig ama bidix si aad u dhaafiso ama ku ceshato</string>
     <string name="double_tap_to_seek_settings">Laba jeer taabo si aad u dhaafiso</string>
-    <string name="double_tap_to_seek_amount_settings">Inta aad is-dhaafinayso (Ilbiriqsiyo ahaan)</string>
+    <string name="double_tap_to_seek_amount_settings">Inta aad is dhaafinayso</string>
     <string name="double_tap_to_pause_settings">Laba jeer taabo si aad u qallajiso</string>
-    <string name="double_tap_to_pause_settings_des">Labo jeer dhexda taabo si aad u joojiso</string>
+    <string name="double_tap_to_pause_settings_des">Dhexda taabo si aad u qallajisato</string>
     <string name="backup_settings">Gurmad u samee xogta</string>
     <string name="use_system_brightness_settings">Iftiinka moobilka istcimaal</string>
     <string name="episode_sync_settings">Cusbooneysii marba halkaad marayso daawashada</string>
@@ -285,7 +285,7 @@
     <string name="downloaded">La degtay</string>
     <string name="downloading">Soo degaya</string>
     <string name="action_remove_from_bookmarks">Ka Saar</string>
-    <string name="swipe_to_change_settings_des">Kor ama hoos u jiid geesaha muuqaalka si aad u maamusho codka ama iftiinka</string>
+    <string name="swipe_to_change_settings_des">Kor ama hoos u jiid labada dhinaca ee daaraha si aad u maamusho codka ama iftiinka</string>
     <string name="autoplay_next_settings">Iskii-u-daarka xalqadda xigta</string>
     <string name="autoplay_next_settings_des">Si iskii ah ayuu u daarayaa xalqadda xigta marka aad dhamaysato kaad daawanayso</string>
     <string name="episode_sync_settings_des">Si iskii ah ha ula socdo appku hadba xalqadda aad marayso</string>
@@ -310,7 +310,7 @@
     <string name="safe_mode_title">Safe mode ayaa daaran</string>
     <string name="safe_mode_description">Dhammaan Kordhiyeyaasha waa la wada demiyey cillad timi aawadeed si aad u ogaato ka cillada sababaya.</string>
     <string name="single_plugin_disabled" formatted="true">%s (La xayiray)</string>
-    <string name="apply_on_restart">Dib u fur app-ka si aad u aragto isbeddelada.</string>
+    <string name="apply_on_restart">Marka dambe eed gasho isticmaal</string>
     <string name="safe_mode_crash_info">Eeg warbixinra Cilladda</string>
     <string name="extension_rating" formatted="true">Qiimeynta: %s</string>
     <string name="extension_authors">Lahaanshaha</string>
@@ -424,8 +424,8 @@
     <string name="plugins_disabled" formatted="true">Xayiran: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Aan dejinayn: %d</string>
     <string name="plugins_updated" formatted="true">Waxa la cusbooneysiiyey %d sidkane</string>
-    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda. Sababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno...\n\nDiscord naga soo qabo ama internetka ka baadh.</string>
-    <string name="download_all_plugins_from_repo">Digniin: CloudStream mas\'uuliyad kama qaadanayo isticmaalka kordhinnada (extensions) dhinac saddexaad mana bixiyo wax taageero ah oo iyaga ku saabsan!</string>
+    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda... \n \nSababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited🤮, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno... \n \nDiscord naga soo qabo ama internetka ka baadh.</string>
+    <string name="download_all_plugins_from_repo">Soo deji dhamaan sidkanayaasha reboositarkan?</string>
     <string name="result_poster_img_des">Boodhka</string>
     <string name="episode_poster_img_des">Boodhka xalqadda</string>
     <string name="home_main_poster_img_des">Boodhka weyn</string>
@@ -465,45 +465,4 @@
     <string name="skip_type_op">Bilowga</string>
     <string name="skip_type_mixed_op">Bilow isku qasan</string>
     <string name="skip_type_credits">Qoraalka dhamaadka</string>
-    <string name="next_season_episode_format" formatted="true">Seasonka %1$d Xalqada %2$d waxaa la soo deyn doonaa</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d saac %2$d daq %3$d ilb</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$ddaq %2$dilb</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$dilb</string>
-    <string name="search_poster_img_des">Sawirka</string>
-    <string name="play_from_beginning_img_des">Ka bilow bilowga</string>
-    <string name="download_queue">Waxa soo degaya</string>
-    <string name="speech_recognition_unavailable">Aqoonsiga codka ma shaqeynayo</string>
-    <string name="begin_speaking">Bilow hadalka…</string>
-    <string name="browser">biraawsar</string>
-    <string name="play_full_series_button">Daaro musalsalka oo dhan</string>
-    <string name="torrent_info">Fiidiyowgaan waa Torrent, taasi waxay la macno tahay in la raadraaci karo dhaqdhaqaaqaaga daawashada.\nHubi inaad fahamsan tahay sida Torrent-ku u shaqeeyo ka hor intaadan sii socon.</string>
-    <string name="downloads_delete_select">Dooro waxyaabaha aad tirayso</string>
-    <string name="downloads_empty">Ma jiro muuqaal aad soo degsatay.</string>
-    <string name="queue_empty_message">Hadda ma jiro wax safka ku jira oo soo degaya.</string>
-    <string name="offline_file">Waxaa laa daawan karaa khad la\'aan</string>
-    <string name="select_all">Dooro dhammaan</string>
-    <string name="deselect_all">Ha dooran dhammaan</string>
-    <string name="open_local_video">Daaro muuqaallada taleefanka kuugu jira</string>
-    <string name="links_reloaded_toast">Linkska dib ayaa loo cusboonaysiiyay</string>
-    <string name="repo_copy_label">Magaca Repository-ka iyo URL-ka</string>
-    <string name="toast_copied">Waa la koobiyeeyay!</string>
-    <string name="subscribe_tooltip">Ogeysiiska xalqada cusub</string>
-    <string name="result_search_tooltip">Ka raadi extensions-ka kale</string>
-    <string name="recommendations_tooltip">Muuji waxyaabaha laguu soo jeediyay</string>
-    <string name="action_open_play">Daaro</string>
-    <string name="test_log">Diiwaanka</string>
-    <string name="speed_setting_summary">Wuxuu ku darayaa inaad doorato xawaaraha muuqaalka</string>
-    <string name="extra_brightness_settings">Iftiin dheeraad ah</string>
-    <string name="extra_brightness_settings_des">Daar filter-ka iftiinka marka uu iftiinku 100% ka bato</string>
-    <string name="extra_brightness_key">Iftiinka dheeraadka ah waa shidan yahay</string>
-    <string name="backup_frequency">Inta jeer ee la kaydinayo</string>
-    <string name="library">Kaydka</string>
-    <string name="search_suggestions">Talooyinka Raadinta</string>
-    <string name="search_suggestions_des">Soo bandhig talooyinka inta aad wax qorayso</string>
-    <string name="clear_suggestions">Tirtir Talooyinka</string>
-    <string name="show_player_metadata_overlay">Muuji xogta dulsaaran muuqaalka</string>
-    <string name="show_cast_in_details">Soo bandhig guddiga dhibidda</string>
-    <string name="automatic_plugin_download_mode_title">Dooro habka loo kala saarayo soo dejinta plugins-ka</string>
-    <string name="install_prerelease">Soo deji nooca hordhaca ah</string>
-    <string name="prerelease_already_installed">Nooca hordhaca ah horey ayaa loo soo dejiyay.</string>
 </resources>
diff --git a/app/src/main/res/values-b+sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
index d4ac26743..52d4e1d05 100644
--- a/app/src/main/res/values-b+sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -422,7 +422,7 @@
     <string name="safe_mode_title">Felsäkert läge på</string>
     <string name="apply_on_restart">Starta om appen för att se ändringar.</string>
     <string name="player_settings_play_in_app">Intern spelare</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_hd">Kamera HD</string>
     <string name="plugin_downloaded">Tillägg nedladdad</string>
     <string name="repository_url_hint">Lager URL eller Shortcode</string>
     <string name="batch_download_start_format" formatted="true">Börjat hämta %1$d %2$s…</string>
@@ -501,7 +501,7 @@
     <string name="duplicate_replace_all">Ersätt alla</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="pref_category_bypass">Förbikoppla ISP</string>
-    <string name="quality_cam_rip">CamRip</string>
+    <string name="quality_cam_rip">Kamera</string>
     <string name="quality_cam">Kamera</string>
     <string name="safe_mode_description">Alla tillägg stängdes av på grund av en krasch för att hjälpa dig hitta det tillägget som orsakar problem.</string>
     <string name="extension_size">Storlek</string>
@@ -722,7 +722,7 @@
     <string name="no_account">Inget konto</string>
     <string name="slide_up_again_to_exceed_100">Dra uppåt igen för att gå över 100%</string>
     <string name="starting_plugin_update_manually">Startar plugin uppdateringsprocessen!</string>
-    <string name="plugins_updated_manually">%d plugin(s) har uppdaterats</string>
+    <string name="plugins_updated_manually">%d plugin(s) har uppdaterats!</string>
     <string name="no_plugins_updated_manually">Inga plugins blev uppdaterade.</string>
     <string name="player_notification_channel_name">Spelarnotiser</string>
     <string name="player_notification_channel_description">Spelarnotisen för att styra uppspelningen i bakgrunden</string>
@@ -735,14 +735,4 @@
     <string name="video_singular">Video</string>
     <string name="skip_type_preview">Förhandsvisning</string>
     <string name="player_is_live">Live</string>
-    <string name="tv_layout_clock_settings">Visa realtidsklocka</string>
-    <string name="tv_layout_clock_settings_des">Visa en realtidsklocka högst upp på skärmen. Gäller startsidan och spelaren</string>
-    <string name="profile_settings">Profilinställningar</string>
-    <string name="profile_hide_negative_sources">Dölj källor med negativ prioritet</string>
-    <string name="profile_hide_error_sources">Dölj källor med fel</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d dold länk</item>
-        <item quantity="other">%d dolda länkar</item>
-    </plurals>
-    <string name="log_cat">Logcat 🐈</string>
 </resources>
diff --git a/app/src/main/res/values-b+ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
index 2537eba0c..4cde39d8f 100644
--- a/app/src/main/res/values-b+ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -609,7 +609,7 @@
     <string name="confirm_before_exiting_desc">பயன்பாட்டிலிருந்து வெளியேறுவதற்கு முன் உரையாடலைக் காட்டு</string>
     <string name="auth_locally">உள்நாட்டில் அங்கீகரிக்கவும்</string>
     <string name="dismiss">தள்ளுபடி</string>
-    <string name="device_pin_url_message">உங்கள் ச்மார்ட்போன் அல்லது கணினியில் <b>%s</b> ஐப் பார்வையிட்டு மேலே உள்ள குறியீட்டை உள்ளிடவும்</string>
+    <string name="device_pin_url_message">உங்கள் ச்மார்ட்போன் அல்லது கணினியில் <b>%s </b> ஐப் பார்வையிட்டு மேலே உள்ள குறியீட்டை உள்ளிடவும்</string>
     <string name="device_pin_error_message">சாதன முள் குறியீட்டைப் பெற முடியாது, உள்ளக அங்கீகாரத்தை முயற்சிக்கவும்</string>
     <string name="device_pin_expired_message">முள் குறியீடு இப்போது காலாவதியானது!</string>
     <string name="subs_edge_size">விளிம்பு அளவு</string>
@@ -652,7 +652,7 @@
     <string name="update_plugins">செருகுநிரல்களைப் புதுப்பிக்கவும்</string>
     <string name="update_plugins_manually">செருகுநிரல்களை கைமுறையாக புதுப்பிக்கவும்</string>
     <string name="starting_plugin_update_manually">சொருகி புதுப்பிப்பு செயல்முறையைத் தொடங்குகிறது!</string>
-    <string name="plugins_updated_manually">%d செருகுநிரல்(கள்) வெற்றிகரமாக புதுப்பிக்கப்பட்டது</string>
+    <string name="plugins_updated_manually">வெற்றிகரமாக புதுப்பிக்கப்பட்டது %d சொருகி (கள்)!</string>
     <string name="no_plugins_updated_manually">செருகுநிரல்கள் எதுவும் புதுப்பிக்கப்படவில்லை.</string>
     <string name="player_notification_channel_name">பிளேயர் அறிவிப்புகள்</string>
     <string name="player_notification_channel_description">பின்னணியில் இருந்து பின்னணியைக் கட்டுப்படுத்துவதற்கான பிளேயர் அறிவிப்பு</string>
@@ -731,17 +731,4 @@
         <item quantity="one">%d பதிவிறக்கம் வரிசையில் உள்ளது</item>
         <item quantity="other">%d பதிவிறக்கங்கள் வரிசையில் உள்ளன</item>
     </plurals>
-    <string name="show_player_metadata_overlay">பிளேயர் மேனிலை தரவு மேலடுக்கைக் காட்டு</string>
-    <string name="video_singular">ஒளிதோற்றம்</string>
-    <string name="tv_layout_clock_settings">உண்மையான நேர கடிகாரத்தைக் காட்டு</string>
-    <string name="tv_layout_clock_settings_des">திரையின் மேற்புறத்தில் நிகழ் நேர கடிகாரத்தைக் காட்டு. முகப்புப்பக்கம் மற்றும் பிளேயருக்குப் பொருந்தும்</string>
-    <string name="skip_type_preview">முன்னோட்டம்</string>
-    <string name="profile_settings">சுயவிவர அமைப்புகள்</string>
-    <string name="profile_hide_negative_sources">எதிர்மறையான முன்னுரிமையுடன் ஆதாரங்களை மறை</string>
-    <string name="profile_hide_error_sources">பிழைகளுடன் ஆதாரங்களை மறைக்கவும்</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d மறைக்கப்பட்ட இணைப்பு</item>
-        <item quantity="other">%d மறைக்கப்பட்ட இணைப்புகள்</item>
-    </plurals>
-    <string name="player_is_live">வாழ்க</string>
 </resources>
diff --git a/app/src/main/res/values-b+tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
index c7e535c8d..d711505a8 100644
--- a/app/src/main/res/values-b+tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -351,8 +351,8 @@
     <string name="home_random">Rastgele</string>
     <string name="coming_soon">Çok yakında…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -376,7 +376,7 @@
     <string name="error_invalid_url">Geçersiz URL</string>
     <string name="error">Hata</string>
     <string name="subtitles_remove_captions">Altyazılardan seçmeli altyazıyı (CC) kaldır</string>
-    <string name="subtitles_remove_bloat">Altyazılardaki reklamları kaldır</string>
+    <string name="subtitles_remove_bloat">Altyazılardaki şişkinliği kaldır</string>
     <string name="subtitles_filter_lang">Tercih edilen medya diline göre filtrele</string>
     <string name="extras">Ek içerikler</string>
     <string name="trailer">Fragman</string>
@@ -661,7 +661,7 @@
     <string name="sort_button_date">Tarih %s</string>
     <string name="update_plugins">Eklentileri Güncelle</string>
     <string name="starting_plugin_update_manually">Eklenti güncellemesi başlıyor!</string>
-    <string name="plugins_updated_manually">%d eklenti başarıyla güncellendi</string>
+    <string name="plugins_updated_manually">%d eklenti başarıyla güncellendi!</string>
     <string name="no_plugins_updated_manually">Hiçbir eklenti güncellenmedi.</string>
     <string name="update_plugins_manually">Eklentileri el ile güncelle</string>
     <string name="player_notification_channel_description">Oynatıcı bildirimi arka planda oynatmasını kontrol etmek içindir</string>
@@ -749,18 +749,4 @@
     <string name="player_is_live">Canlı</string>
     <string name="skip_type_preview">Ön Gösterim</string>
     <string name="video_singular">Video</string>
-    <string name="tv_layout_clock_settings">Gerçek zamanlı saati göster</string>
-    <string name="tv_layout_clock_settings_des">Ekranın üst kısmında gerçek zamanlı bir saat göster. Ana sayfa ve oynatıcı için uygulanır</string>
-    <string name="profile_settings">Profil ayarları</string>
-    <string name="profile_hide_negative_sources">Eksi önceliğe sahip kaynakları gizle</string>
-    <string name="profile_hide_error_sources">Hatalı kaynakları gizle</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d gizli bağlantı</item>
-        <item quantity="other">%d gizli bağlantı</item>
-    </plurals>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Videoları duraklatılmış olarak başlat</string>
-    <string name="start_paused_settings_des">Kaynak seçerken zorlanmayı azalt</string>
-    <string name="subs_edge">Kenar</string>
-    <string name="background">Arka plan</string>
 </resources>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index 9b1bf5eb6..ba46736ac 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -381,13 +381,13 @@
     <string name="extras">Додатково</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="subtitles_remove_bloat">Вилучати рекламу з субтитрів</string>
+    <string name="subtitles_remove_bloat">Вилучати роздуття субтитрів</string>
     <string name="referer">Джерело переходу (необов’язково)</string>
     <string name="next">Далі</string>
     <string name="provider_languages_tip">Переглядайте відео на цих мовах</string>
@@ -646,7 +646,7 @@
     <string name="sort_button_episode">Еп. %s</string>
     <string name="sort_button_date">Дата %s</string>
     <string name="update_plugins">Оновити розширення</string>
-    <string name="plugins_updated_manually">Успішно оновлено %d розширення(-ь)</string>
+    <string name="plugins_updated_manually">Успішно оновлено %d розширення(-ь)!</string>
     <string name="update_plugins_manually">Оновити розширення вручну</string>
     <string name="starting_plugin_update_manually">Починається оновлення розширень!</string>
     <string name="no_plugins_updated_manually">Не оновлено жодного розширення.</string>
@@ -739,20 +739,4 @@
     <string name="video_singular">Відео</string>
     <string name="skip_type_preview">Передперегляд</string>
     <string name="player_is_live">Наживо</string>
-    <string name="tv_layout_clock_settings">Показувати поточний час</string>
-    <string name="tv_layout_clock_settings_des">Показувати поточний час у верхній частині екрана (на головній та у програвачі)</string>
-    <string name="profile_settings">Налаштування профілю</string>
-    <string name="profile_hide_negative_sources">Приховати джерела з від’ємним пріоритетом</string>
-    <string name="profile_hide_error_sources">Приховати джерела з помилками</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d приховане посилання</item>
-        <item quantity="few">%d приховані посилання</item>
-        <item quantity="many">%d прихованих посилань</item>
-        <item quantity="other">%d прихованих посилань</item>
-    </plurals>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">Запускати відео на паузі</string>
-    <string name="start_paused_settings_des">Зменште стрес під час вибору джерел</string>
-    <string name="subs_edge">Край</string>
-    <string name="background">Тло</string>
 </resources>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index e6ffba130..3b2b3876f 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -20,7 +20,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
     <string name="rated_format" formatted="true">Đánh giá: %.1f</string>
-    <string name="new_update_format" formatted="true">Đã tìm thấy bản cập nhật mới!\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Đã tìm thấy bản cập nhật mới! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Bộ lọc</string>
     <string name="duration_format" formatted="true">%d phút</string>
     <string name="app_name">CloudStream</string>
@@ -36,7 +36,7 @@
     <string name="next_episode">Tập tiếp theo</string>
     <string name="result_tags">Thể loại</string>
     <string name="result_share">Chia sẻ</string>
-    <string name="result_open_in_browser">Phát bằng Trình duyệt</string>
+    <string name="result_open_in_browser">Mở bằng trình duyệt</string>
     <string name="skip_loading">Bỏ tải</string>
     <string name="loading">Đang tải…</string>
     <string name="type_watching">Đang xem</string>
@@ -255,13 +255,13 @@
     <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
     <string name="limit_title">Số ký tự tối đa tiêu đề trình phát</string>
     <string name="limit_title_rez">Hiển thị thông tin trình phát</string>
-    <string name="video_buffer_size_settings">Kích thước bộ đệm video</string>
-    <string name="video_buffer_length_settings">Thời lượng bộ đệm video</string>
+    <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
+    <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
     <string name="video_buffer_disk_settings">Bộ nhớ đệm video trên thiết bị</string>
     <string name="video_buffer_clear_settings">Xoá bộ nhớ đệm hình ảnh và video</string>
     <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên thiết bị có bộ nhớ thấp như Android TV.</string>
-    <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên thiết bị có dung lượng lưu trữ thấp như Android TV.</string>
-    <string name="dns_pref">DNS qua HTTPS</string>
+    <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng lưu trữ thấp như Android TV.</string>
+    <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Rất hữu ích để bỏ chặn ISP</string>
     <string name="add_site_pref">Bản sao trang web</string>
     <string name="remove_site_pref">Xoá trang web</string>
@@ -350,8 +350,8 @@
     <string name="home_random">Ngẫu nhiên</string>
     <string name="coming_soon">Sắp có…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">Bản CAM(Quay rạp)</string>
-    <string name="quality_cam_hd">Bản HD(Đẹp)</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -375,7 +375,7 @@
     <string name="error_invalid_url">Lỗi đường dẫn</string>
     <string name="error">Lỗi</string>
     <string name="subtitles_remove_captions">Xóa bỏ chú thích chi tiết trong phụ đề</string>
-    <string name="subtitles_remove_bloat">Xóa quảng cáo trong phụ đề</string>
+    <string name="subtitles_remove_bloat">Xóa bỏ nội dung thừa trong phụ đề</string>
     <string name="subtitles_filter_lang">Lọc theo ngôn ngữ ưu tiên</string>
     <string name="extras">Thêm</string>
     <string name="trailer">Trailer</string>
@@ -660,7 +660,7 @@
     <string name="update_plugins">Cập nhật tiện ích mở rộng</string>
     <string name="no_plugins_updated_manually">Không có tiện ích mở rộng nào được cập nhật.</string>
     <string name="sort_episodes_date_oldest">Ngày phát sóng (Cũ nhất)</string>
-    <string name="plugins_updated_manually">Đã cập nhật thành công %d tiện ích mở rộng</string>
+    <string name="plugins_updated_manually">Đã cập nhật thành công %d tiện ích mở rộng!</string>
     <string name="sort_episodes_rating_high_low">Xếp hạng (Cao nhất)</string>
     <string name="update_plugins_manually">Cập nhật tiện ích mở rộng thủ công</string>
     <string name="sort_episodes_number_desc">Tập (Giảm dần)</string>
@@ -748,17 +748,4 @@
     <string name="player_is_live">Trực tiếp</string>
     <string name="video_singular">Video</string>
     <string name="skip_type_preview">Xem trước</string>
-    <string name="tv_layout_clock_settings">Hiển thị đồng hồ thời gian thực</string>
-    <string name="tv_layout_clock_settings_des">Hiển thị đồng hồ thời gian thực ở phía trên màn hình. Áp dụng cho trang chủ và trình phát</string>
-    <string name="profile_settings">Cài đặt hồ sơ</string>
-    <string name="profile_hide_negative_sources">Ẩn nguồn có độ ưu tiên âm</string>
-    <string name="profile_hide_error_sources">Ẩn nguồn có lỗi</string>
-    <plurals name="links_hidden">
-        <item quantity="other">%d liên kết bị ẩn</item>
-    </plurals>
-    <string name="log_cat">Nhật ký gỡ lỗi</string>
-    <string name="start_paused_settings">Phát video đang dừng</string>
-    <string name="background">Nền</string>
-    <string name="subs_edge">Góc</string>
-    <string name="start_paused_settings_des">Giảm stress khi chọn nguồn</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
index 67e627004..56ec8f43e 100644
--- a/app/src/main/res/values-b+zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -352,8 +352,8 @@
     <string name="home_random">随机</string>
     <string name="coming_soon">即将到来…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -655,7 +655,7 @@
     <string name="sort_button_rating">得分 %s</string>
     <string name="sort_button_date">日期 %s</string>
     <string name="update_plugins">更新插件</string>
-    <string name="plugins_updated_manually">成功更新了 %d 个插件</string>
+    <string name="plugins_updated_manually">成功更新了 %d 个插件！</string>
     <string name="no_plugins_updated_manually">没有插件被更新。</string>
     <string name="update_plugins_manually">手动更新插件</string>
     <string name="sort_episodes_number_asc">集数（升序）</string>
@@ -747,17 +747,4 @@
     <string name="video_singular">视频</string>
     <string name="skip_type_preview">预览</string>
     <string name="player_is_live">播放中</string>
-    <string name="tv_layout_clock_settings">显示实时时钟</string>
-    <string name="tv_layout_clock_settings_des">在屏幕顶部显示实时时钟。应用于主页和播放器</string>
-    <string name="profile_settings">配置文件设置</string>
-    <string name="profile_hide_negative_sources">隐藏负优先级的来源</string>
-    <string name="profile_hide_error_sources">隐藏有错误的来源</string>
-    <plurals name="links_hidden">
-        <item quantity="other">%d 条隐藏链接</item>
-    </plurals>
-    <string name="log_cat">Logcat 🐈</string>
-    <string name="start_paused_settings">开始暂停的视频</string>
-    <string name="start_paused_settings_des">降低选择源时的压力</string>
-    <string name="subs_edge">边缘</string>
-    <string name="background">后台</string>
 </resources>
diff --git a/app/src/main/res/values-b+be/strings.xml b/app/src/main/res/values-be/strings.xml
similarity index 99%
rename from app/src/main/res/values-b+be/strings.xml
rename to app/src/main/res/values-be/strings.xml
index 9fbf8a8d5..3d9200faf 100644
--- a/app/src/main/res/values-b+be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -125,7 +125,7 @@
     <string name="continue_watching">Працягнуць прагляд</string>
     <string name="action_remove_watching">Выдаліць</string>
     <string name="action_open_watching">Больш інфармацыі</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Для карэктнай працы гэтага пастаўшчыка можа спатрэбіцца VPN</string>
     <string name="vpn_torrent">Гэты пастаўшчык — Torrent, рэкамендуецца VPN</string>
     <string name="provider_info_meta">Вэб-сайт не пастаўляе метададзеных, загрузіць відэа не ўдасца, калі на сайце яго няма.</string>
diff --git a/app/src/main/res/values-b+ca/strings.xml b/app/src/main/res/values-ca/strings.xml
similarity index 99%
rename from app/src/main/res/values-b+ca/strings.xml
rename to app/src/main/res/values-ca/strings.xml
index 621243c78..495eb5e3c 100644
--- a/app/src/main/res/values-b+ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -123,7 +123,7 @@
     <string name="continue_watching">Continua mirant</string>
     <string name="action_remove_watching">Eliminar</string>
     <string name="action_open_watching">Més info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Potser necessiteu una VPN per que aquest proveïdor funcioni correctament</string>
     <string name="vpn_torrent">Aquest proveïdor és un Torrent, es recomana fer servir una VPN</string>
     <string name="provider_info_meta">El lloc no proveeix metadades, la càrrega del video fallarà si no existeix al lloc.</string>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
deleted file mode 100644
index c1a3daa02..000000000
--- a/app/src/main/res/values-lo/strings.xml
+++ /dev/null
@@ -1,744 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s ຕອນ %2$d</string>
-    <string name="cast_format" formatted="true">ນັກສະແດງ: %s</string>
-    <string name="next_episode_format" formatted="true">ຕອນທີ %d ຈະອອກໃນອີກ</string>
-    <string name="next_season_episode_format" formatted="true">ຊີຊັນ %1$d ຕອນ %2$d ຈະອອກໃນອີກ</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dນ</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
-    <string name="result_poster_img_des">ໂປສເຕີ</string>
-    <string name="search_poster_img_des">ໂປສເຕີ</string>
-    <string name="episode_poster_img_des">ໂປສເຕີຕອນ</string>
-    <string name="home_main_poster_img_des">ໂປສເຕີຫຼັກ</string>
-    <string name="home_next_random_img_des">ສຸ່ມຖັດໄປ</string>
-    <string name="go_back_img_des">ກັບຄືນ</string>
-    <string name="play_from_beginning_img_des">ຫຼິ້ນແຕ່ເລີ່ມຕົ້ນ</string>
-    <string name="home_change_provider_img_des">ປ່ຽນຜູ້ໃຫ້ບໍລິການ</string>
-    <string name="preview_background_img_des">ຕົວຢ່າງພື້ນຫຼັງ</string>
-    <string name="player_speed_text_format" formatted="true">ຄວາມໄວ (%.2fx)</string>
-    <string name="rated_format" formatted="true">ຄະແນນ: %.1f</string>
-    <string name="new_update_format" formatted="true">ພົບການອັບເດດໃໝ່!\n%1$s -&gt; %2$s</string>
-    <string name="filler" formatted="true">ເນື້ອຫາເສີມ (Filler)</string>
-    <string name="duration_format" formatted="true">%d ນາທີ</string>
-    <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">ຫຼິ້ນດ້ວຍ CloudStream</string>
-    <string name="title_home">ໜ້າຫຼັກ</string>
-    <string name="title_search">ຄົ້ນຫາ</string>
-    <string name="title_downloads">ດາວໂຫຼດ</string>
-    <string name="download_queue">ຄິວດາວໂຫຼດ</string>
-    <string name="title_settings">ການຕັ້ງຄ່າ</string>
-    <string name="search_hint">ຄົ້ນຫາ…</string>
-    <string name="search_hint_site" formatted="true">ຄົ້ນຫາ %s…</string>
-    <string name="speech_recognition_unavailable">ບໍ່ສາມາດໃຊ້ການຮັບຮູ້ສຽງໄດ້</string>
-    <string name="begin_speaking">ເລີ່ມເວົ້າ…</string>
-    <string name="no_data">ບໍ່ມີຂໍ້ມູນ</string>
-    <string name="episode_more_options_des">ຕົວເລືອກເພີ່ມເຕີມ</string>
-    <string name="next_episode">ຕອນຕໍ່ໄປ</string>
-    <string name="result_tags">ປະເພດ</string>
-    <string name="result_share">ແບ່ງປັນ</string>
-    <string name="result_open_in_browser">ເປີດໃນບຣາວເຊີ</string>
-    <string name="browser">ບຣາວເຊີ</string>
-    <string name="skip_loading">ຂ້າມການໂຫຼດ</string>
-    <string name="loading">ກຳລັງໂຫຼດ…</string>
-    <string name="type_watching">ກຳລັງເບິ່ງ</string>
-    <string name="type_on_hold">ພັກໄວ້ກ່ອນ</string>
-    <string name="type_completed">ເບິ່ງຈົບແລ້ວ</string>
-    <string name="type_dropped">ເລີກເບິ່ງ</string>
-    <string name="type_plan_to_watch">ແຜນທີ່ຈະເບິ່ງ</string>
-    <string name="type_re_watching">ກຳລັງເບິ່ງຄືນ</string>
-    <string name="play_movie_button">ຫຼິ້ນຮູບເງົາ</string>
-    <string name="play_trailer_button">ຫຼິ້ນຕົວຢ່າງ</string>
-    <string name="play_livestream_button">ຫຼິ້ນໄລຟ໌ສົດ</string>
-    <string name="play_torrent_button">ສະຕຣີມ Torrent</string>
-    <string name="play_full_series_button">ຫຼິ້ນຊີຣີທັງໝົດ</string>
-    <string name="torrent_info">ວິດີໂອນີ້ແມ່ນ Torrent, ຊຶ່ງໝາຍຄວາມວ່າການເຄື່ອນໄຫວຂອງທ່ານສາມາດຖືກຕິດຕາມໄດ້.\nກະລຸນາໝັ້ນໃຈວ່າທ່ານເຂົ້າໃຈກ່ຽວກັບ Torrent ກ່ອນທີ່ຈະດຳເນີນການຕໍ່.</string>
-    <string name="pick_source">ແຫຼ່ງວິດີໂອ</string>
-    <string name="pick_subtitle">ຄຳບັນຍາຍ (Subtitles)</string>
-    <string name="reload_error">ລອງເຊື່ອມຕໍ່ໃໝ່…</string>
-    <string name="go_back">ກັບຄືນ</string>
-    <string name="play_episode">ຫຼິ້ນຕອນນີ້</string>
-    <string name="download">ດາວໂຫຼດ</string>
-    <string name="downloaded">ດາວໂຫຼດແລ້ວ</string>
-    <string name="downloading">ກຳລັງດາວໂຫຼດ</string>
-    <string name="download_paused">ຢຸດການດາວໂຫຼດຊົ່ວຄາວ</string>
-    <string name="download_started">ເລີ່ມການດາວໂຫຼດ</string>
-    <string name="download_failed">ດາວໂຫຼດບໍ່ສຳເລັດ</string>
-    <string name="download_canceled">ຍົກເລີກການດາວໂຫຼດ</string>
-    <string name="download_done">ດາວໂຫຼດສຳເລັດ</string>
-    <string name="downloads_delete_select">ເລືອກລາຍການທີ່ຈະລຶບ</string>
-    <string name="downloads_empty">ຍັງບໍ່ມີລາຍການດາວໂຫຼດໃນຂະນະນີ້.</string>
-    <string name="queue_empty_message">ຍັງບໍ່ມີຄິວດາວໂຫຼດໃນຂະນະນີ້.</string>
-    <string name="offline_file">ສາມາດເບິ່ງແບບອອຟໄລໄດ້</string>
-    <string name="select_all">ເລືອກທັງໝົດ</string>
-    <string name="deselect_all">ຍົກເລີກການເລືອກທັງໝົດ</string>
-    <string name="update_started">ເລີ່ມການອັບເດດ</string>
-    <string name="stream">ສະຕຣີມຜ່ານເຄືອຂ່າຍ</string>
-    <string name="open_local_video">ເປີດວິດີໂອໃນເຄື່ອງ</string>
-    <string name="error_loading_links_toast">ເກີດຂໍ້ຜິດພາດໃນການໂຫຼດລິ້ງ</string>
-    <string name="links_reloaded_toast">ໂຫຼດລິ້ງໃໝ່ແລ້ວ</string>
-    <string name="download_storage_text">ໜ່ວຍຄວາມຈຳພາຍໃນ</string>
-    <string name="app_dubbed_text">ພາກ</string>
-    <string name="app_subbed_text">ຊັບ</string>
-    <string name="popup_delete_file">ລຶບໄຟລ໌</string>
-    <string name="popup_play_file">ຫຼິ້ນໄຟລ໌</string>
-    <string name="popup_resume_download">ດາວໂຫຼດຕໍ່</string>
-    <string name="popup_pause_download">ຢຸດການດາວໂຫຼດ</string>
-    <string name="home_more_info">ຂໍ້ມູນເພີ່ມເຕີມ</string>
-    <string name="home_expanded_hide">ເຊື່ອງ</string>
-    <string name="home_play">ຫຼິ້ນ</string>
-    <string name="home_info">ຂໍ້ມູນ</string>
-    <string name="filter_bookmarks">ກັ່ນຕອງບຸກມາກ</string>
-    <string name="error_bookmarks_text">ບຸກມາກ</string>
-    <string name="action_remove_from_bookmarks">ລຶບອອກ</string>
-    <string name="action_add_to_bookmarks">ຕັ້ງສະຖານະການເບິ່ງ</string>
-    <string name="sort_apply">ນຳໃຊ້</string>
-    <string name="sort_copy">ຄັດລອກ</string>
-    <string name="sort_close">ປິດ</string>
-    <string name="sort_clear">ລ້າງຂໍ້ມູນ</string>
-    <string name="sort_save">ບັນທຶກ</string>
-    <string name="repo_copy_label">ຊື່ ແລະ URL ຂອງ Repository</string>
-    <string name="toast_copied">ຄັດລອກແລ້ວ!</string>
-    <string name="subscribe_tooltip">ແຈ້ງເຕືອນຕອນໃໝ່</string>
-    <string name="result_search_tooltip">ຄົ້ນຫາໃນສ່ວນເສີມອື່ນໆ</string>
-    <string name="recommendations_tooltip">ສະແດງລາຍການແນະນຳ</string>
-    <string name="player_speed">ຄວາມໄວເຄື່ອງຫຼິ້ນ</string>
-    <string name="subtitles_settings">ຕັ້ງຄ່າຄຳບັນຍາຍ</string>
-    <string name="subs_text_color">ສີຂໍ້ຄວາມ</string>
-    <string name="subs_outline_color">ສີຂອບຂໍ້ຄວາມ</string>
-    <string name="subs_background_color">ສີພື້ນຫຼັງ</string>
-    <string name="subs_window_color">ສີໜ້າຕ່າງ</string>
-    <string name="subs_edge_type">ປະເພດຂອບ</string>
-    <string name="subs_subtitle_elevation">ລະດັບຄວາມສູງຂອງຄຳບັນຍາຍ</string>
-    <string name="subs_font">ຟອນທ໌</string>
-    <string name="subs_font_size">ຂະໜາດຟອນທ໌</string>
-    <string name="search_provider_text_providers">ຄົ້ນຫາໂດຍໃຊ້ຜູ້ໃຫ້ບໍລິການ</string>
-    <string name="search_provider_text_types">ຄົ້ນຫາໂດຍໃຊ້ປະເພດ</string>
-    <string name="benene_count_text">ມອບ Benene ໃຫ້ຜູ້ພັດທະນາແລ້ວ %d ອັນ</string>
-    <string name="benene_count_text_none">ຍັງບໍ່ໄດ້ມອບ Benene</string>
-    <string name="subs_auto_select_language">ເລືອກພາສາອັດຕະໂນມັດ</string>
-    <string name="subs_download_languages">ພາສາທີ່ຈະດາວໂຫຼດ</string>
-    <string name="subs_subtitle_languages">ພາສາຂອງຄຳບັນຍາຍ</string>
-    <string name="subs_hold_to_reset_to_default">ກົດຄ້າງເພື່ອຄືນຄ່າເລີ່ມຕົ້ນ</string>
-    <string name="subs_import_text" formatted="true">ນຳເຂົ້າຟອນທ໌ໂດຍການວາງໄວ້ໃນ %s</string>
-    <string name="continue_watching">ເບິ່ງຕໍ່</string>
-    <string name="action_remove_watching">ລຶບອອກ</string>
-    <string name="action_open_watching">ຂໍ້ມູນເພີ່ມເຕີມ</string>
-    <string name="action_open_play">\@string/home_play</string>
-    <string name="vpn_might_be_needed">ອາດຈຳເປັນຕ້ອງໃຊ້ VPN ເພື່ອໃຫ້ຜູ້ໃຫ້ບໍລິການນີ້ເຮັດວຽກໄດ້ຢ່າງຖືກຕ້ອງ</string>
-    <string name="vpn_torrent">ຜູ້ໃຫ້ບໍລິການນີ້ແມ່ນ Torrent, ແນະນຳໃຫ້ໃຊ້ VPN</string>
-    <string name="provider_info_meta">ເວັບໄຊທ໌ບໍ່ໄດ້ໃຫ້ຂໍ້ມູນ Metadata, ວິດີໂອອາດຈະໂຫຼດບໍ່ໄດ້ຖ້າມັນບໍ່ມີຢູ່ໃນເວັບໄຊທ໌.</string>
-    <string name="torrent_plot">ຄຳອະທິບາຍ</string>
-    <string name="normal_no_plot">ບໍ່ພົບເນື້ອເລື່ອງ</string>
-    <string name="torrent_no_plot">ບໍ່ພົບຄຳອະທິບາຍ</string>
-    <string name="show_log_cat">ສະແດງ Logcat 🐈</string>
-    <string name="test_log">ບັນທຶກ (Log)</string>
-    <string name="picture_in_picture">ຮູບຊ້ອນຮູບ (PiP)</string>
-    <string name="picture_in_picture_des">ຫຼິ້ນຕໍ່ເນື່ອງໃນເຄື່ອງຫຼິ້ນຂະໜາດນ້ອຍເທິງແອັບຯອື່ນໆ</string>
-    <string name="player_size_settings">ປຸ່ມປັບຂະໜາດເຄື່ອງຫຼິ້ນ</string>
-    <string name="player_size_settings_des">ລຶບຂອບສີດຳອອກ</string>
-    <string name="player_subtitles_settings">ຄຳບັນຍາຍ</string>
-    <string name="player_subtitles_settings_des">ຕັ້ງຄ່າຄຳບັນຍາຍໃນເຄື່ອງຫຼິ້ນ</string>
-    <string name="chromecast_subtitles_settings">ຄຳບັນຍາຍ Chromecast</string>
-    <string name="chromecast_subtitles_settings_des">ຕັ້ງຄ່າຄຳບັນຍາຍ Chromecast</string>
-    <string name="eigengraumode_settings">ຄວາມໄວໃນການຫຼິ້ນ</string>
-    <string name="speed_setting_summary">ເພີ່ມຕົວເລືອກຄວາມໄວໃນເຄື່ອງຫຼິ້ນ</string>
-    <string name="swipe_to_seek_settings">ປັດເພື່ອເລື່ອນເບິ່ງ</string>
-    <string name="swipe_to_seek_settings_des">ປັດໄປທາງຊ້າຍ ຫຼື ຂວາ ເພື່ອຄວບຄຸມຕຳແໜ່ງໃນວິດີໂອ</string>
-    <string name="swipe_to_change_settings">ປັດເພື່ອປ່ຽນການຕັ້ງຄ່າ</string>
-    <string name="swipe_to_change_settings_des">ປັດຂຶ້ນ ຫຼື ລົງ ທາງດ້ານຊ້າຍ ຫຼື ຂວາ ເພື່ອປ່ຽນຄວາມສະຫວ່າງ ຫຼື ສຽງ</string>
-    <string name="autoplay_next_settings">ຫຼິ້ນຕອນຕໍ່ໄປອັດຕະໂນມັດ</string>
-    <string name="autoplay_next_settings_des">ເລີ່ມຕອນຕໍ່ໄປເມື່ອຕອນປັດຈຸບັນຈົບລົງ</string>
-    <string name="double_tap_to_seek_settings">ແຕະສອງຄັ້ງເພື່ອເລື່ອນ</string>
-    <string name="double_tap_to_pause_settings">ແຕະສອງຄັ້ງເພື່ອຢຸດ</string>
-    <string name="double_tap_to_seek_amount_settings">ໄລຍະເວລາການເລື່ອນ (ວິນາທີ)</string>
-    <string name="double_tap_to_seek_settings_des">ແຕະສອງຄັ້ງທາງດ້ານຂວາ ຫຼື ຊ້າຍ ເພື່ອເລື່ອນໄປໜ້າ ຫຼື ຖອຍຫຼັງ</string>
-    <string name="double_tap_to_pause_settings_des">ແຕະສອງຄັ້ງຢູ່ເຄິ່ງກາງເພື່ອຢຸດ</string>
-    <string name="use_system_brightness_settings">ໃຊ້ຄວາມສະຫວ່າງຂອງລະບົບ</string>
-    <string name="use_system_brightness_settings_des">ໃຊ້ຄວາມສະຫວ່າງຂອງລະບົບໃນເຄື່ອງຫຼິ້ນແທນການໃຊ້ແຜ່ນມົວສີດຳ</string>
-    <string name="extra_brightness_settings">ຄວາມສະຫວ່າງພິເສດ</string>
-    <string name="extra_brightness_settings_des">ເປີດໃຊ້ຟິວເຕີຄວາມສະຫວ່າງເມື່ອຄວາມສະຫວ່າງໜ້າຈໍເກີນ 100%</string>
-    <string name="extra_brightness_key">extra_brightness_enabled</string>
-    <string name="episode_sync_settings">ອັບເດດຄວາມຄືບໜ້າການເບິ່ງ</string>
-    <string name="episode_sync_settings_des">ຊິງຄ໌ຄວາມຄືບໜ້າຂອງຕອນປັດຈຸບັນໂດຍອັດຕະໂນມັດ</string>
-    <string name="restore_settings">ກູ້ຄືນຂໍ້ມູນຈາກຂໍ້ມູນສຳຮອງ</string>
-    <string name="backup_settings">ສຳຮອງຂໍ້ມູນ</string>
-    <string name="backup_frequency">ຄວາມຖີ່ໃນການສຳຮອງຂໍ້ມູນ</string>
-    <string name="restore_success">ໂຫຼດໄຟລ໌ສຳຮອງແລ້ວ</string>
-    <string name="restore_failed_format" formatted="true">ບໍ່ສາມາດກູ້ຄືນຂໍ້ມູນຈາກໄຟລ໌ %s</string>
-    <string name="backup_success">ບັນທຶກຂໍ້ມູນແລ້ວ</string>
-    <string name="backup_failed">ບໍ່ມີສິດໃນການເຂົ້າເຖິງບ່ອນເກັບຂໍ້ມູນ. ກະລຸນາລອງໃໝ່.</string>
-    <string name="backup_failed_error_format">ເກີດຂໍ້ຜິດພາດໃນການສຳຮອງຂໍ້ມູນ %s</string>
-    <string name="search">ຄົ້ນຫາ</string>
-    <string name="library">ຄັງເກັບ</string>
-    <string name="category_account">ບັນຊີ ແລະ ຄວາມປອດໄພ</string>
-    <string name="category_updates">ອັບເດດ ແລະ ສຳຮອງຂໍ້ມູນ</string>
-    <string name="settings_info">ຂໍ້ມູນ</string>
-    <string name="advanced_search">ການຄົ້ນຫາຂັ້ນສູງ</string>
-    <string name="advanced_search_des">ສະແດງຜົນການຄົ້ນຫາແຍກຕາມຜູ້ໃຫ້ບໍລິການ</string>
-    <string name="search_suggestions">ຄຳແນະນຳການຄົ້ນຫາ</string>
-    <string name="search_suggestions_des">ສະແດງຄຳແນະນຳໃນຂະນະທີ່ພິມຄົ້ນຫາ</string>
-    <string name="clear_suggestions">ລ້າງຄຳແນະນຳ</string>
-    <string name="show_fillers_settings">ສະແດງຕອນເສີມ (filler) ສຳລັບອານິເມະ</string>
-    <string name="show_player_metadata_overlay">ສະແດງຂໍ້ມູນ Metadata ເທິງເຄື່ອງຫຼິ້ນ</string>
-    <string name="show_trailers_settings">ສະແດງຕົວຢ່າງ (Trailer)</string>
-    <string name="kitsu_settings">ສະແດງໂປສເຕີຈາກ Kitsu</string>
-    <string name="show_cast_in_details">ສະແດງລາຍຊື່ນັກສະແດງ</string>
-    <string name="pref_filter_search_quality">ເຊື່ອງຄຸນນະພາບວິດີໂອທີ່ເລືອກໃນຜົນການຄົ້ນຫາ</string>
-    <string name="automatic_plugin_updates">ອັບເດດປລັກອິນອັດຕະໂນມັດ</string>
-    <string name="automatic_plugin_download">ດາວໂຫຼດປລັກອິນອັດຕະໂນມັດ</string>
-    <string name="automatic_plugin_download_mode_title">ເລືອກໂໝດການກັ່ນຕອງການດາວໂຫຼດປລັກອິນ</string>
-    <string name="automatic_plugin_download_summary">ຕິດຕັ້ງປລັກອິນທັງໝົດທີ່ຍັງບໍ່ໄດ້ຕິດຕັ້ງຈາກ repository ທີ່ເພີ່ມໄວ້ໂດຍອັດຕະໂນມັດ.</string>
-    <string name="updates_settings">ສະແດງການອັບເດດແອັບຯ</string>
-    <string name="updates_settings_des">ຄົ້ນຫາການອັບເດດໃໝ່ໂດຍອັດຕະໂນມັດຫຼັງຈາກເປີດແອັບຯ.</string>
-    <string name="redo_setup_process">ຕັ້ງຄ່າໃໝ່ທັງໝົດ</string>
-    <string name="install_prerelease">ຕິດຕັ້ງເວີຊັນທົດລອງ (Pre-release)</string>
-    <string name="prerelease_already_installed">ຕິດຕັ້ງເວີຊັນທົດລອງແລ້ວ.</string>
-    <string name="prerelease_install_failed">ບໍ່ສາມາດຕິດຕັ້ງເວີຊັນທົດລອງໄດ້.</string>
-    <string name="apk_installer_settings">ຕົວຕິດຕັ້ງ APK</string>
-    <string name="apk_installer_settings_des">ບາງອຸປະກອນບໍ່ຮອງຮັບຕົວຕິດຕັ້ງແພັກເກດແບບໃໝ່. ລອງໃຊ້ຕົວເລືອກແບບເກົ່າ (Legacy) ຖ້າບໍ່ສາມາດອັບເດດໄດ້.</string>
-    <string name="github">Github</string>
-    <string name="lightnovel">ແອັບຯ Light novel ໂດຍຜູ້ພັດທະນາດຽວກັນ</string>
-    <string name="anim">ແອັບຯ Anime ໂດຍຜູ້ພັດທະນາດຽວກັນ</string>
-    <string name="discord">ເຂົ້າຮ່ວມ Discord</string>
-    <string name="benene">ມອບ Benene ໃຫ້ຜູ້ພັດທະນາ</string>
-    <string name="benene_des">ມອບ Benene ແລ້ວ</string>
-    <string name="app_language">ພາສາຂອງແອັບຯ</string>
-    <string name="no_chromecast_support_toast">ຜູ້ໃຫ້ບໍລິການນີ້ບໍ່ຮອງຮັບ Chromecast</string>
-    <string name="no_links_found_toast">ບໍ່ພົບລິ້ງ</string>
-    <string name="copy_link_toast">ຄັດລອກລິ້ງລົງໃນຄລິບບອດແລ້ວ</string>
-    <string name="play_episode_toast">ຫຼິ້ນຕອນນີ້</string>
-    <string name="subs_default_reset_toast">ຄືນຄ່າເປັນຄ່າເລີ່ມຕົ້ນ</string>
-    <string name="season">ຊີຊັນ</string>
-    <string name="season_format">%1$s %2$d%3$s</string>
-    <string name="no_season">ບໍ່ມີຊີຊັນ</string>
-    <string name="episode">ຕອນ</string>
-    <string name="episodes">ຕອນ</string>
-    <string name="episodes_range">%1$d-%2$d</string>
-    <string name="episode_format" formatted="true">%1$d %2$s</string>
-    <string name="episode_upcoming_format" formatted="true">ຈະມາໃນອີກ %s</string>
-    <string name="season_short">S</string>
-    <string name="episode_short">E</string>
-    <string name="no_episodes_found">ບໍ່ພົບຕອນ</string>
-    <string name="delete">ລຶບ</string>
-    <string name="delete_file">ລຶບໄຟລ໌</string>
-    <string name="delete_files">ລຶບໄຟລ໌ທັງໝົດ</string>
-    <string name="delete_format" formatted="true">ລຶບ (%1$d | %2$s)</string>
-    <string name="cancel">ຍົກເລີກ</string>
-    <string name="pause">ຢຸດ</string>
-    <string name="start">ເລີ່ມ</string>
-    <string name="test_failed">ບໍ່ສຳເລັດ</string>
-    <string name="test_passed">ສຳເລັດ</string>
-    <string name="test_warning">ຄຳເຕືອນ</string>
-    <string name="resume">ຫຼິ້ນຕໍ່</string>
-    <string name="go_back_30">-30</string>
-    <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">ນີ້ຈະລຶບ %s ຢ່າງຖາວອນ\nທ່ານແນ່ໃຈບໍ່?</string>
-    <string name="delete_message_multiple" formatted="true">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບລາຍການຕໍ່ໄປນີ້ຢ່າງຖາວອນ?\n\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບຕອນຕໍ່ໄປນີ້ໃນ %1$s ຢ່າງຖາວອນ?\n\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">ທ່ານຈະລຶບທຸກຕອນໃນຊີຣີຕໍ່ໄປນີ້ຢ່າງຖາວອນ:\n\n%s</string>
-    <string name="delete_message_series_only" formatted="true">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບທຸກຕອນໃນຊີຣີຕໍ່ໄປນີ້ຢ່າງຖາວອນ?\n\n%s</string>
-    <string name="resume_time_left" formatted="true">ເຫຼືອອີກ\n%d ນາທີ</string>
-    <string name="resume_remaining" formatted="true">ເຫຼືອອີກ\n%s</string>
-    <string name="status_ongoing">ກຳລັງສາຍ</string>
-    <string name="status_completed">ຈົບແລ້ວ</string>
-    <string name="status">ສະຖານະ</string>
-    <string name="year">ປີ</string>
-    <string name="rating">ຄະແນນ</string>
-    <string name="duration">ຄວາມຍາວ</string>
-    <string name="site">ເວັບໄຊທ໌</string>
-    <string name="synopsis">ເລື່ອງຫຍໍ້</string>
-    <string name="queued">ຢູ່ໃນຄິວ</string>
-    <string name="no_subtitles">ບໍ່ມີຄຳບັນຍາຍ</string>
-    <string name="action_default">ຄ່າເລີ່ມຕົ້ນ</string>
-    <string name="free_storage">ວ່າງ</string>
-    <string name="used_storage">ໃຊ້ໄປແລ້ວ</string>
-    <string name="app_storage">ແອັບຯ</string>
-    <string name="movies">ຮູບເງົາ</string>
-    <string name="tv_series">ຊີຣີ</string>
-    <string name="cartoons">ກາຕູນ</string>
-    <string name="anime">ອານິເມະ</string>
-    <string name="torrent">Torrents</string>
-    <string name="documentaries">ສາລະຄະດີ</string>
-    <string name="ova">OVA</string>
-    <string name="asian_drama">ຊີຣີເອເຊຍ</string>
-    <string name="livestreams">ໄລຟ໌ສົດ</string>
-    <string name="nsfw">18+ (NSFW)</string>
-    <string name="others">ອື່ນໆ</string>
-    <string name="movies_singular">ຮູບເງົາ</string>
-    <string name="tv_series_singular">ຊີຣີ</string>
-    <string name="cartoons_singular">ກາຕູນ</string>
-    <string name="anime_singular">ອານິເມະ</string>
-    <string name="ova_singular">OVA</string>
-    <string name="torrent_singular">Torrent</string>
-    <string name="documentaries_singular">ສາລະຄະດີ</string>
-    <string name="asian_drama_singular">ຊີຣີເອເຊຍ</string>
-    <string name="live_singular">ໄລຟ໌ສົດ</string>
-    <string name="nsfw_singular">18+ (NSFW)</string>
-    <string name="other_singular">ວິດີໂອ</string>
-    <string name="music_singular">ເພງ</string>
-    <string name="audio_book_singular">ໜັງສືສຽງ</string>
-    <string name="custom_media_singular">ສື່</string>
-    <string name="audio_singular">ສຽງ</string>
-    <string name="podcast_singular">ພອດແຄສຕ໌</string>
-    <string name="video_singular">ວິດີໂອ</string>
-    <string name="source_error">ຂໍ້ຜິດພາດຈາກແຫຼ່ງວິດີໂອ</string>
-    <string name="remote_error">ຂໍ້ຜິດພາດທາງໄກ</string>
-    <string name="render_error">ຂໍ້ຜິດພາດໃນການປະມວນຜົນສັນຍານ</string>
-    <string name="encoding_error">ຂໍ້ຜິດພາດໃນການເຂົ້າລະຫັດ</string>
-    <string name="unsupported_error">ຂໍ້ຜິດພາດ: ບໍ່ຮອງຮັບ</string>
-    <string name="unexpected_error">ເກີດຂໍ້ຜິດພາດທີ່ບໍ່ຄາດຄິດໃນເຄື່ອງຫຼິ້ນ</string>
-    <string name="storage_error">ການດາວໂຫຼດຜິດພາດ, ກະລຸນາກວດສອບສິດການເຂົ້າເຖິງບ່ອນເກັບຂໍ້ມູນ</string>
-    <string name="episode_action_chromecast_episode">Chromecast ຕອນນີ້</string>
-    <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
-    <string name="episode_action_cast_mirror">Cast mirror</string>
-    <string name="episode_action_play_in_app">ຫຼິ້ນໃນແອັບຯ</string>
-    <string name="episode_action_play_mirror">ຫຼິ້ນ mirror</string>"
-    <string name="episode_action_play_in_format">ຫຼິ້ນໃນ %s</string>
-    <string name="episode_action_auto_download">ດາວໂຫຼດອັດຕະໂນມັດ</string>
-    <string name="episode_action_download_mirror">ດາວໂຫຼດ mirror</string>
-    <string name="episode_action_reload_links">ໂຫຼດລິ້ງໃໝ່</string>
-    <string name="episode_action_download_subtitle">ດາວໂຫຼດຄຳບັນຍາຍ</string>
-    <string name="show_hd">ປ້າຍກຳກັບຄຸນນະພາບ</string>
-    <string name="show_dub">ປ້າຍກຳກັບພາກສຽງ</string>
-    <string name="show_sub">ປ້າຍກຳກັບຄຳບັນຍາຍ</string>
-    <string name="show_rating">ປ້າຍກຳກັບຄະແນນ</string>
-    <string name="show_title">ຊື່ເລື່ອງ</string>
-    <string name="show_episode_text">ຂໍ້ຄວາມບອກຕອນ</string>
-    <string name="poster_ui_settings">ເປີດ/ປິດ ອົງປະກອບ UI ເທິງໂປສເຕີ</string>
-    <string name="no_update_found">ບໍ່ພົບການອັບເດດ</string>
-    <string name="check_for_update">ກວດສອບການອັບເດດ</string>
-    <string name="video_lock">ລັອກ</string>
-    <string name="video_aspect_ratio_resize">ປັບຂະໜາດ</string>
-    <string name="video_source">ແຫຼ່ງວິດີໂອ</string>
-    <string name="video_skip_op">ຂ້າມ OP</string>
-    <string name="dont_show_again">ບໍ່ຕ້ອງສະແດງອີກ</string>
-    <string name="skip_update">ຂ້າມການອັບເດດນີ້</string>
-    <string name="update">ອັບເດດ</string>
-    <string name="watch_quality_pref">ຄຸນນະພາບການເບິ່ງທີ່ຕ້ອງການ (WiFi)</string>
-    <string name="watch_quality_pref_data">ຄຸນນະພາບການເບິ່ງທີ່ຕ້ອງການ (ເນັດມືຖື)</string>
-    <string name="limit_title">ຈຳນວນຕົວອັກສອນສູງສຸດຂອງຊື່ໃນເຄື່ອງຫຼິ້ນ</string>
-    <string name="limit_title_rez">ສະແດງຂໍ້ມູນເຄື່ອງຫຼິ້ນ</string>
-    <string name="video_buffer_size_settings">ຂະໜາດບັບເຟີວິດີໂອ</string>
-    <string name="video_buffer_length_settings">ຄວາມຍາວບັບເຟີວິດີໂອ</string>
-    <string name="video_buffer_disk_settings">ແຄດວິດີໂອໃນພື້ນທີ່ເກັບຂໍ້ມູນ</string>
-    <string name="video_buffer_clear_settings">ລ້າງແຄດວິດີໂອ ແລະ ຮູບພາບ</string>
-    <string name="android_tv_interface_on_seek_settings">ເມື່ອສະແດງເຄື່ອງຫຼິ້ນ - ໄລຍະການເລື່ອນ</string>
-    <string name="android_tv_interface_on_seek_settings_summary">ໄລຍະການເລື່ອນທີ່ໃຊ້ເມື່ອເຫັນເຄື່ອງຫຼິ້ນ</string>
-    <string name="android_tv_interface_off_seek_settings">ເມື່ອເຊື່ອງເຄື່ອງຫຼິ້ນ - ໄລຍະການເລື່ອນ</string>
-    <string name="android_tv_interface_off_seek_settings_summary">ໄລຍະການເລື່ອນທີ່ໃຊ້ເມື່ອເຄື່ອງຫຼິ້ນຖືກເຊື່ອງໄວ້</string>
-    <string name="video_ram_description">ອາດເຮັດໃຫ້ແອັບຯຄ້າງໄດ້ ຖ້າຕັ້ງຄ່າສູງເກີນໄປໃນອຸປະກອນທີ່ມີແຮມໜ້ອຍ ເຊັ່ນ Android TV.</string>
-    <string name="video_disk_description">ອາດເຮັດໃຫ້ເກີດບັນຫາ ຖ້າຕັ້ງຄ່າສູງເກີນໄປໃນອຸປະກອນທີ່ມີພື້ນທີ່ໜ້ອຍ ເຊັ່ນ Android TV.</string>
-    <string name="dns_pref">DNS over HTTPS</string>
-    <string name="dns_pref_summary">ມີປະໂຫຍດໃນການຂ້າມການບລັອກຈາກ ISP</string>
-    <string name="jsdelivr_proxy">GitHub Proxy</string>
-    <string name="jsdelivr_enabled">ບໍ່ສາມາດເຊື່ອມຕໍ່ GitHub ໄດ້. ກຳລັງເປີດໃຊ້ jsDelivr proxy…</string>
-    <string name="jsdelivr_proxy_summary">ຂ້າມການບລັອກ URL ຂອງ GitHub ໂດຍໃຊ້ jsDelivr. ອາດຈະເຮັດໃຫ້ການອັບເດດຊ້າລົງ 2-3 ມື້.</string>
-    <string name="add_site_pref">ຄັດລອກເວັບໄຊທ໌</string>
-    <string name="remove_site_pref">ລຶບເວັບໄຊທ໌</string>
-    <string name="add_site_summary">ເພີ່ມເວັບໄຊທ໌ທີ່ຄືກັບເວັບໄຊທ໌ທີ່ມີຢູ່ແລ້ວ ແຕ່ໃຊ້ URL ອື່ນ</string>
-    <string name="download_path_pref">ບ່ອນເກັບໄຟລ໌ດາວໂຫຼດ</string>
-    <string name="nginx_url_pref">NGINX server URL</string>
-    <string name="display_subbed_dubbed_settings">ສະແດງອານິເມະ ພາກສຽງ/ຄຳບັນຍາຍ</string>
-    <string name="resize_fit">ພໍດີກັບໜ້າຈໍ</string>
-    <string name="resize_fill">ຍືດໃຫ້ເຕັມ</string>
-    <string name="resize_zoom">ຊູມ</string>
-    <string name="legal_notice">ຂໍ້ຄວາມປະຕິເສດຄວາມຮັບຜິດຊອບ</string>
-    <string name="pref_category_bypass">ການຂ້າມ ISP</string>
-    <string name="pref_category_links">ລິ້ງ</string>
-    <string name="pref_category_app_updates">ອັບເດດແອັບຯ</string>
-    <string name="pref_category_backup">ສຳຮອງຂໍ້ມູນ</string>
-    <string name="pref_category_extensions">ສ່ວນເສີມ</string>
-    <string name="pref_category_actions">ການກະທຳ</string>
-    <string name="pref_category_cache">ແຄດ</string>
-    <string name="pref_category_android_tv">Android TV</string>
-    <string name="pref_category_gestures">ການຄວບຄຸມດ້ວຍທ່າທາງ</string>
-    <string name="pref_category_security">ຄວາມປອດໄພ</string>
-    <string name="pref_category_accounts">ບັນຊີ</string>
-    <string name="pref_category_player_features">ຄຸນສົມບັດເຄື່ອງຫຼິ້ນ</string>
-    <string name="pref_category_subtitles">ຄຳບັນຍາຍ</string>
-    <string name="pref_category_player_layout">ຮູບແບບການສະແດງຜົນ</string>
-    <string name="pref_category_defaults">ຄ່າເລີ່ມຕົ້ນ</string>
-    <string name="pref_category_looks">ຮູບລັກສະນະ</string>
-    <string name="pref_category_ui_features">ຄຸນສົມບັດ</string>
-    <string name="category_general">ທົ່ວໄປ</string>
-    <string name="tv_layout_clock_settings">ສະແດງໂມງເວລາຈິງ</string>
-    <string name="tv_layout_clock_settings_des">ສະແດງໂມງເວລາຈິງຢູ່ເທິງສຸດຂອງໜ້າຈໍ. ນຳໃຊ້ກັບໜ້າຫຼັກ ແລະ ເຄື່ອງຫຼິ້ນ</string>
-    <string name="random_button_settings">ປຸ່ມສຸ່ມ</string>
-    <string name="random_button_settings_desc">ສະແດງປຸ່ມສຸ່ມໃນໜ້າທຳອິດ ແລະ ຫ້ອງສະໝຸດ</string>
-    <string name="provider_lang_settings">ພາສາຂອງສ່ວນເສີມ</string>
-    <string name="app_layout">ຮູບແບບແອັບ</string>
-    <string name="preferred_media_settings">ສື່ທີ່ມັກ</string>
-    <string name="enable_nsfw_on_providers">ເປີດເນື້ອຫາ 18+ (NSFW) ໃນສ່ວນເສີມທີ່ຮອງຮັບ</string>
-    <string name="subtitles_encoding">ການເຂົ້າລະຫັດຄຳບັນຍາຍ</string>
-    <string name="category_providers">ຜູ້ໃຫ້ບໍລິການ</string>
-    <string name="category_provider_test">ທົດສອບຜູ້ໃຫ້ບໍລິການ</string>
-    <string name="test_extensions">ທົດສອບສ່ວນເສີມທັງໝົດ</string>
-    <string name="test_extensions_summary">ການທົດສອບນີ້ແມ່ນສຳລັບຜູ້ພັດທະນາເທົ່ານັ້ນ ແລະ ບໍ່ໄດ້ຢືນຢັນ ຫຼື ປະຕິເສດການເຮັດວຽກຂອງສ່ວນເສີມໃດໆ.</string>
-    <string name="category_ui">ຮູບແບບ</string>
-    <string name="automatic">ອັດຕະໂນມັດ</string>
-    <string name="tv_layout">ຮູບແບບ TV</string>
-    <string name="phone_layout">ຮູບແບບໂທລະສັບ</string>
-    <string name="emulator_layout">ຮູບແບບຕົວຈຳລອງ</string>
-    <string name="primary_color_settings">ສີຫຼັກ</string>
-    <string name="app_theme_settings">ທີມຂອງແອັບ</string>
-    <string name="bottom_title_settings">ຕຳແໜ່ງຊື່ຂອງໂປສເຕີ</string>
-    <string name="bottom_title_settings_des">ວາງຊື່ໄວ້ກ້ອງໂປສເຕີ</string>
-    <string name="example_password">ລະຫັດຜ່ານ123</string>
-    <string name="example_username">ຊື່ຜູ້ໃຊ້</string>
-    <string name="example_email">hello@world.com</string>
-    <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">ຊື່ເວັບໄຊໃໝ່</string>
-    <string name="example_site_url">https://example.com</string>
-    <string name="example_lang_name">ລະຫັດພາສາ (lo)</string>
-    <string name="login_format" formatted="true">%1$s %2$s</string>
-    <string name="account">ບັນຊີ</string>
-    <string name="logout">ອອກຈາກລະບົບ</string>
-    <string name="login">ເຂົ້າສູ່ລະບົບ</string>
-    <string name="auth_locally">ຢືນຢັນຕົວຕົນພາຍໃນເຄື່ອງ</string>
-    <string name="switch_account">ສະຫຼັບບັນຊີ</string>
-    <string name="add_account">ເພີ່ມບັນຊີ</string>
-    <string name="create_account">ສ້າງບັນຊີ</string>
-    <string name="add_sync">ເພີ່ມການຕິດຕາມ</string>
-    <string name="added_sync_format" formatted="true">ເພີ່ມ %s ແລ້ວ</string>
-    <string name="upload_sync">ຊິງຄ໌ຂໍ້ມູນ</string>
-    <string name="sync_score">ໃຫ້ຄະແນນແລ້ວ</string>
-    <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
-    <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">%s ຢືນຢັນຕົວຕົນແລ້ວ</string>
-    <string name="authenticated_user_fail" formatted="true">ບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້ທີ່ %s</string>
-    <string name="disable">ປິດໃຊ້ງານ</string>
-    <string name="none">ບໍ່ມີ</string>
-    <string name="normal">ປົກກະຕິ</string>
-    <string name="all">ທັງໝົດ</string>
-    <string name="max">ສູງສຸດ</string>
-    <string name="min">ຕ່ຳສຸດ</string>
-    <string name="subtitles_outline">ເສັ້ນຂອບ</string>
-    <string name="subtitles_depressed">ຍຸບລົງ</string>
-    <string name="subtitles_shadow">ເງົາ</string>
-    <string name="subtitles_raised">ນູນຂຶ້ນ</string>
-    <string name="subtitle_offset">ປັບເວລາຄຳບັນຍາຍ</string>
-    <string name="subtitle_offset_hint">1000 ms</string>
-    <string name="subtitle_offset_title">ຄວາມຊັກຊ້າຂອງຄຳບັນຍາຍ</string>
-    <string name="subtitle_offset_extra_hint_later_format">ໃຊ້ສິ່ງນີ້ຖ້າຄຳບັນຍາຍສະແດງໄວເກີນໄປ %d ms</string>
-    <string name="subtitle_offset_extra_hint_before_format">ໃຊ້ສິ່ງນີ້ຖ້າຄຳບັນຍາຍສະແດງຊ້າເກີນໄປ %d ms</string>
-    <string name="subtitle_offset_extra_hint_none_format">ບໍ່ມີການຊັກຊ້າຂອງຄຳບັນຍາຍ</string>
-    <string name="subtitles_example_text">ເຝີດີມີຊີ້ນໝູອົບອັດແໜ້ນ</string>
-    <string name="recommended">ແນະນຳ</string>
-    <string name="player_loaded_subtitles" formatted="true">ໂຫຼດ %s ແລ້ວ</string>
-    <string name="player_load_subtitles">ໂຫຼດຈາກໄຟລ໌</string>
-    <string name="player_load_subtitles_online">ໂຫຼດຈາກອິນເຕີເນັດ</string>
-    <string name="player_load_one_subtitle_online">ໂຫຼດອັນທຳອິດທີ່ມີ</string>
-    <string name="downloaded_file">ໄຟລ໌ທີ່ດາວໂຫຼດແລ້ວ</string>
-    <string name="actor_main">ນັກສະແດງຫຼັກ</string>
-    <string name="actor_supporting">ນັກສະແດງສົມທົບ</string>
-    <string name="actor_background">ນັກສະແດງພື້ນຫຼັງ</string>
-    <string name="home_source">ແຫຼ່ງຂໍ້ມູນ</string>
-    <string name="home_random">ສຸ່ມ</string>
-    <string name="coming_soon">ໄວໆນີ້…</string>
-    <string name="quality_cam">ກ້ອງ</string>
-    <string name="quality_cam_rip">ກ້ອງ</string>
-    <string name="quality_cam_hd">ກ້ອງ</string>
-    <string name="quality_hq">HQ</string>
-    <string name="quality_hd">HD</string>
-    <string name="quality_ts">TS</string>
-    <string name="quality_tc">TC</string>
-    <string name="quality_blueray">Blu-ray</string>
-    <string name="quality_workprint">WP</string>
-    <string name="quality_dvd">DVD</string>
-    <string name="quality_4k">4K</string>
-    <string name="quality_sd">SD</string>
-    <string name="quality_uhd">UHD</string>
-    <string name="quality_hdr">HDR</string>
-    <string name="quality_sdr">SDR</string>
-    <string name="quality_webrip">ເວັບ</string>
-    <string name="poster_image">ຮູບໂປສເຕີ</string>
-    <string name="qr_image">ຮູບ QR Code</string>
-    <string name="category_player">ເຄື່ອງຫຼິ້ນ</string>
-    <string name="resolution_and_title">ຄວາມລະອຽດ ແລະ ຊື່</string>
-    <string name="title">ຊື່</string>
-    <string name="resolution">ຄວາມລະອຽດ</string>
-    <string name="video_info">ຂໍ້ມູນສື່</string>
-    <string name="error_invalid_id">ID ບໍ່ຖືກຕ້ອງ</string>
-    <string name="error_invalid_data">ຂໍ້ມູນບໍ່ຖືກຕ້ອງ</string>
-    <string name="error_invalid_url">URL ບໍ່ຖືກຕ້ອງ</string>
-    <string name="error">ຂໍ້ຜິດພາດ</string>
-    <string name="subtitles_remove_captions">ເອົາຄຳອະທິບາຍສຽງອອກຈາກຄຳບັນຍາຍ</string>
-    <string name="subtitles_remove_bloat">ເອົາສ່ວນເກີນອອກຈາກຄຳບັນຍາຍ</string>
-    <string name="subtitles_filter_lang">ກັ່ນຕອງຕາມພາສາສື່ທີ່ມັກ</string>
-    <string name="extras">ເພີ່ມເຕີມ</string>
-    <string name="trailer">ຕົວຢ່າງໜັງ</string>
-    <string name="network_adress_example">https://example.com/example.mp4</string>
-    <string name="referer">Referer (ທາງເລືອກ)</string>
-    <string name="next">ຖັດໄປ</string>
-    <string name="provider_languages_tip">ເບິ່ງວິດີໂອໃນພາສາເຫຼົ່ານີ້</string>
-    <string name="previous">ກ່ອນໜ້າ</string>
-    <string name="skip_setup">ຂ້າມການຕັ້ງຄ່າ</string>
-    <string name="app_layout_subtext">ປ່ຽນຮູບລັກສະນະຂອງແອັບໃຫ້ເໝາະສົມກັບອຸປະກອນຂອງທ່ານ</string>
-    <string name="preferred_media_subtext">ພາກສ່ວນໃດທີ່ເຈົ້າຢາກເບິ່ງ</string>
-    <string name="setup_done">ສຳເລັດ</string>
-    <string name="extensions">ສ່ວນເສີມ</string>
-    <string name="add_repository">ເພີ່ມບ່ອນເກັບຂໍ້ມູນ (Repository)</string>
-    <string name="repository_name_hint">ຊື່ບ່ອນເກັບຂໍ້ມູນ (ທາງເລືອກ)</string>
-    <string name="repository_url_hint">URL ບ່ອນເກັບຂໍ້ມູນ ຫຼື ລະຫັດສັ້ນ</string>
-    <string name="plugin_loaded">ໂຫຼດປລັກອິນແລ້ວ</string>
-    <string name="plugin_downloaded">ດາວໂຫຼດປລັກອິນແລ້ວ</string>
-    <string name="plugin_deleted">ລົບປລັກອິນແລ້ວ</string>
-    <string name="plugin_load_fail" formatted="true">ບໍ່ສາມາດໂຫຼດ %s ໄດ້</string>
-    <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">ເລີ່ມດາວໂຫຼດ %1$d %2$s…</string>
-    <string name="batch_download_finish_format" formatted="true">ດາວໂຫຼດ %1$d %2$s ສຳເລັດ</string>
-    <string name="batch_download_nothing_to_download_format" formatted="true">%s ທັງໝົດຖືກດາວໂຫຼດແລ້ວ</string>
-    <string name="no_plugins_found_error">ບໍ່ພົບປລັກອິນໃນບ່ອນເກັບຂໍ້ມູນ</string>
-    <string name="no_repository_found_error">ບໍ່ພົບບ່ອນເກັບຂໍ້ມູນ, ກວດເບິ່ງ URL ຫຼື ລອງໃຊ້ VPN</string>
-    <string name="batch_download">ດາວໂຫຼດເປັນກຸ່ມ</string>
-    <string name="plugin_singular">ປລັກອິນ</string>
-    <string name="plugin">ປລັກອິນ</string>
-    <string name="delete_repository_plugins">ນີ້ຈະລົບປລັກອິນທັງໝົດໃນບ່ອນເກັບຂໍ້ມູນນີ້ຄືກັນ</string>
-    <string name="delete_repository">ລົບບ່ອນເກັບຂໍ້ມູນ</string>
-    <string name="delete_plugin">ລົບປລັກອິນ</string>
-    <string name="setup_extensions_subtext">ດາວໂຫຼດລາຍຊື່ເວັບໄຊທີ່ເຈົ້າຕ້ອງການໃຊ້</string>
-    <string name="plugins_downloaded" formatted="true">ດາວໂຫຼດແລ້ວ: %d</string>
-    <string name="plugins_disabled" formatted="true">ປິດການໃຊ້ງານ: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">ຍັງບໍ່ໄດ້ດາວໂຫຼດ: %d</string>
-    <string name="plugins_updated" formatted="true">ອັບເດດແລ້ວ %d ປລັກອິນ</string>
-    <string name="blank_repo_message">CloudStream ບໍ່ມີເວັບໄຊຕິດຕັ້ງມາໃຫ້ແຕ່ທຳອິດ. ເຈົ້າຕ້ອງຕິດຕັ້ງເວັບໄຊຈາກບ່ອນເກັບຂໍ້ມູນ (Repositories). \n \nເຂົ້າຮ່ວມ Discord ຂອງພວກເຮົາ ຫຼື ຄົ້ນຫາທາງອອນລາຍ.</string>
-    <string name="view_public_repositories_button">ເບິ່ງບ່ອນເກັບຂໍ້ມູນຂອງຊຸມຊົນ</string>
-    <string name="view_public_repositories_button_short">ລາຍການສາທາລະນະ</string>
-    <string name="uppercase_all_subtitles">ເຮັດໃຫ້ຄຳບັນຍາຍທັງໝົດເປັນຕົວພິມໃຫຍ່</string>
-    <string name="download_all_plugins_from_repo">ຄຳເຕືອນ: CloudStream ບໍ່ມີສ່ວນຮັບຜິດຊອບໃດໆໃນການໃຊ້ສ່ວນເສີມຈາກບຸກຄົນທີສາມ ແລະ ບໍ່ມີການຊ່ວຍເຫຼືອສຳລັບພວກມັນ!</string>
-    <string name="single_plugin_disabled" formatted="true">%s (ປິດໃຊ້ງານ)</string>
-    <string name="tracks">ແທຣັກ</string>
-    <string name="audio_tracks">ແທຣັກສຽງ</string>
-    <string name="video_tracks">ແທຣັກວິດີໂອ</string>
-    <string name="apply_on_restart">ເລີ່ມແອັບໃໝ່ເພື່ອເບິ່ງການປ່ຽນແປງ.</string>
-    <string name="restart">ເລີ່ມໃໝ່</string>
-    <string name="stop">ຢຸດ</string>
-    <string name="safe_mode_title">ເປີດໂໝດປອດໄພ</string>
-    <string name="safe_mode_description">ສ່ວນເສີມທັງໝົດຖືກປິດເນື່ອງຈາກແອັບຂັດຂ້ອງ ເພື່ອຊ່ວຍໃຫ້ເຈົ້າຫາຕົວທີ່ເຮັດໃຫ້ເກີດບັນຫາ.</string>
-    <string name="safe_mode_crash_info">ເບິ່ງຂໍ້ມູນການຂັດຂ້ອງ</string>
-    <string name="extension_rating" formatted="true">ຄະແນນ: %s</string>
-    <string name="extension_description">ລາຍລະອຽດ</string>
-    <string name="extension_version">ເວີຊັນ</string>
-    <string name="extension_status">ສະຖານະ</string>
-    <string name="extension_size">ຂະໜາດ</string>
-    <string name="extension_authors">ຜູ້ຂຽນ</string>
-    <string name="extension_types">ທີ່ຮອງຮັບ</string>
-    <string name="extension_language">ພາສາ</string>
-    <string name="extension_install_first">ກະລຸນາຕິດຕັ້ງສ່ວນເສີມກ່ອນ</string>
-    <string name="hls_playlist">HLS Playlist</string>
-    <string name="player_pref">ເຄື່ອງຫຼິ້ນວິດີໂອທີ່ມັກ</string>
-    <string name="player_settings_play_in_app">ເຄື່ອງຫຼິ້ນພາຍໃນແອັບ</string>
-    <string name="player_settings_always_ask">ຖາມທຸກຄັ້ງ</string>
-    <string name="player_settings_select_cast_device">ເລືອກອຸປະກອນ Cast</string>
-    <string name="app_not_found_error">ບໍ່ພົບແອັບ</string>
-    <string name="all_languages_preference">ທຸກພາສາ</string>
-    <string name="skip_type_format" formatted="true">ຂ້າມ %s</string>
-    <string name="skip_type_op">ເພງເປີດ</string>
-    <string name="skip_type_ed">ເພງປິດ</string>
-    <string name="skip_type_recap">ສະຫຼຸບຄວາມເດີມ</string>
-    <string name="skip_type_mixed_ed">ເພງປິດແບບປະສົມ</string>
-    <string name="skip_type_mixed_op">ເພງເປີດແບບປະສົມ</string>
-    <string name="skip_type_credits">ລາຍຊື່ຜູ້ສ້າງ</string>
-    <string name="skip_type_preview">ຕົວຢ່າງຕອນຕໍ່ໄປ</string>
-    <string name="skip_type_intro">ບົດນຳ</string>
-    <string name="clear_history">ລ້າງປະຫວັດ</string>
-    <string name="history">ປະຫວັດ</string>
-    <string name="enable_skip_op_from_database_des">ສະແດງປຸ່ມຂ້າມສຳລັບເພງເປີດ/ເພງປິດ</string>
-    <string name="clipboard_too_large">ຂໍ້ຄວາມຫຼາຍເກີນໄປ. ບໍ່ສາມາດບັນທຶກໃສ່ຄລິບບອດໄດ້.</string>
-    <string name="clipboard_permission_error">ເກີດຂໍ້ຜິດພາດໃນການເຂົ້າເຖິງຄລິບບອດ, ກະລຸນາລອງໃໝ່.</string>
-    <string name="clipboard_unknown_error">ເກີດຂໍ້ຜິດພາດໃນການຄັດລອກ, ກະລຸນາຄັດລອກ logcat ແລະ ຕິດຕໍ່ທີມງານ.</string>
-    <string name="action_mark_as_watched">ໝາຍວ່າເບິ່ງແລ້ວ</string>
-    <string name="action_remove_from_watched">ເອົາອອກຈາກປະຫວັດການເບິ່ງ</string>
-    <string name="confirm_exit_dialog">ເຈົ້າແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກ?</string>
-    <string name="yes">ແມ່ນ</string>
-    <string name="no">ບໍ່</string>
-    <string name="ok">ຕົກລົງ</string>
-    <string name="dismiss">ຍົກເລີກ</string>
-    <string name="open_downloaded_repo">ເປີດບ່ອນເກັບຂໍ້ມູນ</string>
-    <string name="battery_dialog_title">ປິດການປະຢັດແບັດເຕີຣີ</string>
-    <string name="battery_dialog_message">ເພື່ອໃຫ້ການດາວໂຫຼດ ແລະ ການແຈ້ງເຕືອນລາຍການທີ່ຕິດຕາມບໍ່ຖືກຂັດຈັງຫວະ, CloudStream ຕ້ອງການການອະນຸຍາດໃຫ້ເຮັດວຽກຢູ່ພື້ນຫຼັງ. ເມື່ອກົດ ຕົກລົງ, ເຈົ້າຈະເຫັນໜ້າຕ່າງຂໍອະນຸຍາດ, ກະລຸນາກົດ \'ອະນຸຍາດ\'.\n\nໝາຍເຫດ: ການອະນຸຍາດນີ້ບໍ່ໄດ້ໝາຍຄວາມວ່າແອັບຈະກິນແບັດເຕີຣີ. ມັນຈະເຮັດວຽກຢູ່ພື້ນຫຼັງສະເພາະເວລາທີ່ຈຳເປັນ ເຊັ່ນ: ເວລາຮັບການແຈ້ງເຕືອນ ຫຼື ດາວໂຫຼດວິດີໂອ.</string>
-    <string name="app_unrestricted_toast">ການໃຊ້ແບັດເຕີຣີຂອງແອັບຖືກຕັ້ງເປັນແບບບໍ່ຈຳກັດແລ້ວ</string>
-    <string name="app_info_intent_error">ບໍ່ສາມາດເປີດຂໍ້ມູນແອັບ CloudStream ໄດ້.</string>
-    <string name="update_notification_downloading">ກຳລັງດາວໂຫຼດອັບເດດແອັບ…</string>
-    <string name="update_notification_installing">ກຳລັງຕິດຕັ້ງອັບເດດແອັບ…</string>
-    <string name="update_notification_failed">ບໍ່ສາມາດຕິດຕັ້ງເວີຊັນໃໝ່ຂອງແອັບໄດ້</string>
-    <string name="apk_installer_legacy">ແບບເກົ່າ</string>
-    <string name="apk_installer_package_installer">PackageInstaller</string>
-    <string name="delayed_update_notice">ແອັບຈະຖືກອັບເດດເມື່ອທ່ານອອກ</string>
-    <string name="sort_by">ຈັດຮຽງຕາມ</string>
-    <string name="sort">ຈັດຮຽງ</string>
-    <string name="sort_rating_desc">ຄະແນນ (ສູງ ຫາ ຕ່ຳ)</string>
-    <string name="sort_rating_asc">ຄະແນນ (ຕ່ຳ ຫາ ສູງ)</string>
-    <string name="sort_updated_new">ອັບເດດ (ໃໝ່ ຫາ ເກົ່າ)</string>
-    <string name="sort_updated_old">ອັບເດດ (ເກົ່າ ຫາ ໃໝ່)</string>
-    <string name="sort_alphabetical_a">ຕາມຕົວອັກສອນ (ກ ຫາ ຮ)</string>
-    <string name="sort_alphabetical_z">ຕາມຕົວອັກສອນ (ຮ ຫາ ກ)</string>
-    <string name="sort_episodes_number_asc">ຕອນ (ນ້ອຍ ຫາ ຫຼາຍ)</string>
-    <string name="sort_episodes_number_desc">ຕອນ (ຫຼາຍ ຫາ ນ້ອຍ)</string>
-    <string name="sort_episodes_rating_high_low">ຄະແນນ (ສູງສຸດ)</string>
-    <string name="sort_episodes_rating_low_high">ຄະແນນ (ຕ່ຳສຸດ)</string>
-    <string name="sort_episodes_date_newest">ວັນທີສາຍ (ໃໝ່ສຸດ)</string>
-    <string name="sort_episodes_date_oldest">ວັນທີສາຍ (ເກົ່າສຸດ)</string>
-    <string name="sort_button_episode">ຕອນ %s</string>
-    <string name="sort_button_rating">ຄະແນນ %s</string>
-    <string name="sort_button_date">ວັນທີ %s</string>
-    <string name="select_library">ເລືອກຫ້ອງສະໝຸດ</string>
-    <string name="open_with">ເປີດດ້ວຍ</string>
-    <string name="empty_library_no_accounts_message">ຫ້ອງສະໝຸດຂອງເຈົ້າຍັງວ່າງ :( \nເຂົ້າສູ່ລະບົບບັນຊີຫ້ອງສະໝຸດ ຫຼື ເພີ່ມລາຍການໃສ່ຫ້ອງສະໝຸດໃນເຄື່ອງ.</string>
-    <string name="empty_library_logged_in_message">ລາຍການນີ້ຍັງວ່າງ. ລອງສະຫຼັບໄປອັນອື່ນເບິ່ງ.</string>
-    <string name="safe_mode_file">ພົບໄຟລ໌ໂໝດປອດໄພ!\nຈະບໍ່ໂຫຼດສ່ວນເສີມໃດໆຕອນເລີ່ມຕົ້ນ ຈົນກວ່າໄຟລ໌ຈະຖືກລົບອອກ.</string>
-    <string name="revert">ຄືນຄ່າ</string>
-    <string name="subscription_in_progress_notification">ກຳລັງອັບເດດລາຍການທີ່ຕິດຕາມ</string>
-    <string name="subscription_list_name">ຕິດຕາມແລ້ວ</string>
-    <string name="subscription_new">ຕິດຕາມ %s ແລ້ວ</string>
-    <string name="subscription_deleted">ຍົກເລີກການຕິດຕາມ %s ແລ້ວ</string>
-    <string name="subscription_episode_released">ຕອນທີ %d ອອກແລ້ວ!</string>
-    <string name="action_subscribe">ຕິດຕາມ</string>
-    <string name="action_unsubscribe">ຍົກເລີກການຕິດຕາມ</string>
-    <string name="profile_number">ໂປຣໄຟລ໌ %d</string>
-    <string name="profile_settings">ຕັ້ງຄ່າໂປຣໄຟລ໌</string>
-    <string name="profile_hide_negative_sources">ເຊື່ອງແຫຼ່ງຂໍ້ມູນທີ່ມີລຳດັບຄວາມສຳຄັນຕິດລົບ</string>
-    <string name="profile_hide_error_sources">ເຊື່ອງແຫຼ່ງຂໍ້ມູນທີ່ມີຂໍ້ຜິດພາດ</string>
-    <plurals name="links_hidden">
-        <item quantity="other">ເຊື່ອງ %d ລິ້ງ</item>
-    </plurals>
-    <string name="wifi">Wi-Fi</string>
-    <string name="mobile_data">ຂໍ້ມູນມືຖື</string>
-    <string name="set_default">ຕັ້ງເປັນຄ່າເລີ່ມຕົ້ນ</string>
-    <string name="use">ໃຊ້ງານ</string>
-    <string name="edit">ແກ້ໄຂ</string>
-    <string name="source_priority">ລຳດັບຄວາມສຳຄັນຂອງແຫຼ່ງຂໍ້ມູນ</string>
-    <string name="source_priority_help">ຕັດສິນໃຈວ່າຈະໃຫ້ຈັດຮຽງແຫຼ່ງວິດີໂອແນວໃດໃນເຄື່ອງຫຼິ້ນ</string>
-    <string name="profiles">ໂປຣໄຟລ໌</string>
-    <string name="help">ຊ່ວຍເຫຼືອ</string>
-    <string name="quality_profile_help">ຢູ່ບ່ອນນີ້ ເຈົ້າສາມາດປ່ຽນວິທີການຈັດຮຽງແຫຼ່ງຂໍ້ມູນ. ຖ້າວິດີໂອມີລຳດັບຄວາມສຳຄັນສູງກວ່າ ມັນຈະປາກົດຢູ່ທາງເທິງໃນການເລືອກແຫຼ່ງຂໍ້ມູນ. ຜົນລວມຂອງລຳດັບຄວາມສຳຄັນຂອງແຫຼ່ງຂໍ້ມູນ ແລະ ຄຸນນະພາບ ແມ່ນລຳດັບຄວາມສຳຄັນຂອງວິດີໂອ. \n\nແຫຼ່ງຂໍ້ມູນ A: 3 \nຄຸນນະພາບ B: 7 \nຈະມີລຳດັບຄວາມສຳຄັນລວມແມ່ນ 10. \n\nໝາຍເຫດ: ຖ້າຜົນລວມແມ່ນ 10 ຫຼື ຫຼາຍກວ່າ, ເຄື່ອງຫຼິ້ນຈະຂ້າມການໂຫຼດໂດຍອັດຕະໂນມັດເມື່ອລິ້ງນັ້ນຖືກໂຫຼດ!</string>
-    <string name="qualities">ຄຸນນະພາບ</string>
-    <string name="profile_background_des">ພື້ນຫຼັງໂປຣໄຟລ໌</string>
-    <string name="unable_to_inflate">UI ບໍ່ສາມາດສ້າງໄດ້ຢ່າງຖືກຕ້ອງ, ນີ້ແມ່ນບັກໃຫຍ່ ແລະ ຄວນລາຍງານທັນທີ %s</string>
-    <string name="already_voted">ເຈົ້າໄດ້ລົງຄະແນນແລ້ວ</string>
-    <string name="favorites_list_name">ລາຍການທີ່ມັກ</string>
-    <string name="favorite_added">ເພີ່ມ %s ເຂົ້າໃນລາຍການທີ່ມັກແລ້ວ</string>
-    <string name="favorite_removed">ເອົາ %s ອອກຈາກລາຍການທີ່ມັກແລ້ວ</string>
-    <string name="action_add_to_favorites">ເພີ່ມເຂົ້າໃນລາຍການທີ່ມັກ</string>
-    <string name="action_remove_from_favorites">ເອົາອອກຈາກລາຍການທີ່ມັກ</string>
-    <string name="duplicate_title">ພົບລາຍການທີ່ອາດຈະຊ້ຳກັນ</string>
-    <string name="duplicate_add">ເພີ່ມ</string>
-    <string name="duplicate_replace">ແທນທີ່</string>
-    <string name="duplicate_replace_all">ແທນທີ່ທັງໝົດ</string>
-    <string name="duplicate_message_single" formatted="true">ເບິ່ງຄືວ່າມີລາຍການທີ່ອາດຈະຊ້ຳກັນຢູ່ໃນຫ້ອງສະໝຸດຂອງເຈົ້າ: \'%s.\' \n\nເຈົ້າຕ້ອງການເພີ່ມລາຍການນີ້ຕໍ່ໄປ, ແທນທີ່ອັນເກົ່າ ຫຼື ຍົກເລີກການກະທຳ?</string>
-    <string name="duplicate_message_multiple" formatted="true">ພົບລາຍການທີ່ອາດຈະຊ້ຳກັນໃນຫ້ອງສະໝຸດຂອງເຈົ້າ: \n\n%s \n\nເຈົ້າຕ້ອງການເພີ່ມລາຍການນີ້ຕໍ່ໄປ, ແທນທີ່ອັນເກົ່າ ຫຼື ຍົກເລີກການກະທຳ?</string>
-    <string name="enter_pin">ໃສ່ PIN</string>
-    <string name="enter_pin_with_name" formatted="true">ໃສ່ PIN ສຳລັບ %s</string>
-    <string name="enter_current_pin">ໃສ່ PIN ປັດຈຸບັນ</string>
-    <string name="lock_profile">ລັອກໂປຣໄຟລ໌</string>
-    <string name="pin">PIN</string>
-    <string name="pin_error_incorrect">PIN ບໍ່ຖືກຕ້ອງ. ກະລຸນາລອງໃໝ່.</string>
-    <string name="pin_error_length">PIN ຕ້ອງມີ 4 ຕົວ</string>
-    <string name="select_an_account">ເລືອກບັນຊີ</string>
-    <string name="no_account">ບໍ່ມີບັນຊີ</string>
-    <string name="manage_accounts">ຈັດການບັນຊີ</string>
-    <string name="edit_account">ແກ້ໄຂບັນຊີ</string>
-    <string name="logged_account" formatted="true">ເຂົ້າສູ່ລະບົບໂດຍ %s</string>
-    <string name="skip_startup_account_select_pref">ຂ້າມການເລືອກບັນຊີຕອນເລີ່ມຕົ້ນ</string>
-    <string name="use_default_account">ໃຊ້ບັນຊີເລີ່ມຕົ້ນ</string>
-    <string name="rotate_video">ໝຸນວິດີໂອ</string>
-    <string name="rotate_video_desc">ສະແດງປຸ່ມສະຫຼັບການວາງແນວໜ້າຈໍ</string>
-    <string name="auto_rotate_video_desc">ເປີດການສະຫຼັບແນວໜ້າຈໍອັດຕະໂນມັດຕາມແນວວິດີໂອ</string>
-    <string name="auto_rotate_video">ໝຸນອັດຕະໂນມັດ</string>
-    <string name="favorite">ມັກ</string>
-    <string name="unfavorite">ເລີກມັກ</string>
-    <string name="biometric_authentication_title">ປົດລັອກ CloudStream</string>
-    <string name="biometric_setting">ລັອກດ້ວຍໄບໂອເມທຣິກ (ລາຍນິ້ວມື/ໃບໜ້າ)</string>
-    <string name="password_pin_authentication_title">ການຢືນຢັນດ້ວຍລະຫັດຜ່ານ/PIN</string>
-    <string name="biometric_unsupported">ອຸປະກອນນີ້ບໍ່ຮອງຮັບການຢືນຢັນດ້ວຍໄບໂອເມທຣິກ</string>
-    <string name="biometric_setting_summary">ປົດລັອກແອັບດ້ວຍລາຍນິ້ວມື, ໃບໜ້າ, PIN, ຮູບແບບ ຫຼື ລະຫັດຜ່ານ.</string>
-    <string name="biometric_prompt_description">ຫຼັງຈາກພະຍາຍາມລົ້ມເຫຼວຫຼາຍຄັ້ງ, ໜ້າຕ່າງຈະປິດລົງ. ໃຫ້ເລີ່ມແອັບໃໝ່ເພື່ອລອງອີກຄັ້ງ.</string>
-    <string name="biometric_warning">ຂໍ້ມູນ CloudStream ຂອງທ່ານຖືກສຳຮອງໄວ້ແລ້ວ. ເຖິງແມ່ນວ່າມັນຈະເກີດຂຶ້ນໄດ້ຍາກ, ແຕ່ອຸປະກອນແຕ່ລະເຄື່ອງອາດເຮັດວຽກຕ່າງກັນ. ໃນກໍລະນີທີ່ທ່ານຖືກລັອກບໍ່ໃຫ້ເຂົ້າເຖິງແອັບ, ໃຫ້ລ້າງຂໍ້ມູນແອັບທັງໝົດ ແລະ ກູ້ຄືນຈາກໄຟລ໌ສຳຮອງ. ພວກເຮົາຂໍອະໄພໃນຄວາມບໍ່ສະດວກ.</string>
-    <string name="reset_btn">ຕັ້ງຄ່າໃໝ່</string>
-    <string name="cs3wiki">CloudStream Wiki</string>
-    <string name="device_pin_url_message">ເຂົ້າໄປທີ່ <b>%s</b> ໃນມືຖື ຫຼື ຄອມພິວເຕີຂອງທ່ານ ແລະ ໃສ່ລະຫັດຂ້າງເທິງ</string>
-    <string name="device_pin_error_message">ບໍ່ສາມາດຮັບລະຫັດ PIN ຂອງອຸປະກອນໄດ້, ລອງຢືນຢັນຕົວຕົນພາຍໃນເຄື່ອງ</string>
-    <string name="device_pin_expired_message">ລະຫັດ PIN ໝົດອາຍຸແລ້ວ!</string>
-    <string name="device_pin_counter_text">ລະຫັດຈະໝົດອາຍຸໃນ %1$dm %2$ds</string>
-    <string name="sort_release_date_new">ວັນທີວາງຈຳໜ່າຍ (ໃໝ່ ຫາ ເກົ່າ)</string>
-    <string name="sort_release_date_old">ວັນທີວາງຈຳໜ່າຍ (ເກົ່າ ຫາ ໃໝ່)</string>
-    <string name="hide_player_control_names">ເຊື່ອງຊື່ປຸ່ມຄວບຄຸມໃນເຄື່ອງຫຼິ້ນ</string>
-    <string name="preview_seekbar">ຕົວຢ່າງຮູບໃນແຖບເລື່ອນເວລາ</string>
-    <string name="preview_seekbar_desc">ເປີດສະແດງຮູບຕົວຢ່າງເທິງແຖບເລື່ອນເວລາ</string>
-    <string name="no_subtitles_loaded">ຍັງບໍ່ໄດ້ໂຫຼດຄຳບັນຍາຍ</string>
-    <string name="backup_path_title">ຕຳແໜ່ງໂຟນເດີສຳຮອງຂໍ້ມູນ</string>
-    <string name="custom">ກຳນົດເອງ</string>
-    <string name="confirm_before_exiting_title">ຢືນຢັນກ່ອນອອກ</string>
-    <string name="confirm_before_exiting_desc">ສະແດງໜ້າຕ່າງຢືນຢັນກ່ອນອອກຈາກແອັບ</string>
-    <string name="show">ສະແດງ</string>
-    <string name="dont_show">ບໍ່ສະແດງ</string>
-    <string name="subs_edge_size">ຂະໜາດເສັ້ນຂອບ</string>
-    <string name="torrent_preferred_media">ເປີດໃຊ້ torrent ໃນ ຕັ້ງຄ່າ/ຜູ້ໃຫ້ບໍລິການ/ສື່ທີ່ມັກ</string>
-    <string name="torrent_not_accepted">ເລີ່ມແອັບໃໝ່ ແລະ ກົດຍອມຮັບ Stream Torrent ເພື່ອດຳເນີນການຕໍ່.</string>
-    <string name="software_decoding">ການຖອດລະຫັດດ້ວຍຊອບແວ</string>
-    <string name="software_decoding_desc">ການຖອດລະຫັດດ້ວຍຊອບແວຊ່ວຍໃຫ້ຫຼິ້ນໄຟລ໌ທີ່ອຸປະກອນບໍ່ຮອງຮັບໄດ້, ແຕ່ອາດເຮັດໃຫ້ກະຕຸກ ຫຼື ບໍ່ສະຖຽນໃນຄວາມລະອຽດສູງ.</string>
-    <string name="volume_exceeded_100">ລະດັບສຽງເກີນ 100% ແລ້ວ</string>
-    <string name="slide_up_again_to_exceed_100">ເລື່ອນຂຶ້ນອີກຄັ້ງເພື່ອໃຫ້ສຽງດັງເກີນ 100%</string>
-    <string name="update_plugins">ອັບເດດປລັກອິນ</string>
-    <string name="update_plugins_manually">ອັບເດດປລັກອິນດ້ວຍຕົນເອງ</string>
-    <string name="starting_plugin_update_manually">ເລີ່ມຂະບວນການອັບເດດປລັກອິນ!</string>
-    <string name="plugins_updated_manually">ອັບເດດ %d ປລັກອິນສຳເລັດແລ້ວ</string>
-    <string name="no_plugins_updated_manually">ບໍ່ມີປລັກອິນໃດຖືກອັບເດດ.</string>
-    <string name="player_notification_channel_name">ການແຈ້ງເຕືອນເຄື່ອງຫຼິ້ນ</string>
-    <string name="player_notification_channel_description">ການແຈ້ງເຕືອນເຄື່ອງຫຼິ້ນສຳລັບຄວບຄຸມການຫຼິ້ນຈາກພື້ນຫຼັງ</string>
-    <string name="subtitles_from_embedded">ຝັງໃນຕົວ</string>
-    <string name="subtitles_from_online">ອອນລາຍ</string>
-    <string name="all_subtitles_bold">ເຮັດໃຫ້ຄຳບັນຍາຍທັງໝົດເປັນຕົວເຂັ້ມ</string>
-    <string name="all_subtitles_italic">ເຮັດໃຫ້ຄຳບັນຍາຍທັງໝົດເປັນຕົວອຽງ</string>
-    <string name="background_radius">ຄວາມມົນຂອງພື້ນຫຼັງ</string>
-    <string name="download_parallel_settings_des">ຈຳນວນລາຍການທີ່ສາມາດດາວໂຫຼດພ້ອມກັນໄດ້</string>
-    <string name="parallel_downloads">ດາວໂຫຼດຂະໜານ</string>
-    <string name="concurrent_connections">ການເຊື່ອມຕໍ່ພ້ອມກັນ</string>
-    <string name="concurrent_connections_settings_des">ຈຳນວນການເຊື່ອມຕໍ່ພ້ອມກັນທີ່ແຕ່ລະການດາວໂຫຼດສາມາດໃຊ້ໄດ້</string>
-    <string name="go_to_downloads">ໄປທີ່ລາຍການດາວໂຫຼດ</string>
-    <string name="no_internet_connection">ບໍ່ມີການເຊື່ອມຕໍ່ອິນເຕີເນັດ. \n\nກະລຸນາເຊື່ອມຕໍ່ອິນເຕີເນັດແລ້ວລອງໃໝ່, ຫຼື ເບິ່ງໄຟລ໌ທີ່ດາວໂຫຼດໄວ້ໃນຂະນະທີ່ອອບລາຍ.</string>
-    <string name="overscan_settings_des">ປ່ຽນຂອບເຂດຂອງໜ້າຈໍ</string>
-    <string name="overscan_settings">Overscan</string>
-    <string name="poster_size_settings_des">ປ່ຽນຂະໜາດຂອງໂປສເຕີ</string>
-    <string name="poster_size_settings">ຂະໜາດໂປສເຕີ</string>
-    <string name="speedup_title">ກົດຄ້າງເພື່ອສະຫຼັບຄວາມໄວ</string>
-    <string name="speedup_summary">ກົດຄ້າງໄວ້ເພື່ອຫຼິ້ນດ້ວຍຄວາມໄວ 2 ເທົ່າ</string>
-    <string name="edit_profile_image_title">ແກ້ໄຂຮູບໂປຣໄຟລ໌</string>
-    <string name="edit_profile_image_hint">ໃສ່ URL ຮູບໂປຣໄຟລ໌</string>
-    <string name="edit_profile_image_error_empty">ບໍ່ພົບ URL</string>
-    <string name="edit_profile_image_error_invalid">URL ຫຼື ຮູບພາບບໍ່ຖືກຕ້ອງ</string>
-    <string name="edit_profile_image_success">ອັບເດດຮູບພາບສຳເລັດແລ້ວ</string>
-    <string name="action_mark_watched_up_to_this_episode">ໝາຍວ່າເບິ່ງແລ້ວຈົນຮອດຕອນນີ້</string>
-    <string name="action_remove_mark_watched_up_to_this_episode">ເອົາເຄື່ອງໝາຍເບິ່ງແລ້ວອອກຈົນຮອດຕອນນີ້</string>
-    <string name="action_reload">ໂຫຼດໃໝ່ແລ້ວ</string>
-    <string name="reload_provider">ໂຫຼດຜູ້ໃຫ້ບໍລິການໃໝ່</string>
-    <string name="name">ຊື່</string>
-    <string name="source_name">ຊື່ແຫຼ່ງຂໍ້ມູນ</string>
-    <string name="resolution_and_name">ຄວາມລະອຽດ ແລະ ຊື່</string>
-    <string name="download_all">ດາວໂຫຼດທັງໝົດ</string>
-    <string name="cancel_all">ຍົກເລີກທັງໝົດ</string>
-    <string name="download_episode_range">ເຈົ້າຕ້ອງການດາວໂຫຼດຕອນ %s ບໍ່?</string>
-    <string name="cancel_queue_message">ເຈົ້າຕ້ອງການຍົກເລີກການດາວໂຫຼດທີ່ຄ້າງຢູ່ໃນຄິວທັງໝົດບໍ່?</string>
-    <string name="subs_subtitle_alignment">ການຈັດວາງຄຳບັນຍາຍ</string>
-    <string name="bottom_left">ລຸ່ມຊ້າຍ</string>
-    <string name="bottom_center">ລຸ່ມກາງ</string>
-    <string name="bottom_right">ລຸ່ມຂວາ</string>
-    <string name="middle_left">ກາງຊ້າຍ</string>
-    <string name="middle_center">ກາງ</string>
-    <string name="middle_right">ກາງຂວາ</string>
-    <string name="top_left">ເທິງຊ້າຍ</string>
-    <string name="top_center">ເທິງກາງ</string>
-    <string name="top_right">ເທິງຂວາ</string>
-    <plurals name="downloads_active">
-        <item quantity="other">ກຳລັງດາວໂຫຼດ %d ລາຍການ</item>
-    </plurals>
-    <plurals name="downloads_queued">
-        <item quantity="other">%d ລາຍການຢູ່ໃນຄິວ</item>
-    </plurals>
-    <string name="player_is_live">ຖ່າຍທອດສົດ</string>
-</resources>
diff --git a/app/src/main/res/values-b+sq/strings.xml b/app/src/main/res/values-sq/strings.xml
similarity index 98%
rename from app/src/main/res/values-b+sq/strings.xml
rename to app/src/main/res/values-sq/strings.xml
index d083809bb..a13f87bfa 100644
--- a/app/src/main/res/values-b+sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -117,7 +117,7 @@
     <string name="subs_font_size">Madhësia e shkrimit</string>
     <string name="search_provider_text_providers">Kërko duke përdorur ofruesit</string>
     <string name="search_provider_text_types">Kërko duke përdorur tipet</string>
-    <string name="benene_count_text">%d Banane të dhëna për developer-at</string>
+    <string name="benene_count_text">%d Banane të dhëna per developer-at</string>
     <string name="benene_count_text_none">Asnjë Banane e dhënë</string>
     <string name="subs_auto_select_language">Zgjedhje automatike e gjuhës</string>
     <string name="subs_download_languages">Shkarko gjuhët</string>
@@ -127,7 +127,7 @@
     <string name="continue_watching">Vazhdo shikimin</string>
     <string name="action_remove_watching">Hiq</string>
     <string name="action_open_watching">Më shumë informacion</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Një VPN mund të nevojitet që ky ofrues të funksionojë në rregull</string>
     <string name="vpn_torrent">Ky ofrues është Torrent, rekomandohet një VPN</string>
     <string name="provider_info_meta">Metadata nuk ofrohet nga kjo faqe, ngarkimi i videos do të dështojë nëse nuk ekziston në këtë faqe.</string>
@@ -216,7 +216,7 @@
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Asnje sezon</string>
     <string name="episode">Episodi</string>
-    <string name="episodes">Episode</string>
+    <string name="episodes">Episodet</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="episode_upcoming_format" formatted="true">Vazhdon në %s</string>
@@ -269,7 +269,7 @@
     <string name="nsfw">NSFW</string>
     <string name="others">Tjera</string>
     <string name="movies_singular">Film</string>
-    <string name="tv_series_singular">Serial</string>
+    <string name="tv_series_singular">Seri</string>
     <string name="cartoons_singular">Vizatimorë</string>
     <string name="anime_singular">Anime</string>
     <string name="ova_singular">OVA</string>
@@ -679,7 +679,7 @@
     <string name="update_plugins">Përditëso shtesat</string>
     <string name="update_plugins_manually">Përditëso shtesat manualisht</string>
     <string name="starting_plugin_update_manually">Filloi procesi i përditësimit të shtesave!</string>
-    <string name="plugins_updated_manually">%d Shtes(a) u përditësuan me sukses</string>
+    <string name="plugins_updated_manually">%d Shtes(at) u përditësuan me sukses!</string>
     <string name="no_plugins_updated_manually">Nuk u përditësua asnjë shtesë.</string>
     <string name="player_notification_channel_name">Njoftimet e luajtësit</string>
     <string name="player_notification_channel_description">Njoftimi për kontrollin e luajtjes nga sfondi</string>
@@ -735,13 +735,4 @@
         <item quantity="other">%d shkarkime në radhë</item>
     </plurals>
     <string name="player_is_live">Live</string>
-    <string name="profile_settings">Cilësimet e profil-it</string>
-    <string name="profile_hide_negative_sources">Fshih burimet me prioritet negativ</string>
-    <string name="profile_hide_error_sources">Fshih burimet me error-e</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d link i fshehur</item>
-        <item quantity="other">%d linqe të fshehura</item>
-    </plurals>
-    <string name="tv_layout_clock_settings">Shfaq orën në kohë reale</string>
-    <string name="tv_layout_clock_settings_des">Shfaq një orë në krye të ekranit. Aplikohet në faqen kryesore dhe në luajtës</string>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 53b29475b..7c71b5571 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -70,7 +70,6 @@
         <attr name="iconColor" format="color" />
         <attr name="white" format="color" />
         <attr name="black" format="color" />
-        <attr name="account_unselected_stroke" format="color" />
     </declare-styleable>
 
     <declare-styleable name="PercentageCropImageView">
diff --git a/app/src/main/res/values/donottranslate-strings.xml b/app/src/main/res/values/donottranslate-strings.xml
index a1334f0b1..6a4c82713 100644
--- a/app/src/main/res/values/donottranslate-strings.xml
+++ b/app/src/main/res/values/donottranslate-strings.xml
@@ -101,7 +101,6 @@
     <string name="opensubtitles_key">opensubtitles_key</string>
     <string name="subdl_key">subdl_key</string>
     <string name="animeskip_key">animeskip_key</string>
-    <string name="tv_layout_clock_key">tv_layout_clock_key</string>
 
     <string name="pref_category_security_key">pref_category_security_key</string>
     <string name="pref_category_gestures_key">pref_category_gestures_key</string>
@@ -142,16 +141,16 @@
     <string name="legal_notice_text">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
 
-        \n\nIn case of copyright infringement, please directly contact the responsible parties or the streaming websites.
+        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
 
-        \n\nThe app is purely for educational and personal use.
+        The app is purely for educational and personal use.
 
-        \n\nCloudStream does not host any content on the app, and has no control over what media is put up or taken down.
+        CloudStream does not host any content on the app, and has no control over what media is put up or taken down.
         CloudStream functions like any other search engine, such as Google. CloudStream does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displays links in a convenient,
+        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
         user-friendly interface.
 
-        \n\nIt merely scrapes 3rd-party websites that are publicly accessible via any regular web browser. It is the
+        It merely scrapes 3rd-party websites that are publicly accessible via any regular web browser. It is the
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
         CloudStream at your own risk.
     </string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 66eb3533c..31cf951cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -115,7 +115,6 @@
     <string name="subs_outline_color">Outline Color</string>
     <string name="subs_background_color">Background Color</string>
     <string name="subs_window_color">Window Color</string>
-    <string name="subs_edge">Edge</string>
     <string name="subs_edge_type">Edge Type</string>
     <string name="subs_subtitle_elevation">Subtitle Elevation</string>
     <string name="subs_font">Font</string>
@@ -140,7 +139,6 @@
     <string name="normal_no_plot">No Plot Found</string>
     <string name="torrent_no_plot">No Description Found</string>
     <string name="show_log_cat">Show Logcat 🐈</string>
-    <string name="log_cat">Logcat 🐈</string>
     <string name="test_log">Log</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Continues playback in a miniature player on top of other apps</string>
@@ -158,8 +156,6 @@
     <string name="swipe_to_change_settings_des">Slide up or down on the left or right side to change brightness or volume</string>
     <string name="autoplay_next_settings">Autoplay next episode</string>
     <string name="autoplay_next_settings_des">Start the next episode when the current one ends</string>
-    <string name="start_paused_settings">Start videos paused</string>
-    <string name="start_paused_settings_des">Reduce stress when selecting sources</string>
     <string name="double_tap_to_seek_settings">Double tap to seek</string>
     <string name="double_tap_to_pause_settings">Double tap to pause</string>
     <string name="double_tap_to_seek_amount_settings">Player seek amount (Seconds)</string>
@@ -378,8 +374,6 @@
     <string name="pref_category_looks">Looks</string>
     <string name="pref_category_ui_features">Features</string>
     <string name="category_general">General</string>
-    <string name="tv_layout_clock_settings">Show real time clock</string>
-    <string name="tv_layout_clock_settings_des">Show a real time clock at the top of the screen. Applies to the homepage and player</string>
     <string name="random_button_settings">Random Button</string>
     <string name="random_button_settings_desc">Show random button on Homepage and Library</string>
     <string name="provider_lang_settings">Extension languages</string>
@@ -462,8 +456,8 @@
     <string name="home_random">Random</string>
     <string name="coming_soon">Coming soon…</string>
     <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">CamRip</string>
-    <string name="quality_cam_hd">CamHD</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
@@ -489,7 +483,7 @@
     <string name="error_invalid_url">Invalid URL</string>
     <string name="error">Error</string>
     <string name="subtitles_remove_captions">Remove closed captions from subtitles</string>
-    <string name="subtitles_remove_bloat">Remove ads from subtitles</string>
+    <string name="subtitles_remove_bloat">Remove bloat from subtitles</string>
     <string name="subtitles_filter_lang">Filter by preferred media language</string>
     <string name="extras">Extras</string>
     <string name="trailer">Trailer</string>
@@ -628,13 +622,6 @@
     <string name="action_subscribe">Subscribe</string>
     <string name="action_unsubscribe">Unsubscribe</string>
     <string name="profile_number">Profile %d</string>
-    <string name="profile_settings">Profile settings</string>
-    <string name="profile_hide_negative_sources">Hide sources with a negative priority</string>
-    <string name="profile_hide_error_sources">Hide sources with errors</string>
-    <plurals name="links_hidden">
-        <item quantity="one">%d hidden link</item>
-        <item quantity="other">%d hidden links</item>
-    </plurals>
     <string name="wifi">Wi-Fi</string>
     <string name="mobile_data">Mobile data</string>
     <string name="set_default">Set default</string>
@@ -737,7 +724,7 @@
     <!--Manual Update Button-->
     <string name="update_plugins_manually">Update plugins manually</string>
     <string name="starting_plugin_update_manually">Starting plugin update process!</string>
-    <string name="plugins_updated_manually">Successfully updated %d plugin(s)</string>
+    <string name="plugins_updated_manually">Successfully updated %d plugin(s)!</string>
     <string name="no_plugins_updated_manually">No plugins were updated.</string>
     <string name="player_notification_channel_name">Player notifications</string>
     <string name="player_notification_channel_description">The player notification for controlling the playback from the background</string>
@@ -746,7 +733,6 @@
     <string name="all_subtitles_bold">Make all subtitles bold</string>
     <string name="all_subtitles_italic">Make all subtitles italic</string>
     <string name="background_radius">Background Radius</string>
-    <string name="background">Background</string>
     <string name="download_parallel_settings_des">How many different items that can be downloaded in parallel</string>
     <string name="parallel_downloads">Parallel downloads</string>
     <string name="concurrent_connections">Concurrent connections</string>
@@ -797,4 +783,5 @@
         <item quantity="other">%d downloads queued</item>
     </plurals>
     <string name="player_is_live">Live</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5f8492dc..a63b47264 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,7 +63,6 @@
         <item name="iconColor">@color/iconColor</item>
         <item name="white">@color/white</item>
         <item name="black">@color/black</item>
-        <item name="account_unselected_stroke">@color/grayTextColor</item>
         <item name="focusBackground">?android:attr/selectableItemBackground</item>
         <item name="preferenceTheme">@style/CustomPreferenceThemeOverlay</item>
 
@@ -179,7 +178,6 @@
         <item name="grayTextColor">@color/lightGrayTextColor</item>
         <item name="white">@color/black</item>
         <item name="black">@color/white</item>
-        <item name="account_unselected_stroke">@color/transparent</item>
         <item name="colorOnPrimary">@color/blackText</item>
         <item name="isLightTheme">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
diff --git a/app/src/main/res/xml/settings_ui.xml b/app/src/main/res/xml/settings_ui.xml
index 774724f99..1b516ffa3 100644
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -89,12 +89,6 @@
             android:icon="@drawable/metadata_overlay_icon"
             android:key="@string/show_player_metadata_key"
             android:title="@string/show_player_metadata_overlay" />
-        <SwitchPreference
-                android:icon="@drawable/ic_baseline_clock_24"
-                android:summary="@string/tv_layout_clock_settings_des"
-                android:title="@string/tv_layout_clock_settings"
-                android:defaultValue="false"
-                android:key="@string/tv_layout_clock_key" />
         <SwitchPreference
             android:icon="@drawable/ic_baseline_play_arrow_24"
             android:summary="@string/random_button_settings_desc"
diff --git a/build.gradle.kts b/build.gradle.kts
index dc98269b5..f58fb584f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,6 +7,4 @@ plugins {
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.serialization) apply false
-    alias(libs.plugins.compose.compiler) apply false
-    alias(libs.plugins.compose.multiplatform) apply false
 }
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
deleted file mode 100644
index 539c51d36..000000000
--- a/desktopApp/build.gradle.kts
+++ /dev/null
@@ -1,59 +0,0 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-
-plugins {
-    alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.compose.multiplatform)
-    alias(libs.plugins.compose.compiler)
-}
-
-kotlin {
-    jvm {}
-    sourceSets {
-        jvmMain.dependencies {
-            implementation(libs.bundles.compose)
-            implementation(libs.kotlinx.coroutines.core)
-            implementation(libs.kotlinx.coroutines.swing)
-            implementation(libs.kotlinx.collections.immutable)
-            implementation(compose.desktop.currentOs) {
-                // compose.desktop.currentOs imports the wrong material 2, so we exclude it
-                exclude(group = "org.jetbrains.compose.material", module = "material")
-            }
-            implementation(project(":shared"))
-            implementation(project(":library"))
-        }
-    }
-}
-
-// java.lang.System::load has been called by org.jetbrains.skiko.LibraryLoader in an unnamed module
-tasks.withType<JavaExec> {
-    jvmArgs("--enable-native-access=ALL-UNNAMED")
-}
-
-compose.desktop {
-    application {
-        mainClass = "com.lagradost.cloudstream4.MainKt"
-        nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "CloudStream"
-            packageVersion = "1.0.0"
-
-            val iconsRoot = project.file("desktop-icons")
-            macOS {
-                // iconFile.set(iconsRoot.resolve("icon-mac.icns"))
-            }
-            windows {
-                iconFile.set(iconsRoot.resolve("icon-windows.ico"))
-                // menuGroup = "Compose Examples"
-                // see https://wixtoolset.org/documentation/manual/v3/howtos/general/generate_guids.html
-                // upgradeUuid = ""
-            }
-            linux {
-                iconFile.set(iconsRoot.resolve("icon-linux.png"))
-            }
-        }
-
-        //buildTypes.release.proguard {
-        //    configurationFiles.from(project.file("rules.pro"))
-        //}
-    }
-}
\ No newline at end of file
diff --git a/desktopApp/src/desktop-icons/icon-linux.png b/desktopApp/src/desktop-icons/icon-linux.png
deleted file mode 100644
index 394459001..000000000
Binary files a/desktopApp/src/desktop-icons/icon-linux.png and /dev/null differ
diff --git a/desktopApp/src/desktop-icons/icon-windows.ico b/desktopApp/src/desktop-icons/icon-windows.ico
deleted file mode 100644
index defddc2e9..000000000
Binary files a/desktopApp/src/desktop-icons/icon-windows.ico and /dev/null differ
diff --git a/desktopApp/src/jvmMain/kotlin/com/lagradost/cloudstream4/Main.kt b/desktopApp/src/jvmMain/kotlin/com/lagradost/cloudstream4/Main.kt
deleted file mode 100644
index 4ff13fe80..000000000
--- a/desktopApp/src/jvmMain/kotlin/com/lagradost/cloudstream4/Main.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.lagradost.cloudstream4
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.window.Window
-import androidx.compose.ui.window.application
-import com.lagradost.cloudstream4.compose.BlackButton
-import com.lagradost.cloudstream4.compose.LocalFocusOutlineDefault
-import com.lagradost.cloudstream4.compose.WhiteButton
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.app_name
-import com.lagradost.cloudstream4.generated.resources.default_icon
-import com.lagradost.cloudstream4.generated.resources.preview
-import com.lagradost.cloudstream4.theme.CloudStreamTheme
-import com.lagradost.cloudstream4.theme.CloudStreamThemeMode
-import com.mihon.presentation.settings.widget.SwitchPreferenceWidget
-import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.compose.resources.stringResource
-
-fun main() = application {
-    Window(
-        onCloseRequest = ::exitApplication,
-        title = stringResource(Res.string.app_name),
-        icon = painterResource(Res.drawable.default_icon)
-    ) {
-        CloudStreamTheme(mode = CloudStreamThemeMode.Dark) {
-            CompositionLocalProvider(LocalFocusOutlineDefault provides false) {
-                Scaffold(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    contentColor = MaterialTheme.colorScheme.onBackground
-                ) {
-                    Column {
-                        Text("Hello, World!")
-                        Row {
-                            WhiteButton("Hello in White") {
-                            }
-                            BlackButton("Hello in Black") {
-                            }
-                        }
-                        var checked by remember { mutableStateOf(false) }
-                        SwitchPreferenceWidget(
-                            title = "hello", subtitle = "world", icon = painterResource(
-                                Res.drawable.preview
-                            ),
-                            checked = checked,
-                            onCheckedChanged = { checked = !checked }
-                        )
-                    }
-                }
-            }
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/desktopApp/src/readme.md b/desktopApp/src/readme.md
deleted file mode 100644
index 0bebb8638..000000000
--- a/desktopApp/src/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Based on https://github.com/JetBrains/compose-multiplatform/tree/master/examples/imageviewer/desktopApp
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar-SA/title.txt b/fastlane/metadata/android/ar-SA/title.txt
index dde89d58f..7977b2906 100644
--- a/fastlane/metadata/android/ar-SA/title.txt
+++ b/fastlane/metadata/android/ar-SA/title.txt
@@ -1 +1 @@
-CloudStream
+كلاودستريم
diff --git a/fastlane/metadata/android/bn/changelogs/2.txt b/fastlane/metadata/android/bn/changelogs/2.txt
deleted file mode 100644
index 91032cb8a..000000000
--- a/fastlane/metadata/android/bn/changelogs/2.txt
+++ /dev/null
@@ -1 +0,0 @@
-- চেঞ্জলগ যোগ করা হয়েছে!
diff --git a/fastlane/metadata/android/bn/full_description.txt b/fastlane/metadata/android/bn/full_description.txt
deleted file mode 100644
index e1866f54f..000000000
--- a/fastlane/metadata/android/bn/full_description.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CloudStream-3 দিয়ে সিনেমা, টিভি-সিরিজ ও অ্যানিমে স্ট্রিম ও ডাউনলোড করা যায়।
-
-অ্যাপে কোনো বিজ্ঞাপন ও অ্যানালিটিক্স নেই এবং 
-এটি একাধিক ট্রেলার ও মুভি সাইট সাপোর্ট করে, আরও আছে যেমন—
-বুকমার্ক
-সাবটাইটেল ডাউনলোড
-ক্রোমকাস্ট সাপোর্ট
diff --git a/fastlane/metadata/android/bn/short_description.txt b/fastlane/metadata/android/bn/short_description.txt
deleted file mode 100644
index 3d62da485..000000000
--- a/fastlane/metadata/android/bn/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-সিনেমা, টিভি সিরিজ ও অ্যানিমে স্ট্রিম ও ডাউনলোড করুন।
diff --git a/fastlane/metadata/android/bn/title.txt b/fastlane/metadata/android/bn/title.txt
deleted file mode 100644
index dde89d58f..000000000
--- a/fastlane/metadata/android/bn/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-CloudStream
diff --git a/fastlane/metadata/android/lo-LA/changelogs/2.txt b/fastlane/metadata/android/lo-LA/changelogs/2.txt
deleted file mode 100644
index a9c33c045..000000000
--- a/fastlane/metadata/android/lo-LA/changelogs/2.txt
+++ /dev/null
@@ -1 +0,0 @@
-- ເພີ່ມບັນທຶກການປ່ຽນແປງແລ້ວ!
diff --git a/fastlane/metadata/android/lo-LA/full_description.txt b/fastlane/metadata/android/lo-LA/full_description.txt
deleted file mode 100644
index 6c1396482..000000000
--- a/fastlane/metadata/android/lo-LA/full_description.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CloudStream-3 ຊ່ວຍໃຫ້ທ່ານສາມາດເບິ່ງ ແລະ ດາວໂຫຼດຮູບເງົາ, ຊີຣີສ໌ ແລະ ອານິເມະ.
-
-ແອັບນີ້ບໍ່ມີໂຄສະນາ ແລະ ບໍ່ມີການເກັບກຳຂໍ້ມູນການໃຊ້ງານ ແລະ
-
-ຮອງຮັບເວັບໄຊຕົວຢ່າງຮູບເງົາ ແລະ ເວັບໄຊຮູບເງົາຫຼາຍແຫ່ງ, ແລະ ອື່ນໆ ເຊັ່ນ:
-
-ລາຍການທີ່ບັນທຶກໄວ້
-
-ດາວໂຫຼດຄຳບັນຍາຍ
-
-ຮອງຮັບ Chromecast
diff --git a/fastlane/metadata/android/lo-LA/short_description.txt b/fastlane/metadata/android/lo-LA/short_description.txt
deleted file mode 100644
index 507aa8a70..000000000
--- a/fastlane/metadata/android/lo-LA/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-ເບິ່ງ ແລະ ດາວໂຫຼດຮູບເງົາ, ຊີຣີສ໌ ແລະ ອານິເມະ.
diff --git a/fastlane/metadata/android/lo-LA/title.txt b/fastlane/metadata/android/lo-LA/title.txt
deleted file mode 100644
index dde89d58f..000000000
--- a/fastlane/metadata/android/lo-LA/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-CloudStream
diff --git a/fastlane/metadata/android/sq/full_description.txt b/fastlane/metadata/android/sq/full_description.txt
index a7881e62e..f9d6e6f9e 100644
--- a/fastlane/metadata/android/sq/full_description.txt
+++ b/fastlane/metadata/android/sq/full_description.txt
@@ -1,7 +1,7 @@
 CloudStream-3 ju lejon të shikoni dhe shkarkoni filma, seriale televizive dhe anime.
 
 Aplikacioni vjen pa asnjë reklamë dhe analitikë
-dhe suporton faqe të shumta trailer-ash dhe filmash, dhe më shumë, p.sh.
+dhe suporton faqe të shumta trailerash dhe filmash dhe më shumë, p.sh.
 
 Të ruajturat
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c6f0ee55a..8935ab52a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 # https://docs.gradle.org/current/userguide/plugins.html#sec:version_catalog_plugin_application
 # https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
 [versions]
-activity = "1.13.0"
+activityKtx = "1.13.0"
 androidGradlePlugin = "9.1.1"
 animeDb = "1.0.2"
 annotation = "1.10.0"
@@ -26,12 +26,11 @@ junit = "4.13.2"
 junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
-kotlinGradlePlugin = "2.4.0"
+kotlinGradlePlugin = "2.3.20"
 kotlinxAtomicfu = "0.33.0"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutines = "1.11.0"
 kotlinxDatetime = "0.8.0"
-kotlinxIOCore = "0.9.1"
 kotlinxSerializationJson = "1.11.0"
 ksoup = "0.2.6"
 ktor = "3.5.0"
@@ -50,36 +49,29 @@ qrcodeKotlin = "4.5.0"
 rhino = { strictly = "1.8.1" } # Requires minSdk 26 or later beginning at version 1.9.0
 safefile = "0.0.8"
 shimmer = "0.5.0"
+tmdbJava = "2.13.0"
 torrentserver = "7861970"
 tvprovider = "1.1.0"
 video = "1.0.0"
 workRuntimeKtx = "2.11.2"
 zipline = "1.27.0"
-composeMaterial3 = "1.12.0-alpha03"
-composeMultiplatform = "1.12.0"
-lifecycleViewmodelCompose = "2.11.0"
 
-# jvmTarget = "11" is needed for compose, otherwise you will get
-# "Cannot inline bytecode built with JVM target 11 into bytecode" or
-# "Error was captured in composition. java.lang.AbstractMethodError"
-jvmTarget = "11"
+jvmTarget = "1.8"
 jdkToolchain = "17"
 minSdk = "23"
-compileSdk = "37"
+compileSdk = "36"
 targetSdk = "36"
 
 versionCode = "68"
-versionName = "4.8.0"
+versionName = "4.7.0"
 
 [libraries]
-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
+activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
 anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" }
 annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
-coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 colorpicker = { module = "com.github.recloudstream:color-picker-android", version.ref = "colorpicker" }
 conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroid" }
@@ -104,16 +96,11 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinGradlePlugin" }
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
-kotlinx-coroutines-swing  = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
-kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinxIOCore" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 ksoup = { module = "com.fleeksoft.ksoup:ksoup", version.ref = "ksoup" }
-ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
-ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
-ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
 ktor-http = { module = "io.ktor:ktor-http", version.ref = "ktor" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }
@@ -142,22 +129,13 @@ qrcode-kotlin = { module = "io.github.g0dkar:qrcode-kotlin", version.ref = "qrco
 rhino = { module = "org.mozilla:rhino", version.ref = "rhino" }
 safefile = { module = "com.github.LagradOst:SafeFile", version.ref = "safefile" }
 shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "shimmer" }
+tmdb-java = { module = "com.uwetrottmann.tmdb2:tmdb-java", version.ref = "tmdbJava" }
 torrentserver = { module = "com.github.recloudstream:torrentserver", version.ref = "torrentserver" }
 tvprovider = { module = "androidx.tvprovider:tvprovider", version.ref = "tvprovider" }
 video = { module = "com.google.android.mediahome:video", version.ref = "video" }
 work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
 zipline = { module = "app.cash.zipline:zipline-android", version.ref = "zipline" }
 
-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" }
-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "composeMaterial3" }
-compose-resources  = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" }
-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" }
-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }
-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" }
-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" }
-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
-coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }
@@ -168,9 +146,6 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" , version.ref = "kotlinGradlePlug
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinGradlePlugin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinGradlePlugin" }
 
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinGradlePlugin" }
-compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
-
 [bundles]
 coil = ["coil", "coil-network-okhttp"]
 cryptography = ["cryptography-core", "cryptography-provider-optimal"]
@@ -178,4 +153,3 @@ lifecycle = ["lifecycle-livedata-ktx", "lifecycle-viewmodel-ktx"]
 media3 = ["media3-cast", "media3-common", "media3-container", "media3-datasource-cronet", "media3-datasource-okhttp", "media3-exoplayer", "media3-exoplayer-dash", "media3-exoplayer-hls", "media3-session", "media3-ui"]
 navigation = ["navigation-fragment-ktx", "navigation-ui-ktx"]
 nextlib = ["nextlib-media3ext", "nextlib-mediainfo"]
-compose = ["compose-foundation", "compose-material3", "compose-resources", "compose-runtime", "compose-ui", "compose-ui-tooling", "compose-ui-tooling-preview", "lifecycle-viewmodel-compose", "coil-compose"]
\ No newline at end of file
diff --git a/library/README.md b/library/README.md
deleted file mode 100644
index 18f21055d..000000000
--- a/library/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## CloudStream extension library
-
-This is the official API surface for all CloudStream plugins.
-
-To ensure that all plugins work on both the stable release and pre-release we must have
-binary compatibility on all changes. All new changes must be marked with `@Prerelease` to
-prevent accidental usage among extension developers.
-
-We use Kotlin binary compatibility validation using:
-
-``./gradlew checkKotlinAbi``
-
-If you for some reason must update the binary compatibility then manually edit `api/jvm/library.api` or use:
-
-``./gradlew updateKotlinAbi``
diff --git a/library/api/jvm/library.api b/library/api/jvm/library.api
deleted file mode 100644
index 389c8e83f..000000000
--- a/library/api/jvm/library.api
+++ /dev/null
@@ -1,8980 +0,0 @@
-public final class com/lagradost/api/BuildConfig {
-	public static final field INSTANCE Lcom/lagradost/api/BuildConfig;
-	public final fun getMDL_API_KEY ()Ljava/lang/String;
-	public final fun getTRAKT_CLIENT_ID ()Ljava/lang/String;
-}
-
-public final class com/lagradost/api/ContextHelper_jvmKt {
-	public static final fun getContext ()Ljava/lang/Object;
-	public static final fun setContext (Ljava/lang/Object;)V
-}
-
-public final class com/lagradost/api/Log {
-	public static final field INSTANCE Lcom/lagradost/api/Log;
-	public final fun d (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun e (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun i (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun w (Ljava/lang/String;Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/APIHolder {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/APIHolder;
-	public final fun addPluginMapping (Lcom/lagradost/cloudstream3/MainAPI;)V
-	public final fun capitalize (Ljava/lang/String;)Ljava/lang/String;
-	public final fun getAllProviders ()Lcom/lagradost/cloudstream3/utils/AtomicMutableList;
-	public final fun getApiFromNameNull (Ljava/lang/String;)Lcom/lagradost/cloudstream3/MainAPI;
-	public final fun getApiFromUrlNull (Ljava/lang/String;)Lcom/lagradost/cloudstream3/MainAPI;
-	public final fun getApiMap ()Ljava/util/Map;
-	public final fun getApis ()Lcom/lagradost/cloudstream3/utils/AtomicList;
-	public final fun getCaptchaToken (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun getCaptchaToken$default (Lcom/lagradost/cloudstream3/APIHolder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun getTracker (Ljava/util/List;Ljava/util/Set;Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getTracker (Ljava/util/List;Ljava/util/Set;Ljava/lang/Integer;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getUnixTime ()J
-	public final fun getUnixTimeMS ()J
-	public final fun initAll ()V
-	public final fun removePluginMapping (Lcom/lagradost/cloudstream3/MainAPI;)V
-	public final fun setApiMap (Ljava/util/Map;)V
-	public final fun setApis (Lcom/lagradost/cloudstream3/utils/AtomicList;)V
-}
-
-public final class com/lagradost/cloudstream3/Actor {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/Actor;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/Actor;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/Actor;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getImage ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/ActorData {
-	public fun <init> (Lcom/lagradost/cloudstream3/Actor;Lcom/lagradost/cloudstream3/ActorRole;Ljava/lang/String;Lcom/lagradost/cloudstream3/Actor;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/Actor;Lcom/lagradost/cloudstream3/ActorRole;Ljava/lang/String;Lcom/lagradost/cloudstream3/Actor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/Actor;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/ActorRole;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/Actor;
-	public final fun copy (Lcom/lagradost/cloudstream3/Actor;Lcom/lagradost/cloudstream3/ActorRole;Ljava/lang/String;Lcom/lagradost/cloudstream3/Actor;)Lcom/lagradost/cloudstream3/ActorData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/ActorData;Lcom/lagradost/cloudstream3/Actor;Lcom/lagradost/cloudstream3/ActorRole;Ljava/lang/String;Lcom/lagradost/cloudstream3/Actor;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/ActorData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getActor ()Lcom/lagradost/cloudstream3/Actor;
-	public final fun getRole ()Lcom/lagradost/cloudstream3/ActorRole;
-	public final fun getRoleString ()Ljava/lang/String;
-	public final fun getVoiceActor ()Lcom/lagradost/cloudstream3/Actor;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/ActorRole : java/lang/Enum {
-	public static final field Background Lcom/lagradost/cloudstream3/ActorRole;
-	public static final field Main Lcom/lagradost/cloudstream3/ActorRole;
-	public static final field Supporting Lcom/lagradost/cloudstream3/ActorRole;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/ActorRole;
-	public static fun values ()[Lcom/lagradost/cloudstream3/ActorRole;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch {
-	public static final field Companion Lcom/lagradost/cloudstream3/AniSearch$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/AniSearch$Data;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/AniSearch$Data;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/AniSearch$Data;
-	public final fun copy (Lcom/lagradost/cloudstream3/AniSearch$Data;)Lcom/lagradost/cloudstream3/AniSearch;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AniSearch;Lcom/lagradost/cloudstream3/AniSearch$Data;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AniSearch;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Lcom/lagradost/cloudstream3/AniSearch$Data;
-	public fun hashCode ()I
-	public final fun setData (Lcom/lagradost/cloudstream3/AniSearch$Data;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AniSearch$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AniSearch$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AniSearch;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AniSearch;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data {
-	public static final field Companion Lcom/lagradost/cloudstream3/AniSearch$Data$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/AniSearch$Data$Page;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/AniSearch$Data$Page;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/AniSearch$Data$Page;
-	public final fun copy (Lcom/lagradost/cloudstream3/AniSearch$Data$Page;)Lcom/lagradost/cloudstream3/AniSearch$Data;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AniSearch$Data;Lcom/lagradost/cloudstream3/AniSearch$Data$Page;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AniSearch$Data;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getPage ()Lcom/lagradost/cloudstream3/AniSearch$Data$Page;
-	public fun hashCode ()I
-	public final fun setPage (Lcom/lagradost/cloudstream3/AniSearch$Data$Page;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AniSearch$Data$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AniSearch$Data$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AniSearch$Data;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AniSearch$Data;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page {
-	public static final field Companion Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/ArrayList;)V
-	public synthetic fun <init> (Ljava/util/ArrayList;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/ArrayList;
-	public final fun copy (Ljava/util/ArrayList;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AniSearch$Data$Page;Ljava/util/ArrayList;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMedia ()Ljava/util/ArrayList;
-	public fun hashCode ()I
-	public final fun setMedia (Ljava/util/ArrayList;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AniSearch$Data$Page$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AniSearch$Data$Page$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AniSearch$Data$Page;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Media {
-	public static final field Companion Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;Ljava/lang/String;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun copy (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;Ljava/lang/String;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getBannerImage ()Ljava/lang/String;
-	public final fun getCoverImage ()Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;
-	public final fun getFormat ()Ljava/lang/String;
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getIdMal ()Ljava/lang/Integer;
-	public final fun getSeasonYear ()Ljava/lang/Integer;
-	public final fun getTitle ()Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;
-	public fun hashCode ()I
-	public final fun setBannerImage (Ljava/lang/String;)V
-	public final fun setCoverImage (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;)V
-	public final fun setFormat (Ljava/lang/String;)V
-	public final fun setId (Ljava/lang/Integer;)V
-	public final fun setIdMal (Ljava/lang/Integer;)V
-	public final fun setSeasonYear (Ljava/lang/Integer;)V
-	public final fun setTitle (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage {
-	public static final field Companion Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getExtraLarge ()Ljava/lang/String;
-	public final fun getLarge ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun setExtraLarge (Ljava/lang/String;)V
-	public final fun setLarge (Ljava/lang/String;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$CoverImage$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title {
-	public static final field Companion Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEnglish ()Ljava/lang/String;
-	public final fun getRomaji ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun isMatchingTitles (Ljava/lang/String;)Z
-	public final fun setEnglish (Ljava/lang/String;)V
-	public final fun setRomaji (Ljava/lang/String;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AniSearch$Data$Page$Media$Title$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AnimeLoadResponse : com/lagradost/cloudstream3/EpisodeResponse, com/lagradost/cloudstream3/LoadResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Lcom/lagradost/cloudstream3/ShowStatus;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/Score;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Lcom/lagradost/cloudstream3/ShowStatus;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/Score;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Lcom/lagradost/cloudstream3/ShowStatus;
-	public final fun component11 ()Ljava/lang/String;
-	public final fun component12 ()Ljava/util/List;
-	public final fun component13 ()Ljava/util/List;
-	public final fun component14 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component15 ()Ljava/lang/Integer;
-	public final fun component16 ()Ljava/util/List;
-	public final fun component17 ()Ljava/util/List;
-	public final fun component18 ()Ljava/util/List;
-	public final fun component19 ()Z
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component20 ()Ljava/util/Map;
-	public final fun component21 ()Ljava/util/Map;
-	public final fun component22 ()Lcom/lagradost/cloudstream3/NextAiring;
-	public final fun component23 ()Ljava/util/List;
-	public final fun component24 ()Ljava/lang/String;
-	public final fun component25 ()Ljava/lang/String;
-	public final fun component26 ()Ljava/lang/String;
-	public final fun component27 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/Integer;
-	public final fun component9 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Lcom/lagradost/cloudstream3/ShowStatus;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/Score;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/AnimeLoadResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AnimeLoadResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Lcom/lagradost/cloudstream3/ShowStatus;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/Score;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AnimeLoadResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getActors ()Ljava/util/List;
-	public fun getApiName ()Ljava/lang/String;
-	public fun getBackgroundPosterUrl ()Ljava/lang/String;
-	public fun getComingSoon ()Z
-	public fun getContentRating ()Ljava/lang/String;
-	public fun getDuration ()Ljava/lang/Integer;
-	public final fun getEngName ()Ljava/lang/String;
-	public final fun getEpisodes ()Ljava/util/Map;
-	public final fun getJapName ()Ljava/lang/String;
-	public fun getLatestEpisodes ()Ljava/util/Map;
-	public fun getLogoUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getNextAiring ()Lcom/lagradost/cloudstream3/NextAiring;
-	public fun getPlot ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getRating ()Ljava/lang/Integer;
-	public fun getRecommendations ()Ljava/util/List;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getSeasonNames ()Ljava/util/List;
-	public fun getShowStatus ()Lcom/lagradost/cloudstream3/ShowStatus;
-	public fun getSyncData ()Ljava/util/Map;
-	public final fun getSynonyms ()Ljava/util/List;
-	public fun getTags ()Ljava/util/List;
-	public fun getTotalEpisodeIndex (II)I
-	public fun getTrailers ()Ljava/util/List;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUniqueUrl ()Ljava/lang/String;
-	public fun getUrl ()Ljava/lang/String;
-	public fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun setActors (Ljava/util/List;)V
-	public fun setApiName (Ljava/lang/String;)V
-	public fun setBackgroundPosterUrl (Ljava/lang/String;)V
-	public fun setComingSoon (Z)V
-	public fun setContentRating (Ljava/lang/String;)V
-	public fun setDuration (Ljava/lang/Integer;)V
-	public final fun setEngName (Ljava/lang/String;)V
-	public final fun setEpisodes (Ljava/util/Map;)V
-	public final fun setJapName (Ljava/lang/String;)V
-	public fun setLogoUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setNextAiring (Lcom/lagradost/cloudstream3/NextAiring;)V
-	public fun setPlot (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setRating (Ljava/lang/Integer;)V
-	public fun setRecommendations (Ljava/util/List;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setSeasonNames (Ljava/util/List;)V
-	public fun setShowStatus (Lcom/lagradost/cloudstream3/ShowStatus;)V
-	public fun setSyncData (Ljava/util/Map;)V
-	public final fun setSynonyms (Ljava/util/List;)V
-	public fun setTags (Ljava/util/List;)V
-	public fun setTrailers (Ljava/util/List;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun setUniqueUrl (Ljava/lang/String;)V
-	public fun setUrl (Ljava/lang/String;)V
-	public fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/AnimeSearchResponse : com/lagradost/cloudstream3/SearchResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/lang/Integer;
-	public final fun component11 ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public final fun component12 ()Ljava/util/Map;
-	public final fun component13 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Ljava/util/Set;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)Lcom/lagradost/cloudstream3/AnimeSearchResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Set;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AnimeSearchResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getApiName ()Ljava/lang/String;
-	public final fun getDubStatus ()Ljava/util/Set;
-	public final fun getEpisodes ()Ljava/util/Map;
-	public fun getId ()Ljava/lang/Integer;
-	public fun getName ()Ljava/lang/String;
-	public final fun getOtherName ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getQuality ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUrl ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public final fun setDubStatus (Ljava/util/Set;)V
-	public final fun setEpisodes (Ljava/util/Map;)V
-	public fun setId (Ljava/lang/Integer;)V
-	public final fun setOtherName (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setQuality (Lcom/lagradost/cloudstream3/SearchQuality;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public final fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/AudioFile {
-	public static final field Companion Lcom/lagradost/cloudstream3/AudioFile$Companion;
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/Map;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun setHeaders (Ljava/util/Map;)V
-	public final fun setUrl (Ljava/lang/String;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/AudioFile$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/AudioFile$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/AudioFile;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/AudioFile;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AudioFile$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/AutoDownloadMode : java/lang/Enum {
-	public static final field All Lcom/lagradost/cloudstream3/AutoDownloadMode;
-	public static final field Companion Lcom/lagradost/cloudstream3/AutoDownloadMode$Companion;
-	public static final field Disable Lcom/lagradost/cloudstream3/AutoDownloadMode;
-	public static final field FilterByLang Lcom/lagradost/cloudstream3/AutoDownloadMode;
-	public static final field NsfwOnly Lcom/lagradost/cloudstream3/AutoDownloadMode;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getValue ()I
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/AutoDownloadMode;
-	public static fun values ()[Lcom/lagradost/cloudstream3/AutoDownloadMode;
-}
-
-public final class com/lagradost/cloudstream3/AutoDownloadMode$Companion {
-	public final fun getEnum (I)Lcom/lagradost/cloudstream3/AutoDownloadMode;
-}
-
-public final class com/lagradost/cloudstream3/DubStatus : java/lang/Enum {
-	public static final field Dubbed Lcom/lagradost/cloudstream3/DubStatus;
-	public static final field None Lcom/lagradost/cloudstream3/DubStatus;
-	public static final field Subbed Lcom/lagradost/cloudstream3/DubStatus;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getId ()I
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/DubStatus;
-	public static fun values ()[Lcom/lagradost/cloudstream3/DubStatus;
-}
-
-public final class com/lagradost/cloudstream3/Episode {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/Long;
-	public final fun component9 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/Episode;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/Episode;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/Episode;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Ljava/lang/String;
-	public final fun getDate ()Ljava/lang/Long;
-	public final fun getDescription ()Ljava/lang/String;
-	public final fun getEpisode ()Ljava/lang/Integer;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getPosterUrl ()Ljava/lang/String;
-	public final fun getRating ()Ljava/lang/Integer;
-	public final fun getRunTime ()Ljava/lang/Integer;
-	public final fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public final fun getSeason ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public final fun setData (Ljava/lang/String;)V
-	public final fun setDate (Ljava/lang/Long;)V
-	public final fun setDescription (Ljava/lang/String;)V
-	public final fun setEpisode (Ljava/lang/Integer;)V
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setPosterUrl (Ljava/lang/String;)V
-	public final fun setRating (Ljava/lang/Integer;)V
-	public final fun setRunTime (Ljava/lang/Integer;)V
-	public final fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public final fun setSeason (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract interface class com/lagradost/cloudstream3/EpisodeResponse {
-	public abstract fun getLatestEpisodes ()Ljava/util/Map;
-	public abstract fun getNextAiring ()Lcom/lagradost/cloudstream3/NextAiring;
-	public abstract fun getSeasonNames ()Ljava/util/List;
-	public abstract fun getShowStatus ()Lcom/lagradost/cloudstream3/ShowStatus;
-	public abstract fun getTotalEpisodeIndex (II)I
-	public abstract fun setNextAiring (Lcom/lagradost/cloudstream3/NextAiring;)V
-	public abstract fun setSeasonNames (Ljava/util/List;)V
-	public abstract fun setShowStatus (Lcom/lagradost/cloudstream3/ShowStatus;)V
-}
-
-public final class com/lagradost/cloudstream3/ErrorLoadingException : java/lang/Exception {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class com/lagradost/cloudstream3/HomePageList {
-	public fun <init> (Ljava/lang/String;Ljava/util/List;Z)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Z
-	public final fun copy (Ljava/lang/String;Ljava/util/List;Z)Lcom/lagradost/cloudstream3/HomePageList;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/HomePageList;Ljava/lang/String;Ljava/util/List;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/HomePageList;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getList ()Ljava/util/List;
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun isHorizontalImages ()Z
-	public final fun setList (Ljava/util/List;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/HomePageResponse {
-	public fun <init> (Ljava/util/List;Z)V
-	public synthetic fun <init> (Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Z
-	public final fun copy (Ljava/util/List;Z)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/HomePageResponse;Ljava/util/List;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHasNext ()Z
-	public final fun getItems ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract interface class com/lagradost/cloudstream3/IDownloadableMinimum {
-	public abstract fun getHeaders ()Ljava/util/Map;
-	public abstract fun getReferer ()Ljava/lang/String;
-	public abstract fun getUrl ()Ljava/lang/String;
-}
-
-public abstract interface annotation class com/lagradost/cloudstream3/InternalAPI : java/lang/annotation/Annotation {
-}
-
-public final class com/lagradost/cloudstream3/LiveSearchResponse : com/lagradost/cloudstream3/SearchResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public final fun component8 ()Ljava/util/Map;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;)Lcom/lagradost/cloudstream3/LiveSearchResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/LiveSearchResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/LiveSearchResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getApiName ()Ljava/lang/String;
-	public fun getId ()Ljava/lang/Integer;
-	public final fun getLang ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getQuality ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun setId (Ljava/lang/Integer;)V
-	public final fun setLang (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setQuality (Lcom/lagradost/cloudstream3/SearchQuality;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/LiveStreamLoadResponse : com/lagradost/cloudstream3/LoadResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/util/List;
-	public final fun component11 ()Ljava/lang/Integer;
-	public final fun component12 ()Ljava/util/List;
-	public final fun component13 ()Ljava/util/List;
-	public final fun component14 ()Ljava/util/List;
-	public final fun component15 ()Z
-	public final fun component16 ()Ljava/util/Map;
-	public final fun component17 ()Ljava/util/Map;
-	public final fun component18 ()Ljava/lang/String;
-	public final fun component19 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component20 ()Ljava/lang/String;
-	public final fun component21 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component9 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/LiveStreamLoadResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/LiveStreamLoadResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/LiveStreamLoadResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getActors ()Ljava/util/List;
-	public fun getApiName ()Ljava/lang/String;
-	public fun getBackgroundPosterUrl ()Ljava/lang/String;
-	public fun getComingSoon ()Z
-	public fun getContentRating ()Ljava/lang/String;
-	public final fun getDataUrl ()Ljava/lang/String;
-	public fun getDuration ()Ljava/lang/Integer;
-	public fun getLogoUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getPlot ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getRating ()Ljava/lang/Integer;
-	public fun getRecommendations ()Ljava/util/List;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getSyncData ()Ljava/util/Map;
-	public fun getTags ()Ljava/util/List;
-	public fun getTrailers ()Ljava/util/List;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUniqueUrl ()Ljava/lang/String;
-	public fun getUrl ()Ljava/lang/String;
-	public fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun setActors (Ljava/util/List;)V
-	public fun setApiName (Ljava/lang/String;)V
-	public fun setBackgroundPosterUrl (Ljava/lang/String;)V
-	public fun setComingSoon (Z)V
-	public fun setContentRating (Ljava/lang/String;)V
-	public final fun setDataUrl (Ljava/lang/String;)V
-	public fun setDuration (Ljava/lang/Integer;)V
-	public fun setLogoUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setPlot (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setRating (Ljava/lang/Integer;)V
-	public fun setRecommendations (Ljava/util/List;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setSyncData (Ljava/util/Map;)V
-	public fun setTags (Ljava/util/List;)V
-	public fun setTrailers (Ljava/util/List;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun setUniqueUrl (Ljava/lang/String;)V
-	public fun setUrl (Ljava/lang/String;)V
-	public fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract interface class com/lagradost/cloudstream3/LoadResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/LoadResponse$Companion;
-	public abstract fun getActors ()Ljava/util/List;
-	public abstract fun getApiName ()Ljava/lang/String;
-	public abstract fun getBackgroundPosterUrl ()Ljava/lang/String;
-	public abstract fun getComingSoon ()Z
-	public abstract fun getContentRating ()Ljava/lang/String;
-	public abstract fun getDuration ()Ljava/lang/Integer;
-	public abstract fun getLogoUrl ()Ljava/lang/String;
-	public abstract fun getName ()Ljava/lang/String;
-	public abstract fun getPlot ()Ljava/lang/String;
-	public abstract fun getPosterHeaders ()Ljava/util/Map;
-	public abstract fun getPosterUrl ()Ljava/lang/String;
-	public fun getRating ()Ljava/lang/Integer;
-	public abstract fun getRecommendations ()Ljava/util/List;
-	public abstract fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public abstract fun getSyncData ()Ljava/util/Map;
-	public abstract fun getTags ()Ljava/util/List;
-	public abstract fun getTrailers ()Ljava/util/List;
-	public abstract fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public abstract fun getUniqueUrl ()Ljava/lang/String;
-	public abstract fun getUrl ()Ljava/lang/String;
-	public abstract fun getYear ()Ljava/lang/Integer;
-	public abstract fun setActors (Ljava/util/List;)V
-	public abstract fun setApiName (Ljava/lang/String;)V
-	public abstract fun setBackgroundPosterUrl (Ljava/lang/String;)V
-	public abstract fun setComingSoon (Z)V
-	public abstract fun setContentRating (Ljava/lang/String;)V
-	public abstract fun setDuration (Ljava/lang/Integer;)V
-	public abstract fun setLogoUrl (Ljava/lang/String;)V
-	public abstract fun setName (Ljava/lang/String;)V
-	public abstract fun setPlot (Ljava/lang/String;)V
-	public abstract fun setPosterHeaders (Ljava/util/Map;)V
-	public abstract fun setPosterUrl (Ljava/lang/String;)V
-	public fun setRating (Ljava/lang/Integer;)V
-	public abstract fun setRecommendations (Ljava/util/List;)V
-	public abstract fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public abstract fun setSyncData (Ljava/util/Map;)V
-	public abstract fun setTags (Ljava/util/List;)V
-	public abstract fun setTrailers (Ljava/util/List;)V
-	public abstract fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public abstract fun setUniqueUrl (Ljava/lang/String;)V
-	public abstract fun setUrl (Ljava/lang/String;)V
-	public abstract fun setYear (Ljava/lang/Integer;)V
-}
-
-public final class com/lagradost/cloudstream3/LoadResponse$Companion {
-	public final fun addActorNames (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/util/List;)V
-	public final fun addActors (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/util/List;)V
-	public final fun addActorsOnly (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/util/List;)V
-	public final fun addActorsRole (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/util/List;)V
-	public final fun addAniListId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/Integer;)V
-	public final fun addDuration (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun addIdToString (Ljava/lang/String;Lcom/lagradost/cloudstream3/SimklSyncServices;Ljava/lang/String;)Ljava/lang/String;
-	public final fun addImdbId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun addImdbUrl (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun addKitsuId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/Integer;)V
-	public final fun addKitsuId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun addMalId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/Integer;)V
-	public final fun addRating (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/Integer;)V
-	public final fun addRating (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun addScore (Lcom/lagradost/cloudstream3/LoadResponse;Lcom/lagradost/cloudstream3/Score;)V
-	public final fun addScore (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;I)V
-	public static synthetic fun addScore$default (Lcom/lagradost/cloudstream3/LoadResponse$Companion;Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;IILjava/lang/Object;)V
-	public final fun addSimklId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/Integer;)V
-	public final fun addTMDbId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun addTrailer (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun addTrailer (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun addTrailer (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/util/List;Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun addTrailer$default (Lcom/lagradost/cloudstream3/LoadResponse$Companion;Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun addTrailer$default (Lcom/lagradost/cloudstream3/LoadResponse$Companion;Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;Ljava/lang/String;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun addTrailer$default (Lcom/lagradost/cloudstream3/LoadResponse$Companion;Lcom/lagradost/cloudstream3/LoadResponse;Ljava/util/List;Ljava/lang/String;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun addTraktId (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;)V
-	public final fun getAniListId (Lcom/lagradost/cloudstream3/LoadResponse;)Ljava/lang/String;
-	public final fun getAniListIdPrefix ()Ljava/lang/String;
-	public final fun getImdbId (Lcom/lagradost/cloudstream3/LoadResponse;)Ljava/lang/String;
-	public final fun getKitsuId (Lcom/lagradost/cloudstream3/LoadResponse;)Ljava/lang/String;
-	public final fun getKitsuIdPrefix ()Ljava/lang/String;
-	public final fun getMalId (Lcom/lagradost/cloudstream3/LoadResponse;)Ljava/lang/String;
-	public final fun getMalIdPrefix ()Ljava/lang/String;
-	public final fun getSimklIdPrefix ()Ljava/lang/String;
-	public final fun getTMDbId (Lcom/lagradost/cloudstream3/LoadResponse;)Ljava/lang/String;
-	public final fun isMovie (Lcom/lagradost/cloudstream3/LoadResponse;)Z
-	public final fun isTrailersEnabled ()Z
-	public final fun readIdFromString (Ljava/lang/String;)Ljava/util/Map;
-	public final fun setAniListIdPrefix (Ljava/lang/String;)V
-	public final fun setKitsuIdPrefix (Ljava/lang/String;)V
-	public final fun setMalIdPrefix (Ljava/lang/String;)V
-	public final fun setSimklIdPrefix (Ljava/lang/String;)V
-	public final fun setTrailersEnabled (Z)V
-}
-
-public final class com/lagradost/cloudstream3/LoadResponse$DefaultImpls {
-	public static fun getRating (Lcom/lagradost/cloudstream3/LoadResponse;)Ljava/lang/Integer;
-	public static fun setRating (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/Integer;)V
-}
-
-public abstract class com/lagradost/cloudstream3/MainAPI {
-	public static final field Companion Lcom/lagradost/cloudstream3/MainAPI$Companion;
-	public fun <init> ()V
-	public fun extractorVerifierJob (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getCanBeOverridden ()Z
-	public fun getGetMainPageTimeoutMs ()Ljava/lang/Long;
-	public fun getHasChromecastSupport ()Z
-	public fun getHasDownloadSupport ()Z
-	public fun getHasMainPage ()Z
-	public fun getHasQuickSearch ()Z
-	public fun getInstantLinkLoading ()Z
-	public fun getLang ()Ljava/lang/String;
-	public final fun getLastHomepageRequest ()J
-	public fun getLoadLinksTimeoutMs ()Ljava/lang/Long;
-	public fun getLoadTimeoutMs ()Ljava/lang/Long;
-	public fun getLoadUrl (Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getMainPage ()Ljava/util/List;
-	public fun getMainPage (ILcom/lagradost/cloudstream3/MainPageRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getProviderType ()Lcom/lagradost/cloudstream3/ProviderType;
-	public fun getQuickSearchTimeoutMs ()Ljava/lang/Long;
-	public fun getSearchTimeoutMs ()Ljava/lang/Long;
-	public fun getSequentialMainPage ()Z
-	public fun getSequentialMainPageDelay ()J
-	public fun getSequentialMainPageScrollDelay ()J
-	public final fun getSourcePlugin ()Ljava/lang/String;
-	public fun getStoredCredentials ()Ljava/lang/String;
-	public fun getSupportedSyncNames ()Ljava/util/Set;
-	public fun getSupportedTypes ()Ljava/util/Set;
-	public fun getUsesWebView ()Z
-	public fun getVideoInterceptor (Lcom/lagradost/cloudstream3/utils/ExtractorLink;)Lokhttp3/Interceptor;
-	public fun getVpnStatus ()Lcom/lagradost/cloudstream3/VPNStatus;
-	public final fun init ()V
-	public fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun loadLinks (Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun overrideWithNewData (Lcom/lagradost/cloudstream3/ProvidersInfoJson;)V
-	public fun quickSearch (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun search (Ljava/lang/String;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun search (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setCanBeOverridden (Z)V
-	public fun setLang (Ljava/lang/String;)V
-	public final fun setLastHomepageRequest (J)V
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setSequentialMainPage (Z)V
-	public fun setSequentialMainPageDelay (J)V
-	public fun setSequentialMainPageScrollDelay (J)V
-	public final fun setSourcePlugin (Ljava/lang/String;)V
-	public fun setStoredCredentials (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/MainAPI$Companion {
-	public final fun getOverrideData ()Ljava/util/HashMap;
-	public final fun getSettingsForProvider ()Lcom/lagradost/cloudstream3/SettingsJson;
-	public final fun setOverrideData (Ljava/util/HashMap;)V
-	public final fun setSettingsForProvider (Lcom/lagradost/cloudstream3/SettingsJson;)V
-}
-
-public final class com/lagradost/cloudstream3/MainAPIKt {
-	public static final field AllLanguagesName Ljava/lang/String;
-	public static final field PROVIDER_STATUS_BETA_ONLY I
-	public static final field PROVIDER_STATUS_DOWN I
-	public static final field PROVIDER_STATUS_KEY Ljava/lang/String;
-	public static final field PROVIDER_STATUS_OK I
-	public static final field PROVIDER_STATUS_SLOW I
-	public static final field USER_AGENT Ljava/lang/String;
-	public static final fun addDate (Lcom/lagradost/cloudstream3/Episode;Ljava/lang/String;Ljava/lang/String;)V
-	public static final fun addDate (Lcom/lagradost/cloudstream3/Episode;Ljava/util/Date;)V
-	public static final fun addDate (Lcom/lagradost/cloudstream3/Episode;Lkotlin/time/Instant;)V
-	public static final fun addDate (Lcom/lagradost/cloudstream3/Episode;Lkotlinx/datetime/LocalDate;)V
-	public static synthetic fun addDate$default (Lcom/lagradost/cloudstream3/Episode;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
-	public static final fun addDub (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Ljava/lang/Integer;)V
-	public static final fun addDubStatus (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Lcom/lagradost/cloudstream3/DubStatus;Ljava/lang/Integer;)V
-	public static final fun addDubStatus (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Ljava/lang/String;Ljava/lang/Integer;)V
-	public static final fun addDubStatus (Lcom/lagradost/cloudstream3/AnimeSearchResponse;ZLjava/lang/Integer;)V
-	public static final fun addDubStatus (Lcom/lagradost/cloudstream3/AnimeSearchResponse;ZZLjava/lang/Integer;Ljava/lang/Integer;)V
-	public static synthetic fun addDubStatus$default (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Lcom/lagradost/cloudstream3/DubStatus;Ljava/lang/Integer;ILjava/lang/Object;)V
-	public static synthetic fun addDubStatus$default (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)V
-	public static synthetic fun addDubStatus$default (Lcom/lagradost/cloudstream3/AnimeSearchResponse;ZLjava/lang/Integer;ILjava/lang/Object;)V
-	public static synthetic fun addDubStatus$default (Lcom/lagradost/cloudstream3/AnimeSearchResponse;ZZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)V
-	public static final fun addEpisodes (Lcom/lagradost/cloudstream3/AnimeLoadResponse;Lcom/lagradost/cloudstream3/DubStatus;Ljava/util/List;)V
-	public static final fun addPoster (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;Ljava/util/Map;)V
-	public static final fun addPoster (Lcom/lagradost/cloudstream3/SearchResponse;Ljava/lang/String;Ljava/util/Map;)V
-	public static synthetic fun addPoster$default (Lcom/lagradost/cloudstream3/LoadResponse;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
-	public static synthetic fun addPoster$default (Lcom/lagradost/cloudstream3/SearchResponse;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
-	public static final fun addQuality (Lcom/lagradost/cloudstream3/SearchResponse;Ljava/lang/String;)V
-	public static final fun addSeasonNamesSeasonData (Lcom/lagradost/cloudstream3/EpisodeResponse;Ljava/util/List;)V
-	public static final fun addSeasonNamesString (Lcom/lagradost/cloudstream3/EpisodeResponse;Ljava/util/List;)V
-	public static final fun addSub (Lcom/lagradost/cloudstream3/AnimeSearchResponse;Ljava/lang/Integer;)V
-	public static final fun base64Decode (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun base64DecodeArray (Ljava/lang/String;)[B
-	public static final fun base64Encode ([B)Ljava/lang/String;
-	public static final fun capitalizeString (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun capitalizeStringNullable (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun fetchUrls (Ljava/lang/String;)Ljava/util/List;
-	public static final fun fixTitle (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun fixUrl (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;)Ljava/lang/String;
-	public static final fun fixUrlNull (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;)Ljava/lang/String;
-	public static final fun getDurationFromString (Ljava/lang/String;)Ljava/lang/Integer;
-	public static final fun getFolderPrefix (Lcom/lagradost/cloudstream3/TvType;)Ljava/lang/String;
-	public static final fun getJson ()Lkotlinx/serialization/json/Json;
-	public static final fun getMapper ()Lcom/fasterxml/jackson/databind/json/JsonMapper;
-	public static final fun getQualityFromString (Ljava/lang/String;)Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final fun getRhinoContext (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun imdbUrlToId (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun imdbUrlToIdNullable (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun isAnimeBased (Lcom/lagradost/cloudstream3/LoadResponse;)Z
-	public static final fun isAnimeOp (Lcom/lagradost/cloudstream3/TvType;)Z
-	public static final fun isAudioType (Lcom/lagradost/cloudstream3/TvType;)Z
-	public static final fun isEpisodeBased (Lcom/lagradost/cloudstream3/LoadResponse;)Z
-	public static final fun isEpisodeBased (Lcom/lagradost/cloudstream3/TvType;)Z
-	public static final fun isLiveStream (Lcom/lagradost/cloudstream3/TvType;)Z
-	public static final fun isMovieType (Lcom/lagradost/cloudstream3/TvType;)Z
-	public static final fun isUpcoming (Ljava/lang/String;)Z
-	public static final fun mainPage (Ljava/lang/String;Ljava/lang/String;Z)Lcom/lagradost/cloudstream3/MainPageData;
-	public static synthetic fun mainPage$default (Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/MainPageData;
-	public static final fun mainPageOf ([Lcom/lagradost/cloudstream3/MainPageData;)Ljava/util/List;
-	public static final fun mainPageOf ([Lkotlin/Pair;)Ljava/util/List;
-	public static final fun newAnimeLoadResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newAnimeLoadResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newAnimeSearchResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/AnimeSearchResponse;
-	public static synthetic fun newAnimeSearchResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/AnimeSearchResponse;
-	public static final fun newAudioFile (Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newAudioFile$default (Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newEpisode (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/Episode;
-	public static final fun newEpisode (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Z)Lcom/lagradost/cloudstream3/Episode;
-	public static synthetic fun newEpisode$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/Episode;
-	public static synthetic fun newEpisode$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/Episode;
-	public static final fun newHomePageResponse (Lcom/lagradost/cloudstream3/HomePageList;Ljava/lang/Boolean;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static final fun newHomePageResponse (Lcom/lagradost/cloudstream3/MainPageRequest;Ljava/util/List;Ljava/lang/Boolean;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static final fun newHomePageResponse (Ljava/lang/String;Ljava/util/List;Ljava/lang/Boolean;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static final fun newHomePageResponse (Ljava/util/List;Ljava/lang/Boolean;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static synthetic fun newHomePageResponse$default (Lcom/lagradost/cloudstream3/HomePageList;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static synthetic fun newHomePageResponse$default (Lcom/lagradost/cloudstream3/MainPageRequest;Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static synthetic fun newHomePageResponse$default (Ljava/lang/String;Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static synthetic fun newHomePageResponse$default (Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/HomePageResponse;
-	public static final fun newLiveSearchResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/LiveSearchResponse;
-	public static synthetic fun newLiveSearchResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/LiveSearchResponse;
-	public static final fun newLiveStreamLoadResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newLiveStreamLoadResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newMovieLoadResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun newMovieLoadResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newMovieLoadResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun newMovieLoadResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newMovieSearchResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/MovieSearchResponse;
-	public static synthetic fun newMovieSearchResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/MovieSearchResponse;
-	public static final fun newSearchResponseList (Ljava/util/List;Ljava/lang/Boolean;)Lcom/lagradost/cloudstream3/SearchResponseList;
-	public static synthetic fun newSearchResponseList$default (Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/SearchResponseList;
-	public static final fun newSubtitleFile (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newSubtitleFile$default (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newTorrentLoadResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newTorrentLoadResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newTorrentSearchResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/TorrentSearchResponse;
-	public static synthetic fun newTorrentSearchResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TorrentSearchResponse;
-	public static final fun newTvSeriesLoadResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newTvSeriesLoadResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newTvSeriesSearchResponse (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/TvSeriesSearchResponse;
-	public static synthetic fun newTvSeriesSearchResponse$default (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TvSeriesSearchResponse;
-	public static final fun sortUrls (Ljava/util/Set;)Ljava/util/List;
-	public static final fun toNewSearchResponseList (Ljava/util/List;Ljava/lang/Boolean;)Lcom/lagradost/cloudstream3/SearchResponseList;
-	public static synthetic fun toNewSearchResponseList$default (Ljava/util/List;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/SearchResponseList;
-	public static final fun toRatingInt (Ljava/lang/String;)Ljava/lang/Integer;
-	public static final fun updateUrl (Lcom/lagradost/cloudstream3/MainAPI;Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/MainActivityKt {
-	public static final fun getApp ()Lcom/lagradost/nicehttp/Requests;
-	public static final fun getInsecureApp ()Lcom/lagradost/nicehttp/Requests;
-	public static final fun setApp (Lcom/lagradost/nicehttp/Requests;)V
-	public static final fun setInsecureApp (Lcom/lagradost/nicehttp/Requests;)V
-}
-
-public final class com/lagradost/cloudstream3/MainPageData {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Z)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Z
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Z)Lcom/lagradost/cloudstream3/MainPageData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/MainPageData;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/MainPageData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Ljava/lang/String;
-	public final fun getHorizontalImages ()Z
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/MainPageRequest {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Z)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Z
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Z)Lcom/lagradost/cloudstream3/MainPageRequest;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/MainPageRequest;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/MainPageRequest;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Ljava/lang/String;
-	public final fun getHorizontalImages ()Z
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/MovieLoadResponse : com/lagradost/cloudstream3/LoadResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/util/List;
-	public final fun component11 ()Ljava/lang/Integer;
-	public final fun component12 ()Ljava/util/List;
-	public final fun component13 ()Ljava/util/List;
-	public final fun component14 ()Ljava/util/List;
-	public final fun component15 ()Z
-	public final fun component16 ()Ljava/util/Map;
-	public final fun component17 ()Ljava/util/Map;
-	public final fun component18 ()Ljava/lang/String;
-	public final fun component19 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component20 ()Ljava/lang/String;
-	public final fun component21 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/Integer;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/MovieLoadResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/MovieLoadResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/MovieLoadResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getActors ()Ljava/util/List;
-	public fun getApiName ()Ljava/lang/String;
-	public fun getBackgroundPosterUrl ()Ljava/lang/String;
-	public fun getComingSoon ()Z
-	public fun getContentRating ()Ljava/lang/String;
-	public final fun getDataUrl ()Ljava/lang/String;
-	public fun getDuration ()Ljava/lang/Integer;
-	public fun getLogoUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getPlot ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getRating ()Ljava/lang/Integer;
-	public fun getRecommendations ()Ljava/util/List;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getSyncData ()Ljava/util/Map;
-	public fun getTags ()Ljava/util/List;
-	public fun getTrailers ()Ljava/util/List;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUniqueUrl ()Ljava/lang/String;
-	public fun getUrl ()Ljava/lang/String;
-	public fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun setActors (Ljava/util/List;)V
-	public fun setApiName (Ljava/lang/String;)V
-	public fun setBackgroundPosterUrl (Ljava/lang/String;)V
-	public fun setComingSoon (Z)V
-	public fun setContentRating (Ljava/lang/String;)V
-	public final fun setDataUrl (Ljava/lang/String;)V
-	public fun setDuration (Ljava/lang/Integer;)V
-	public fun setLogoUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setPlot (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setRating (Ljava/lang/Integer;)V
-	public fun setRecommendations (Ljava/util/List;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setSyncData (Ljava/util/Map;)V
-	public fun setTags (Ljava/util/List;)V
-	public fun setTrailers (Ljava/util/List;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun setUniqueUrl (Ljava/lang/String;)V
-	public fun setUrl (Ljava/lang/String;)V
-	public fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/MovieSearchResponse : com/lagradost/cloudstream3/SearchResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Ljava/lang/Integer;
-	public final fun component8 ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public final fun component9 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)Lcom/lagradost/cloudstream3/MovieSearchResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/MovieSearchResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/MovieSearchResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getApiName ()Ljava/lang/String;
-	public fun getId ()Ljava/lang/Integer;
-	public fun getName ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getQuality ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUrl ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun setId (Ljava/lang/Integer;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setQuality (Lcom/lagradost/cloudstream3/SearchQuality;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public final fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/NextAiring {
-	public fun <init> (IJLjava/lang/Integer;)V
-	public synthetic fun <init> (IJLjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()I
-	public final fun component2 ()J
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun copy (IJLjava/lang/Integer;)Lcom/lagradost/cloudstream3/NextAiring;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/NextAiring;IJLjava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/NextAiring;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEpisode ()I
-	public final fun getSeason ()Ljava/lang/Integer;
-	public final fun getUnixTime ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/ParCollectionsKt {
-	public static final fun amap (Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun amap (Ljava/util/Map;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun amapIndexed (Ljava/util/List;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun apmap (Ljava/util/List;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
-	public static final fun apmap (Ljava/util/Map;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
-	public static final fun apmapIndexed (Ljava/util/List;Lkotlin/jvm/functions/Function3;)Ljava/util/List;
-	public static final fun argamap ([Lkotlin/jvm/functions/Function1;)Ljava/util/List;
-	public static final fun runAllAsync ([Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface annotation class com/lagradost/cloudstream3/Prerelease : java/lang/annotation/Annotation {
-}
-
-public final class com/lagradost/cloudstream3/ProviderType : java/lang/Enum {
-	public static final field DirectProvider Lcom/lagradost/cloudstream3/ProviderType;
-	public static final field MetaProvider Lcom/lagradost/cloudstream3/ProviderType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/ProviderType;
-	public static fun values ()[Lcom/lagradost/cloudstream3/ProviderType;
-}
-
-public final class com/lagradost/cloudstream3/ProvidersInfoJson {
-	public static final field Companion Lcom/lagradost/cloudstream3/ProvidersInfoJson$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()I
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lcom/lagradost/cloudstream3/ProvidersInfoJson;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/ProvidersInfoJson;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IILjava/lang/Object;)Lcom/lagradost/cloudstream3/ProvidersInfoJson;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCredentials ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getStatus ()I
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun setCredentials (Ljava/lang/String;)V
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setStatus (I)V
-	public final fun setUrl (Ljava/lang/String;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/ProvidersInfoJson$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/ProvidersInfoJson$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/ProvidersInfoJson;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/ProvidersInfoJson;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/ProvidersInfoJson$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/Score {
-	public static final field Companion Lcom/lagradost/cloudstream3/Score$Companion;
-	public static final field MAX I
-	public static final field MAX_ZEROS I
-	public static final field MIN I
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public final fun toByte (I)B
-	public final fun toDouble (I)D
-	public static synthetic fun toDouble$default (Lcom/lagradost/cloudstream3/Score;IILjava/lang/Object;)D
-	public final fun toFloat (I)F
-	public static synthetic fun toFloat$default (Lcom/lagradost/cloudstream3/Score;IILjava/lang/Object;)F
-	public final fun toInt (I)I
-	public static synthetic fun toInt$default (Lcom/lagradost/cloudstream3/Score;IILjava/lang/Object;)I
-	public final fun toLong (I)J
-	public static synthetic fun toLong$default (Lcom/lagradost/cloudstream3/Score;IILjava/lang/Object;)J
-	public final fun toOld ()I
-	public fun toString ()Ljava/lang/String;
-	public final fun toString (IIZC)Ljava/lang/String;
-	public static synthetic fun toString$default (Lcom/lagradost/cloudstream3/Score;IIZCILjava/lang/Object;)Ljava/lang/String;
-	public final fun toStringNull (DIIZC)Ljava/lang/String;
-	public static synthetic fun toStringNull$default (Lcom/lagradost/cloudstream3/Score;DIIZCILjava/lang/Object;)Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/Score$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/Score$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/Score;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/Score;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/Score$Companion {
-	public final fun from (Ljava/lang/Double;I)Lcom/lagradost/cloudstream3/Score;
-	public final fun from (Ljava/lang/Float;I)Lcom/lagradost/cloudstream3/Score;
-	public final fun from (Ljava/lang/Integer;I)Lcom/lagradost/cloudstream3/Score;
-	public final fun from (Ljava/lang/String;I)Lcom/lagradost/cloudstream3/Score;
-	public final fun from10 (Ljava/lang/Double;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from10 (Ljava/lang/Float;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from10 (Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from10 (Ljava/lang/String;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from100 (Ljava/lang/Double;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from100 (Ljava/lang/Float;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from100 (Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from100 (Ljava/lang/String;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from5 (Ljava/lang/Double;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from5 (Ljava/lang/Float;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from5 (Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/Score;
-	public final fun from5 (Ljava/lang/String;)Lcom/lagradost/cloudstream3/Score;
-	public final fun fromOld (Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/Score;
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/SearchQuality : java/lang/Enum {
-	public static final field BlueRay Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field Cam Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field CamRip Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field DVD Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field FourK Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field HD Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field HDR Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field HQ Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field HdCam Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field SD Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field SDR Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field Telecine Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field Telesync Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field UHD Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field WebRip Lcom/lagradost/cloudstream3/SearchQuality;
-	public static final field WorkPrint Lcom/lagradost/cloudstream3/SearchQuality;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/SearchQuality;
-	public static fun values ()[Lcom/lagradost/cloudstream3/SearchQuality;
-}
-
-public abstract interface class com/lagradost/cloudstream3/SearchResponse {
-	public abstract fun getApiName ()Ljava/lang/String;
-	public abstract fun getId ()Ljava/lang/Integer;
-	public abstract fun getName ()Ljava/lang/String;
-	public abstract fun getPosterHeaders ()Ljava/util/Map;
-	public abstract fun getPosterUrl ()Ljava/lang/String;
-	public abstract fun getQuality ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public abstract fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public abstract fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public abstract fun getUrl ()Ljava/lang/String;
-	public abstract fun setId (Ljava/lang/Integer;)V
-	public abstract fun setPosterHeaders (Ljava/util/Map;)V
-	public abstract fun setPosterUrl (Ljava/lang/String;)V
-	public abstract fun setQuality (Lcom/lagradost/cloudstream3/SearchQuality;)V
-	public abstract fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public abstract fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-}
-
-public final class com/lagradost/cloudstream3/SearchResponseList {
-	public fun <init> (Ljava/util/List;Z)V
-	public synthetic fun <init> (Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Z
-	public final fun copy (Ljava/util/List;Z)Lcom/lagradost/cloudstream3/SearchResponseList;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/SearchResponseList;Ljava/util/List;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/SearchResponseList;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHasNext ()Z
-	public final fun getItems ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/SeasonData {
-	public static final field Companion Lcom/lagradost/cloudstream3/SeasonData$Companion;
-	public fun <init> (ILjava/lang/String;Ljava/lang/Integer;)V
-	public synthetic fun <init> (ILjava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()I
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun copy (ILjava/lang/String;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/SeasonData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/SeasonData;ILjava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/SeasonData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDisplaySeason ()Ljava/lang/Integer;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getSeason ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/SeasonData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/SeasonData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/SeasonData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/SeasonData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/SeasonData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/SettingsJson {
-	public static final field Companion Lcom/lagradost/cloudstream3/SettingsJson$Companion;
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/lagradost/cloudstream3/SettingsJson;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/SettingsJson;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/SettingsJson;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEnableAdult ()Z
-	public fun hashCode ()I
-	public final fun setEnableAdult (Z)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/SettingsJson$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/SettingsJson$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/SettingsJson;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/SettingsJson;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/SettingsJson$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/ShowStatus : java/lang/Enum {
-	public static final field Completed Lcom/lagradost/cloudstream3/ShowStatus;
-	public static final field Ongoing Lcom/lagradost/cloudstream3/ShowStatus;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/ShowStatus;
-	public static fun values ()[Lcom/lagradost/cloudstream3/ShowStatus;
-}
-
-public final class com/lagradost/cloudstream3/SimklSyncServices : java/lang/Enum {
-	public static final field AniList Lcom/lagradost/cloudstream3/SimklSyncServices;
-	public static final field Imdb Lcom/lagradost/cloudstream3/SimklSyncServices;
-	public static final field Mal Lcom/lagradost/cloudstream3/SimklSyncServices;
-	public static final field Simkl Lcom/lagradost/cloudstream3/SimklSyncServices;
-	public static final field Tmdb Lcom/lagradost/cloudstream3/SimklSyncServices;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getOriginalName ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/SimklSyncServices;
-	public static fun values ()[Lcom/lagradost/cloudstream3/SimklSyncServices;
-}
-
-public final class com/lagradost/cloudstream3/SubtitleFile {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/SubtitleFile;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/SubtitleFile;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/SubtitleFile;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getLang ()Ljava/lang/String;
-	public final fun getLangTag ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun setHeaders (Ljava/util/Map;)V
-	public final fun setLang (Ljava/lang/String;)V
-	public final fun setUrl (Ljava/lang/String;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/TorrentLoadResponse : com/lagradost/cloudstream3/LoadResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component11 ()Ljava/util/List;
-	public final fun component12 ()Ljava/lang/Integer;
-	public final fun component13 ()Ljava/util/List;
-	public final fun component14 ()Ljava/util/List;
-	public final fun component15 ()Ljava/util/List;
-	public final fun component16 ()Z
-	public final fun component17 ()Ljava/util/Map;
-	public final fun component18 ()Ljava/util/Map;
-	public final fun component19 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component20 ()Ljava/lang/String;
-	public final fun component21 ()Ljava/lang/String;
-	public final fun component22 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/TorrentLoadResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/TorrentLoadResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TorrentLoadResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getActors ()Ljava/util/List;
-	public fun getApiName ()Ljava/lang/String;
-	public fun getBackgroundPosterUrl ()Ljava/lang/String;
-	public fun getComingSoon ()Z
-	public fun getContentRating ()Ljava/lang/String;
-	public fun getDuration ()Ljava/lang/Integer;
-	public fun getLogoUrl ()Ljava/lang/String;
-	public final fun getMagnet ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getPlot ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getRating ()Ljava/lang/Integer;
-	public fun getRecommendations ()Ljava/util/List;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getSyncData ()Ljava/util/Map;
-	public fun getTags ()Ljava/util/List;
-	public final fun getTorrent ()Ljava/lang/String;
-	public fun getTrailers ()Ljava/util/List;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUniqueUrl ()Ljava/lang/String;
-	public fun getUrl ()Ljava/lang/String;
-	public fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun setActors (Ljava/util/List;)V
-	public fun setApiName (Ljava/lang/String;)V
-	public fun setBackgroundPosterUrl (Ljava/lang/String;)V
-	public fun setComingSoon (Z)V
-	public fun setContentRating (Ljava/lang/String;)V
-	public fun setDuration (Ljava/lang/Integer;)V
-	public fun setLogoUrl (Ljava/lang/String;)V
-	public final fun setMagnet (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setPlot (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setRating (Ljava/lang/Integer;)V
-	public fun setRecommendations (Ljava/util/List;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setSyncData (Ljava/util/Map;)V
-	public fun setTags (Ljava/util/List;)V
-	public final fun setTorrent (Ljava/lang/String;)V
-	public fun setTrailers (Ljava/util/List;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun setUniqueUrl (Ljava/lang/String;)V
-	public fun setUrl (Ljava/lang/String;)V
-	public fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/TorrentSearchResponse : com/lagradost/cloudstream3/SearchResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public final fun component8 ()Ljava/util/Map;
-	public final fun component9 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)Lcom/lagradost/cloudstream3/TorrentSearchResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/TorrentSearchResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TorrentSearchResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getApiName ()Ljava/lang/String;
-	public fun getId ()Ljava/lang/Integer;
-	public fun getName ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getQuality ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun setId (Ljava/lang/Integer;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setQuality (Lcom/lagradost/cloudstream3/SearchQuality;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/Tracker {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/Tracker;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/Tracker;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/Tracker;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAniId ()Ljava/lang/String;
-	public final fun getCover ()Ljava/lang/String;
-	public final fun getImage ()Ljava/lang/String;
-	public final fun getKitsuId ()Ljava/lang/String;
-	public final fun getMalId ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/TrackerType : java/lang/Enum {
-	public static final field Companion Lcom/lagradost/cloudstream3/TrackerType$Companion;
-	public static final field MOVIE Lcom/lagradost/cloudstream3/TrackerType;
-	public static final field MUSIC Lcom/lagradost/cloudstream3/TrackerType;
-	public static final field ONA Lcom/lagradost/cloudstream3/TrackerType;
-	public static final field OVA Lcom/lagradost/cloudstream3/TrackerType;
-	public static final field SPECIAL Lcom/lagradost/cloudstream3/TrackerType;
-	public static final field TV Lcom/lagradost/cloudstream3/TrackerType;
-	public static final field TV_SHORT Lcom/lagradost/cloudstream3/TrackerType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/TrackerType;
-	public static fun values ()[Lcom/lagradost/cloudstream3/TrackerType;
-}
-
-public final class com/lagradost/cloudstream3/TrackerType$Companion {
-	public final fun getTypes (Lcom/lagradost/cloudstream3/TvType;)Ljava/util/Set;
-}
-
-public final class com/lagradost/cloudstream3/TrailerData {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Z
-	public final fun component4 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map;)Lcom/lagradost/cloudstream3/TrailerData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/TrailerData;Ljava/lang/String;Ljava/lang/String;ZLjava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TrailerData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getExtractorUrl ()Ljava/lang/String;
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getRaw ()Z
-	public final fun getReferer ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/TvSeriesLoadResponse : com/lagradost/cloudstream3/EpisodeResponse, com/lagradost/cloudstream3/LoadResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/ShowStatus;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/ShowStatus;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component11 ()Ljava/util/List;
-	public final fun component12 ()Ljava/lang/Integer;
-	public final fun component13 ()Ljava/util/List;
-	public final fun component14 ()Ljava/util/List;
-	public final fun component15 ()Ljava/util/List;
-	public final fun component16 ()Z
-	public final fun component17 ()Ljava/util/Map;
-	public final fun component18 ()Ljava/util/Map;
-	public final fun component19 ()Lcom/lagradost/cloudstream3/NextAiring;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component20 ()Ljava/util/List;
-	public final fun component21 ()Ljava/lang/String;
-	public final fun component22 ()Ljava/lang/String;
-	public final fun component23 ()Ljava/lang/String;
-	public final fun component24 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/util/List;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/Integer;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Lcom/lagradost/cloudstream3/ShowStatus;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/ShowStatus;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/TvSeriesLoadResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/TvSeriesLoadResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/ShowStatus;Lcom/lagradost/cloudstream3/Score;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;Ljava/util/Map;Lcom/lagradost/cloudstream3/NextAiring;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TvSeriesLoadResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getActors ()Ljava/util/List;
-	public fun getApiName ()Ljava/lang/String;
-	public fun getBackgroundPosterUrl ()Ljava/lang/String;
-	public fun getComingSoon ()Z
-	public fun getContentRating ()Ljava/lang/String;
-	public fun getDuration ()Ljava/lang/Integer;
-	public final fun getEpisodes ()Ljava/util/List;
-	public fun getLatestEpisodes ()Ljava/util/Map;
-	public fun getLogoUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getNextAiring ()Lcom/lagradost/cloudstream3/NextAiring;
-	public fun getPlot ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getRating ()Ljava/lang/Integer;
-	public fun getRecommendations ()Ljava/util/List;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getSeasonNames ()Ljava/util/List;
-	public fun getShowStatus ()Lcom/lagradost/cloudstream3/ShowStatus;
-	public fun getSyncData ()Ljava/util/Map;
-	public fun getTags ()Ljava/util/List;
-	public fun getTotalEpisodeIndex (II)I
-	public fun getTrailers ()Ljava/util/List;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUniqueUrl ()Ljava/lang/String;
-	public fun getUrl ()Ljava/lang/String;
-	public fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun setActors (Ljava/util/List;)V
-	public fun setApiName (Ljava/lang/String;)V
-	public fun setBackgroundPosterUrl (Ljava/lang/String;)V
-	public fun setComingSoon (Z)V
-	public fun setContentRating (Ljava/lang/String;)V
-	public fun setDuration (Ljava/lang/Integer;)V
-	public final fun setEpisodes (Ljava/util/List;)V
-	public fun setLogoUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setNextAiring (Lcom/lagradost/cloudstream3/NextAiring;)V
-	public fun setPlot (Ljava/lang/String;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setRating (Ljava/lang/Integer;)V
-	public fun setRecommendations (Ljava/util/List;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setSeasonNames (Ljava/util/List;)V
-	public fun setShowStatus (Lcom/lagradost/cloudstream3/ShowStatus;)V
-	public fun setSyncData (Ljava/util/Map;)V
-	public fun setTags (Ljava/util/List;)V
-	public fun setTrailers (Ljava/util/List;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public fun setUniqueUrl (Ljava/lang/String;)V
-	public fun setUrl (Ljava/lang/String;)V
-	public fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/TvSeriesSearchResponse : com/lagradost/cloudstream3/SearchResponse {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/util/Map;
-	public final fun component11 ()Lcom/lagradost/cloudstream3/Score;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Ljava/lang/Integer;
-	public final fun component8 ()Ljava/lang/Integer;
-	public final fun component9 ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;)Lcom/lagradost/cloudstream3/TvSeriesSearchResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/TvSeriesSearchResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/TvType;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/SearchQuality;Ljava/util/Map;Lcom/lagradost/cloudstream3/Score;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/TvSeriesSearchResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getApiName ()Ljava/lang/String;
-	public final fun getEpisodes ()Ljava/lang/Integer;
-	public fun getId ()Ljava/lang/Integer;
-	public fun getName ()Ljava/lang/String;
-	public fun getPosterHeaders ()Ljava/util/Map;
-	public fun getPosterUrl ()Ljava/lang/String;
-	public fun getQuality ()Lcom/lagradost/cloudstream3/SearchQuality;
-	public fun getScore ()Lcom/lagradost/cloudstream3/Score;
-	public fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun getUrl ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public final fun setEpisodes (Ljava/lang/Integer;)V
-	public fun setId (Ljava/lang/Integer;)V
-	public fun setPosterHeaders (Ljava/util/Map;)V
-	public fun setPosterUrl (Ljava/lang/String;)V
-	public fun setQuality (Lcom/lagradost/cloudstream3/SearchQuality;)V
-	public fun setScore (Lcom/lagradost/cloudstream3/Score;)V
-	public fun setType (Lcom/lagradost/cloudstream3/TvType;)V
-	public final fun setYear (Ljava/lang/Integer;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/TvType : java/lang/Enum {
-	public static final field Anime Lcom/lagradost/cloudstream3/TvType;
-	public static final field AnimeMovie Lcom/lagradost/cloudstream3/TvType;
-	public static final field AsianDrama Lcom/lagradost/cloudstream3/TvType;
-	public static final field Audio Lcom/lagradost/cloudstream3/TvType;
-	public static final field AudioBook Lcom/lagradost/cloudstream3/TvType;
-	public static final field Cartoon Lcom/lagradost/cloudstream3/TvType;
-	public static final field CustomMedia Lcom/lagradost/cloudstream3/TvType;
-	public static final field Documentary Lcom/lagradost/cloudstream3/TvType;
-	public static final field Live Lcom/lagradost/cloudstream3/TvType;
-	public static final field Movie Lcom/lagradost/cloudstream3/TvType;
-	public static final field Music Lcom/lagradost/cloudstream3/TvType;
-	public static final field NSFW Lcom/lagradost/cloudstream3/TvType;
-	public static final field OVA Lcom/lagradost/cloudstream3/TvType;
-	public static final field Others Lcom/lagradost/cloudstream3/TvType;
-	public static final field Podcast Lcom/lagradost/cloudstream3/TvType;
-	public static final field Torrent Lcom/lagradost/cloudstream3/TvType;
-	public static final field TvSeries Lcom/lagradost/cloudstream3/TvType;
-	public static final field Video Lcom/lagradost/cloudstream3/TvType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/TvType;
-	public static fun values ()[Lcom/lagradost/cloudstream3/TvType;
-}
-
-public abstract interface annotation class com/lagradost/cloudstream3/UnsafeSSL : java/lang/annotation/Annotation {
-}
-
-public final class com/lagradost/cloudstream3/VPNStatus : java/lang/Enum {
-	public static final field MightBeNeeded Lcom/lagradost/cloudstream3/VPNStatus;
-	public static final field None Lcom/lagradost/cloudstream3/VPNStatus;
-	public static final field Torrent Lcom/lagradost/cloudstream3/VPNStatus;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/VPNStatus;
-	public static fun values ()[Lcom/lagradost/cloudstream3/VPNStatus;
-}
-
-public class com/lagradost/cloudstream3/extractors/Acefile : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Acefile$Source {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Acefile$Source$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Acefile$Source;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Acefile$Source;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Acefile$Source;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Acefile$Source$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Acefile$Source$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Acefile$Source;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Acefile$Source;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Acefile$Source$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/AesHelper {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/AesHelper;
-	public final fun decryptAES (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ahvsh : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Aico : com/lagradost/cloudstream3/extractors/Hxfile {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Asnwish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Auvexiug : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Awish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/BgwpCC : com/lagradost/cloudstream3/extractors/BigwarpIO {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/BigwarpArt : com/lagradost/cloudstream3/extractors/BigwarpIO {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/BigwarpIO : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Blogger : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/ByseBuho : com/lagradost/cloudstream3/extractors/ByseSX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/ByseQekaho : com/lagradost/cloudstream3/extractors/ByseSX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/ByseSX : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/ByseVepoin : com/lagradost/cloudstream3/extractors/ByseSX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Bysezejataos : com/lagradost/cloudstream3/extractors/ByseSX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Cavanhabg : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Cda : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Cda$PlayerData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;)Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData;Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getVideo ()Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Cda$PlayerData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Cda$PlayerData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Cda$PlayerData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Cda$VideoPlayerData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/Map;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getHash2 ()Ljava/lang/String;
-	public final fun getQualities ()Ljava/util/Map;
-	public final fun getQuality ()Ljava/lang/String;
-	public final fun getTs ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Cda$VideoPlayerData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Cda$VideoPlayerData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Cda$VideoPlayerData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Cdnplayer : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/CdnwishCom : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public abstract class com/lagradost/cloudstream3/extractors/CineMMRedirect : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/CloudMailRu : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/ContentX : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/CsstOnline : com/lagradost/cloudstream3/extractors/SecvideoOnline {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/D0000d : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/D000dCom : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DBfilm : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Dailymotion : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$Metadata {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata$Companion;
-	public fun <init> (Ljava/util/Map;Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;)V
-	public final fun component1 ()Ljava/util/Map;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;
-	public final fun copy (Ljava/util/Map;Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata;Ljava/util/Map;Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getQualities ()Ljava/util/Map;
-	public final fun getSubtitles ()Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Dailymotion$Metadata$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Dailymotion$Metadata;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$Metadata$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$Quality {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getType ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Dailymotion$Quality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Dailymotion$Quality;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$Quality$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/util/List;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getUrls ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$SubtitleData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper$Companion;
-	public fun <init> (ZLjava/util/Map;)V
-	public final fun component1 ()Z
-	public final fun component2 ()Ljava/util/Map;
-	public final fun copy (ZLjava/util/Map;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;ZLjava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Ljava/util/Map;
-	public final fun getEnable ()Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dailymotion$SubtitlesWrapper$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DatabaseGdrive : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DatabaseGdrive2 : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DecryptKeys {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/DecryptKeys$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/DecryptKeys;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/DecryptKeys;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/DecryptKeys;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEdge1 ()Ljava/lang/String;
-	public final fun getEdge2 ()Ljava/lang/String;
-	public final fun getLegacyFallback ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/DecryptKeys$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/DecryptKeys$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/DecryptKeys;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/DecryptKeys;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DecryptKeys$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DesuArcg : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DesuDrive : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DesuOdchan : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DesuOdvip : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DetailsRoot {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/DetailsRoot$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
-	public final fun component1 ()J
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Z
-	public final fun component8 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lcom/lagradost/cloudstream3/extractors/DetailsRoot;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/DetailsRoot;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/DetailsRoot;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCode ()Ljava/lang/String;
-	public final fun getCreatedAt ()Ljava/lang/String;
-	public final fun getDescription ()Ljava/lang/String;
-	public final fun getEmbedFrameUrl ()Ljava/lang/String;
-	public final fun getId ()J
-	public final fun getOwnerPrivate ()Z
-	public final fun getPosterUrl ()Ljava/lang/String;
-	public final fun getTitle ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/DetailsRoot$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/DetailsRoot$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/DetailsRoot;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/DetailsRoot;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DetailsRoot$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dhcplay : com/lagradost/cloudstream3/extractors/CineMMRedirect {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dhtpre : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dokicloud : com/lagradost/cloudstream3/extractors/Rabbitstream {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodCxExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/DoodLaExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodLiExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodPmExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodShExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodSoExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodToExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodWatchExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodWfExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodWsExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodYtExtractor : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Doodporn : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Doodspro : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DoodstreamCom : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dooood : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ds2play : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ds2video : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/DsstOnline : com/lagradost/cloudstream3/extractors/SecvideoOnline {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dsvplay : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dumbalag : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Dwish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Embedgram : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/EmturbovidExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Evoload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Evoload1 : com/lagradost/cloudstream3/extractors/Evoload {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ewish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/FEmbed : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/FEnet : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Fastream : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/FeHD : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getDomainUrl ()Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Fembed9hd : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/FileMoon : com/lagradost/cloudstream3/extractors/FilemoonV2 {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/FileMoonIn : com/lagradost/cloudstream3/extractors/FilemoonV2 {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/FileMoonSx : com/lagradost/cloudstream3/extractors/FilemoonV2 {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Filegram : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/FilemoonV2 : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Filesim : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Firestream : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getExtractorUrl (Ljava/lang/String;)Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/FlaswishCom : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Flyfile : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getApiUrl ()Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/FourCX : com/lagradost/cloudstream3/extractors/ContentX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/FourPichive : com/lagradost/cloudstream3/extractors/ContentX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/FourPlayRu : com/lagradost/cloudstream3/extractors/ContentX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Fplayer : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/FsstOnline : com/lagradost/cloudstream3/extractors/SecvideoOnline {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/GDMirrorbot : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/GUpload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/GamoVideo : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Gdriveplayer : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getKind ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayer$Tracks$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerapi : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerapp : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerbiz : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerco : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerfun : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerio : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerme : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerorg : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gdriveplayerus : com/lagradost/cloudstream3/extractors/Gdriveplayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/GenericM3U8 : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Geodailymotion : com/lagradost/cloudstream3/extractors/Dailymotion {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Gofile : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$AccountData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getToken ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Gofile$AccountData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$AccountData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$AccountResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;)Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse;Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Lcom/lagradost/cloudstream3/extractors/Gofile$AccountData;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Gofile$AccountResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Gofile$AccountResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$AccountResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$GofileData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/Map;
-	public final fun copy (Ljava/util/Map;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;Ljava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getChildren ()Ljava/util/Map;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Gofile$GofileData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$GofileData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$GofileFile {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/Long;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getLink ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getSize ()Ljava/lang/Long;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Gofile$GofileFile$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Gofile$GofileFile;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$GofileFile$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$GofileResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse;Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Lcom/lagradost/cloudstream3/extractors/Gofile$GofileData;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Gofile$GofileResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Gofile$GofileResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Gofile$GofileResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/GoodstreamExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Guccihide : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Guxhag : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/HDMomPlayer : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HDMomPlayer$Track {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDefault ()Ljava/lang/String;
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getKind ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getLanguage ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/HDMomPlayer$Track$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/HDMomPlayer$Track;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HDMomPlayer$Track$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/HDPlayerSystem : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHls ()Ljava/lang/String;
-	public final fun getSecuredLink ()Ljava/lang/String;
-	public final fun getVideoImage ()Ljava/lang/String;
-	public final fun getVideoSource ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HDPlayerSystem$SystemResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HDStreamAble : com/lagradost/cloudstream3/extractors/PeaceMakerst {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Habetar : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Haxloppd : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Hgcloudto : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HglinkTo : com/lagradost/cloudstream3/extractors/CineMMRedirect {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HgplayCDN : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/HlsWish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Hotlinger : com/lagradost/cloudstream3/extractors/ContentX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/HubCloud : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public final fun cleanTitle (Ljava/lang/String;)Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Hxfile : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRedirect ()Z
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/InternetArchive : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/InternetArchive$Companion;
-	public fun <init> ()V
-	public fun getExtractorUrl (Ljava/lang/String;)Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/InternetArchive$Companion {
-}
-
-public class com/lagradost/cloudstream3/extractors/JWPlayer : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Jeniusplay : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource$Companion;
-	public fun <init> (ZLjava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Z
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (ZLjava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource;ZLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHls ()Z
-	public final fun getSecuredLink ()Ljava/lang/String;
-	public final fun getVideoSource ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Jeniusplay$ResponseSource$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Jodwish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Keephealth : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/KotakAnimeid : com/lagradost/cloudstream3/extractors/Hxfile {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-}
-
-public final class com/lagradost/cloudstream3/extractors/Kotakajair : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Krakenfiles : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Kswplayer : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/LayarKaca : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Linkbox : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$Data {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Linkbox$Data$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;Ljava/lang/String;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getItemId ()Ljava/lang/String;
-	public final fun getItemInfo ()Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Linkbox$Data$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Linkbox$Data$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$Data$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$ItemInfo {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/ArrayList;)V
-	public synthetic fun <init> (Ljava/util/ArrayList;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/ArrayList;
-	public final fun copy (Ljava/util/ArrayList;)Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;Ljava/util/ArrayList;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResolutionList ()Ljava/util/ArrayList;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Linkbox$ItemInfo$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Linkbox$ItemInfo;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$ItemInfo$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$Resolutions {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResolution ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Linkbox$Resolutions$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Linkbox$Resolutions;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$Resolutions$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$Responses {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses;Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Lcom/lagradost/cloudstream3/extractors/Linkbox$Data;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Linkbox$Responses$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Linkbox$Responses;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Linkbox$Responses$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/LuluStream : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Lulustream1 : com/lagradost/cloudstream3/extractors/LuluStream {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Lulustream2 : com/lagradost/cloudstream3/extractors/LuluStream {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Luluvdoo : com/lagradost/cloudstream3/extractors/LuluStream {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Luxubu : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Lvturbo : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/M3u8Manifest {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/M3u8Manifest;
-	public final fun extractLinks (Ljava/lang/String;)Ljava/util/ArrayList;
-}
-
-public class com/lagradost/cloudstream3/extractors/MailRu : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/MailRu$MailRuData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/util/List;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getProvider ()Ljava/lang/String;
-	public final fun getVideos ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/MailRu$MailRuData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/MailRu$MailRuData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getKey ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/MailRu$MailRuVideoData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/Maxstream : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Mdy : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Mediafire : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Megacloud : com/lagradost/cloudstream3/extractors/Rabbitstream {
-	public fun <init> ()V
-	public fun extractRealKey (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getEmbed ()Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Meownime : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/MetaGnathTuggers : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/MixDrop : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getExtractorUrl (Ljava/lang/String;)Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MixDropAg : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MixDropBz : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MixDropCh : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MixDropPs : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MixDropSi : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MixDropTo : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Movhide : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Moviehab : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MoviehabNet : com/lagradost/cloudstream3/extractors/Moviehab {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Moviesm4u : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Mp4Upload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Multimovies : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Multimoviesshg : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Mvidoo : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Mwish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/MxDropTo : com/lagradost/cloudstream3/extractors/MixDrop {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/MyVidPlay : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/NathanFromSubject : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Nekostream : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Nekowish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Neonime7n : com/lagradost/cloudstream3/extractors/Hxfile {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRedirect ()Z
-}
-
-public final class com/lagradost/cloudstream3/extractors/Neonime8n : com/lagradost/cloudstream3/extractors/Hxfile {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRedirect ()Z
-}
-
-public final class com/lagradost/cloudstream3/extractors/Obeywish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Odnoklassniki : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getName ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Odnoklassniki$OkRuVideo$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/OkRuHTTP : com/lagradost/cloudstream3/extractors/Odnoklassniki {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/OkRuHTTPMobile : com/lagradost/cloudstream3/extractors/OkRuHTTP {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/OkRuSSL : com/lagradost/cloudstream3/extractors/Odnoklassniki {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/OkRuSSLMobile : com/lagradost/cloudstream3/extractors/OkRuSSL {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/PeaceMakerst : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getSourceIndex ()Ljava/lang/String;
-	public final fun getSourceList ()Ljava/util/Map;
-	public final fun getVideoImage ()Ljava/lang/String;
-	public final fun getVideoSources ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$PeaceResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMedia ()Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2ApiResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getSecurePath ()Ljava/lang/String;
-	public final fun getServiceUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getLink ()Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Link;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$Teve2Media$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PeaceMakerst$VideoSource$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Peytonepre : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Pichive : com/lagradost/cloudstream3/extractors/ContentX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/PixelDrain : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PixelDrainDev : com/lagradost/cloudstream3/extractors/PixelDrain {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/PlayLtXyz : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlayRu : com/lagradost/cloudstream3/extractors/ContentX {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Playback {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Playback$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/extractors/DecryptKeys;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/util/List;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Lcom/lagradost/cloudstream3/extractors/DecryptKeys;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/extractors/DecryptKeys;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Playback;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Playback;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/extractors/DecryptKeys;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Playback;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlgorithm ()Ljava/lang/String;
-	public final fun getDecryptKeys ()Lcom/lagradost/cloudstream3/extractors/DecryptKeys;
-	public final fun getExpiresAt ()Ljava/lang/String;
-	public final fun getIv ()Ljava/lang/String;
-	public final fun getIv2 ()Ljava/lang/String;
-	public final fun getKeyParts ()Ljava/util/List;
-	public final fun getPayload ()Ljava/lang/String;
-	public final fun getPayload2 ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Playback$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Playback$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Playback;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Playback;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Playback$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlaybackDecrypt {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt$Companion;
-	public fun <init> (Ljava/util/List;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getSources ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PlaybackDecrypt$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PlaybackDecrypt;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlaybackDecrypt$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlaybackDecryptSource {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Integer;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()J
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Integer;)Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getBitrateKbps ()J
-	public final fun getHeight ()Ljava/lang/Integer;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getMimeType ()Ljava/lang/String;
-	public final fun getQuality ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PlaybackDecryptSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PlaybackDecryptSource;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlaybackDecryptSource$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlaybackRoot {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/PlaybackRoot$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/Playback;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/Playback;
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/Playback;)Lcom/lagradost/cloudstream3/extractors/PlaybackRoot;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/PlaybackRoot;Lcom/lagradost/cloudstream3/extractors/Playback;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/PlaybackRoot;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getPlayback ()Lcom/lagradost/cloudstream3/extractors/Playback;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/PlaybackRoot$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/PlaybackRoot$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/PlaybackRoot;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/PlaybackRoot;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/PlaybackRoot$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/PlayerVoxzer : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Playerwish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Playmogo : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Rabbitstream : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun extractRealKey (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getEmbed ()Ljava/lang/String;
-	public fun getKey ()Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$Sources {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Rabbitstream$Sources$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Sources;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$Sources$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Boolean;
-	public final fun component3 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEncrypted ()Ljava/lang/Boolean;
-	public final fun getSources ()Ljava/lang/String;
-	public final fun getTracks ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$SourcesEncrypted$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getSources ()Ljava/util/List;
-	public final fun getTracks ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$SourcesResponses$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$Tracks {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getKind ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Rabbitstream$Tracks$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Rabbitstream$Tracks;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rabbitstream$Tracks$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/RapidVid : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Rasacintaku : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ryderjet : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/SBPlay : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/SBfull : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbasian : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbface : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbflix : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sblona : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sblongvu : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbnet : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbrapid : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbsonic : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbspeed : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sbthe : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/SecvideoOnline : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Sendvid : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Server1uns : com/lagradost/cloudstream3/extractors/VidStack {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-	public fun setRequiresReferer (Z)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/SfastwishCom : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/ShaveTape : com/lagradost/cloudstream3/extractors/StreamTape {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/SibNet : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Simpulumlamerop : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Slmaxed : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public final fun getEmbedRegex ()Lkotlin/text/Regex;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMessage ()Ljava/lang/String;
-	public final fun getResult ()Ljava/util/Map;
-	public final fun getStatus ()Ljava/lang/String;
-	public final fun getToken ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Slmaxed$JsonResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Slmaxed$Result {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Slmaxed$Result$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Slmaxed$Result;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Slmaxed$Result$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Smoothpre : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Sobreatsesuyp : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getTitle ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Sobreatsesuyp$SobreatsesuypVideoData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ssbstream : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/StreamEmbed : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamHLS : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamM4u : com/lagradost/cloudstream3/extractors/XStreamCdn {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/StreamSB : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB$Main {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/StreamSB$Main$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;I)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;
-	public final fun component2 ()I
-	public final fun copy (Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;I)Lcom/lagradost/cloudstream3/extractors/StreamSB$Main;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/StreamSB$Main;Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;IILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/StreamSB$Main;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getStatusCode ()I
-	public final fun getStreamData ()Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/StreamSB$Main$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/StreamSB$Main$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/StreamSB$Main;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/StreamSB$Main;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB$Main$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB$StreamData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/util/ArrayList;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getBackup ()Ljava/lang/String;
-	public final fun getCdnImg ()Ljava/lang/String;
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getHash ()Ljava/lang/String;
-	public final fun getId ()Ljava/lang/String;
-	public final fun getLength ()Ljava/lang/String;
-	public final fun getSubs ()Ljava/util/ArrayList;
-	public final fun getTitle ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/StreamSB$StreamData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/StreamSB$StreamData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB$StreamData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB$Subs {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/StreamSB$Subs$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/StreamSB$Subs;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB$Subs$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB1 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB10 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB11 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB2 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB3 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB4 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB5 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB6 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB7 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB8 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamSB9 : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/StreamSilk : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/StreamTape : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamTapeNet : com/lagradost/cloudstream3/extractors/StreamTape {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamTapeXyz : com/lagradost/cloudstream3/extractors/StreamTape {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/StreamWishExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Streamcash : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getCdnUrl ()Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamhideCom : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/StreamhideTo : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Streamhub : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getExtractorUrl (Ljava/lang/String;)Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Streamhub2 : com/lagradost/cloudstream3/extractors/ZplayerV2 {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Streamlare : com/lagradost/cloudstream3/extractors/Slmaxed {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/StreamoUpload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Streamplay : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Streamplay$Source {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Streamplay$Source$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Streamplay$Source;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Streamplay$Source;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Streamplay$Source;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Streamplay$Source$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Streamplay$Source$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Streamplay$Source;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Streamplay$Source;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Streamplay$Source$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Streamsss : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Streamwish2 : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Strwish : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Strwish2 : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Supervideo : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Swdyu : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Swhoi : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/TRsTX : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getTitle ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/TRsTX$TrstxVideoData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/Tantifilm : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Tantifilm$TantifilmData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData$Companion;
-	public fun <init> (ZLjava/util/List;Ljava/util/List;Z)V
-	public final fun component1 ()Z
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Z
-	public final fun copy (ZLjava/util/List;Ljava/util/List;Z)Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData;ZLjava/util/List;Ljava/util/List;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCaptions ()Ljava/util/List;
-	public final fun getData ()Ljava/util/List;
-	public final fun getSuccess ()Z
-	public fun hashCode ()I
-	public final fun isVr ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Tantifilm$TantifilmJsonData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/TauVideo : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/TauVideo$TauVideoData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/TauVideo$TauVideoData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/TauVideo$TauVideoData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls$Companion;
-	public fun <init> (Ljava/util/List;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getUrls ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/TauVideo$TauVideoUrls$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Techinmind : com/lagradost/cloudstream3/extractors/GDMirrorbot {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-}
-
-public final class com/lagradost/cloudstream3/extractors/Tubeless : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uasopt : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Up4FunTop : com/lagradost/cloudstream3/extractors/Up4Stream {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Up4Stream : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Upstream : com/lagradost/cloudstream3/extractors/ZplayerV2 {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/UpstreamExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Uqload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uqload1 : com/lagradost/cloudstream3/extractors/Uqload {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uqload2 : com/lagradost/cloudstream3/extractors/Uqload {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uqloadbz : com/lagradost/cloudstream3/extractors/Uqload {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uqloadcx : com/lagradost/cloudstream3/extractors/Uqload {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/UqloadsXyz : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Urochsunloath : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Userload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Userscloud : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Uservideo : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uservideo$Sources {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getSrc ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/Uservideo$Sources$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/Uservideo$Sources;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Uservideo$Sources$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/extractors/Vicloud : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHideHub : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/VidHidePro : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHidePro1 : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHidePro2 : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHidePro3 : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHidePro4 : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHidePro5 : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidHidePro6 : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/VidMoxy : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidNest : com/lagradost/cloudstream3/extractors/JWPlayer {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/VidStack : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidaaraxCom : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidaaraxNet : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Vidara : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VidaraSo : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidaraa : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidaratem : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidaraw : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidarax : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidavaca : com/lagradost/cloudstream3/extractors/Vidara {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vide0Net : com/lagradost/cloudstream3/extractors/DoodLaExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Videa : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/VideoSeyred : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VideoSeyred$VSSource {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDefault ()Ljava/lang/String;
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/VideoSeyred$VSSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSSource;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VideoSeyred$VSSource$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDefault ()Ljava/lang/String;
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getKind ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getLanguage ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VideoSeyred$VSTrack$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getImage ()Ljava/lang/String;
-	public final fun getSources ()Ljava/util/List;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getTracks ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VideoSeyred$VideoSeyredSource$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Videzz : com/lagradost/cloudstream3/extractors/Vidoza {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidgomunime : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidgomunimesb : com/lagradost/cloudstream3/extractors/StreamSB {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/VidhideExtractor : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Vidmoly : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidmolybiz : com/lagradost/cloudstream3/extractors/Vidmoly {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidmolyme : com/lagradost/cloudstream3/extractors/Vidmoly {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vidmolyto : com/lagradost/cloudstream3/extractors/Vidmoly {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Vido : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Vidoza : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Vids : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/VinovoSi : com/lagradost/cloudstream3/extractors/VinovoTo {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/VinovoTo : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Vixeo : com/lagradost/cloudstream3/extractors/Vidsonic {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/VkExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/Voe : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Voe1 : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Voe2 : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/Vtbe : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/WatchSB : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Watchadsontape : com/lagradost/cloudstream3/extractors/StreamTape {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/Wibufile : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/WishembedPro : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Wishfast : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Wishonly : com/lagradost/cloudstream3/extractors/StreamWishExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/XStreamCdn : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getDomainUrl ()Ljava/lang/String;
-	public fun getExtractorUrl (Ljava/lang/String;)Ljava/lang/String;
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Xenolyzb : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Yipsu : com/lagradost/cloudstream3/extractors/Voe {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/extractors/YourUpload : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/extractors/YoutubeExtractor : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/YoutubeMobileExtractor : com/lagradost/cloudstream3/extractors/YoutubeExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/YoutubeNoCookieExtractor : com/lagradost/cloudstream3/extractors/YoutubeExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/YoutubeShortLinkExtractor : com/lagradost/cloudstream3/extractors/YoutubeExtractor {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Yufiles : com/lagradost/cloudstream3/extractors/Hxfile {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Yuguaab : com/lagradost/cloudstream3/extractors/VidHidePro {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/Zplayer : com/lagradost/cloudstream3/extractors/ZplayerV2 {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public class com/lagradost/cloudstream3/extractors/ZplayerV2 : com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getRequiresReferer ()Z
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setMainUrl (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/extractors/Ztreamhub : com/lagradost/cloudstream3/extractors/Filesim {
-	public fun <init> ()V
-	public fun getMainUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/AesHelper {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/AesHelper;
-	public final fun cryptoAESHandler (Ljava/lang/String;[BZLjava/lang/String;)Ljava/lang/String;
-	public final fun cryptoAESHandler (Ljava/lang/String;[BZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun cryptoAESHandler$default (Lcom/lagradost/cloudstream3/extractors/helper/AesHelper;Ljava/lang/String;[BZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
-	public static synthetic fun cryptoAESHandler$default (Lcom/lagradost/cloudstream3/extractors/helper/AesHelper;Ljava/lang/String;[BZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun generateKeyAndIv ([B[BIIII)Lkotlin/Pair;
-	public static synthetic fun generateKeyAndIv$default (Lcom/lagradost/cloudstream3/extractors/helper/AesHelper;[B[BIIIIILjava/lang/Object;)Lkotlin/Pair;
-	public final fun hexToByteArray (Ljava/lang/String;)[B
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper$Companion;
-	public fun <init> ()V
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper$Companion {
-	public final fun getUrls (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/CryptoJS {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/CryptoJS;
-	public final fun decrypt (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-	public final fun encrypt (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper;
-	public final fun extractVidstream (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZLorg/jsoup/nodes/Document;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun extractVidstream$default (Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZLorg/jsoup/nodes/Document;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoJsonData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDefault ()Ljava/lang/String;
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSource$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources$Companion;
-	public fun <init> (Ljava/util/List;Ljava/util/List;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;Ljava/util/List;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getSource ()Ljava/util/List;
-	public final fun getSourceBk ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/GogoHelper$GogoSources$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/JwPlayerHelper {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper;
-	public final fun canParseJwScript (Ljava/lang/String;)Z
-	public final fun extractStreamLinks (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/Map;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun extractStreamLinks$default (Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/Map;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFile ()Ljava/lang/String;
-	public final fun getKind ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/JwPlayerHelper$Track$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/NineAnimeHelper;
-	public final fun cipher (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-	public final fun decodeVrf (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-	public final fun encode (Ljava/lang/String;)Ljava/lang/String;
-	public final fun encodeVrf (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-	public final fun encrypt (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/VstreamhubHelper$Companion;
-	public fun <init> ()V
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper$Companion {
-	public final fun getUrls (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/WcoHelper {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion;
-	public fun <init> ()V
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion {
-	public final fun getNewWcoKey (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getWcoKey (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getWcoKey ()Ljava/lang/String;
-	public final fun getWcocipher ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$ExternalKeys$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys {
-	public static final field Companion Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCipherkey ()Ljava/lang/String;
-	public final fun getEncryptKey ()Ljava/lang/String;
-	public final fun getMainKey ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/extractors/helper/WcoHelper$Companion$NewExternalKeys$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider : com/lagradost/cloudstream3/metaproviders/TmdbProvider {
-	public fun <init> ()V
-	public fun getApiName ()Ljava/lang/String;
-	public fun getLang ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getSupportedTypes ()Ljava/util/Set;
-	public fun getUseMetaLoadResponse ()Z
-	public fun getUsesWebView ()Z
-	public fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun loadLinks (Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun search (Ljava/lang/String;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setLang (Ljava/lang/String;)V
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData$Companion;
-	public fun <init> (ZLjava/util/List;)V
-	public synthetic fun <init> (ZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Z
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (ZLjava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData;ZLjava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMovies ()Ljava/util/List;
-	public fun hashCode ()I
-	public final fun isSuccess ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider$CrossMetaData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public abstract class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI : com/lagradost/cloudstream3/MainAPI {
-	public static final field API_HOST Ljava/lang/String;
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Companion;
-	public static final field SITE_HOST Ljava/lang/String;
-	public static final field TAG Ljava/lang/String;
-	public fun <init> ()V
-	public fun getHasMainPage ()Z
-	public fun getMainPage ()Ljava/util/List;
-	public fun getMainPage (ILcom/lagradost/cloudstream3/MainPageRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getName ()Ljava/lang/String;
-	public fun getProviderType ()Lcom/lagradost/cloudstream3/ProviderType;
-	public fun getSupportedTypes ()Ljava/util/Set;
-	public fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun search (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()J
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCharacterName ()Ljava/lang/String;
-	public final fun getId ()J
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getRole ()Ljava/lang/String;
-	public final fun getSlug ()Ljava/lang/String;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Cast$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Companion {
-	public final fun getAPI_KEY ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits$Companion;
-	public fun <init> (Ljava/util/List;Ljava/util/List;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCast ()Ljava/util/List;
-	public final fun getCrew ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Credits$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;)V
-	public final fun component1 ()J
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew;JLjava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getId ()J
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun getJob ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getSlug ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Crew$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;
-	public final fun copy (Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data;Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMedia ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;
-	public final fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Data$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()J
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre;JLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getId ()J
-	public final fun getName ()Ljava/lang/String;
-	public final fun getSlug ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Genre$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMedium ()Ljava/lang/String;
-	public final fun getPoster ()Ljava/lang/String;
-	public final fun getThumb ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Long;
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/Integer;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAiredDate ()Ljava/lang/String;
-	public final fun getDate ()Ljava/lang/String;
-	public final fun getEpisode ()Ljava/lang/Integer;
-	public final fun getId ()Ljava/lang/Long;
-	public final fun getLastSeason ()Ljava/lang/Integer;
-	public final fun getOrgTitle ()Ljava/lang/String;
-	public final fun getSeason ()Ljava/lang/Integer;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$LinkData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;IJDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;JJJJJJJLjava/lang/String;Ljava/lang/String;ZLjava/util/List;J)V
-	public synthetic fun <init> (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;IJDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;JJJJJJJLjava/lang/String;Ljava/lang/String;ZLjava/util/List;JIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()J
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component11 ()Ljava/lang/String;
-	public final fun component12 ()Ljava/lang/String;
-	public final fun component13 ()Ljava/lang/String;
-	public final fun component14 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun component15 ()Ljava/util/List;
-	public final fun component16 ()Ljava/lang/Long;
-	public final fun component17 ()Ljava/lang/String;
-	public final fun component18 ()Ljava/lang/String;
-	public final fun component19 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component20 ()Ljava/util/List;
-	public final fun component21 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;
-	public final fun component22 ()J
-	public final fun component23 ()J
-	public final fun component24 ()J
-	public final fun component25 ()J
-	public final fun component26 ()J
-	public final fun component27 ()J
-	public final fun component28 ()J
-	public final fun component29 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component30 ()Ljava/lang/String;
-	public final fun component31 ()Z
-	public final fun component32 ()Ljava/util/List;
-	public final fun component33 ()J
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()I
-	public final fun component6 ()J
-	public final fun component7 ()D
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;IJDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;JJJJJJJLjava/lang/String;Ljava/lang/String;ZLjava/util/List;J)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;IJDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;JJJJJJJLjava/lang/String;Ljava/lang/String;ZLjava/util/List;JIILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun fetchCredits (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun fetchRecommendations (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun fetchTrailer (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun fixGenres ()Ljava/util/List;
-	public final fun getAiredStart ()Ljava/lang/String;
-	public final fun getAltTitles ()Ljava/util/List;
-	public final fun getCertification ()Ljava/lang/String;
-	public final fun getCommentsCount ()J
-	public final fun getCountry ()Ljava/lang/String;
-	public final fun getEnableAds ()Z
-	public final fun getEpisodes ()J
-	public final fun getGenres ()Ljava/util/List;
-	public final fun getId ()J
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun getLanguage ()Ljava/lang/String;
-	public final fun getMediaRating ()D
-	public final fun getMediaType ()Ljava/lang/String;
-	public final fun getMediaYear ()I
-	public final fun getOriginalTitle ()Ljava/lang/String;
-	public final fun getPermalink ()Ljava/lang/String;
-	public final fun getPopularity ()J
-	public final fun getRanked ()J
-	public final fun getRecsCount ()J
-	public final fun getReleaseDatesFmt ()Ljava/lang/String;
-	public final fun getReleased ()Ljava/lang/String;
-	public final fun getReviewsCount ()J
-	public final fun getRuntime ()J
-	public final fun getSlug ()Ljava/lang/String;
-	public final fun getSources ()Ljava/util/List;
-	public final fun getStatus ()Ljava/lang/String;
-	public final fun getSynopsis ()Ljava/lang/String;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getTrailer ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;
-	public final fun getType ()Ljava/lang/String;
-	public final fun getUpdatedAt ()J
-	public final fun getVotes ()Ljava/lang/Long;
-	public final fun getWatchers ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Media$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;)V
-	public synthetic fun <init> (JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()J
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component11 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/Double;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCountry ()Ljava/lang/String;
-	public final fun getId ()J
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Images;
-	public final fun getLanguage ()Ljava/lang/String;
-	public final fun getMediaType ()Ljava/lang/String;
-	public final fun getOriginalTitle ()Ljava/lang/String;
-	public final fun getPermalink ()Ljava/lang/String;
-	public final fun getRating ()Ljava/lang/Double;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$MediaSummary$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode$Companion;
-	public fun <init> (IIDILjava/lang/String;)V
-	public final fun component1 ()I
-	public final fun component2 ()I
-	public final fun component3 ()D
-	public final fun component4 ()I
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (IIDILjava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode;IIDILjava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEpisodeNumber ()I
-	public final fun getId ()I
-	public final fun getRating ()D
-	public final fun getReleasedAt ()Ljava/lang/String;
-	public final fun getVotes ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisode$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;I)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()I
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;I)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;IILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEpisodes ()Ljava/util/List;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getReleaseDate ()Ljava/lang/String;
-	public final fun getTimezone ()Ljava/lang/String;
-	public final fun getTotal ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$ShowEpisodesItem$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getImage ()Ljava/lang/String;
-	public final fun getLink ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getSource ()Ljava/lang/String;
-	public final fun getSourceType ()Ljava/lang/String;
-	public final fun getXid ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Source$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag$Companion;
-	public fun <init> (JLjava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()J
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag;JLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getId ()J
-	public final fun getName ()Ljava/lang/String;
-	public final fun getSlug ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Tag$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Long;)V
-	public synthetic fun <init> (Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Long;
-	public final fun copy (Ljava/lang/Long;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;Ljava/lang/Long;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getId ()Ljava/lang/Long;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$Trailer$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails$Companion;
-	public fun <init> (JLjava/lang/String;)V
-	public final fun component1 ()J
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (JLjava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;JLjava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getId ()J
-	public final fun getSource ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;
-	public final fun copy (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getTrailerDetails ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerDetails;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot$Companion;
-	public fun <init> (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;
-	public final fun copy (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getTrailer ()Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerNode;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/MyDramaListAPI$TrailerRoot$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/SyncRedirector {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/SyncRedirector;
-	public final fun redirect (Ljava/lang/String;Lcom/lagradost/cloudstream3/MainAPI;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbLink {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbLink$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TmdbLink;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbLink;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbLink;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEpisode ()Ljava/lang/Integer;
-	public final fun getImdbID ()Ljava/lang/String;
-	public final fun getMovieName ()Ljava/lang/String;
-	public final fun getSeason ()Ljava/lang/Integer;
-	public final fun getTmdbID ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbLink$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbLink$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbLink;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbLink;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbLink$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/metaproviders/TmdbProvider : com/lagradost/cloudstream3/MainAPI {
-	public fun <init> ()V
-	public fun fetchContentRating (Ljava/lang/Integer;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getApiName ()Ljava/lang/String;
-	public fun getDisableSeasonZero ()Z
-	public fun getHasMainPage ()Z
-	public fun getIncludeAdult ()Z
-	public fun getMainPage (ILcom/lagradost/cloudstream3/MainPageRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getProviderType ()Lcom/lagradost/cloudstream3/ProviderType;
-	public fun getUseMetaLoadResponse ()Z
-	public fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun loadFromImdb (Ljava/lang/String;)Lcom/lagradost/cloudstream3/LoadResponse;
-	public fun loadFromImdb (Ljava/lang/String;Ljava/util/List;)Lcom/lagradost/cloudstream3/LoadResponse;
-	public fun loadFromTmdb (I)Lcom/lagradost/cloudstream3/LoadResponse;
-	public fun loadFromTmdb (ILjava/util/List;)Lcom/lagradost/cloudstream3/LoadResponse;
-	public fun search (Ljava/lang/String;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCharacter ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getProfilePath ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCastMember$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCountry ()Ljava/lang/String;
-	public final fun getRating ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRating$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResults ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCast ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/Integer;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/Double;
-	public final fun component9 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAirDate ()Ljava/lang/String;
-	public final fun getEpisodeNumber ()Ljava/lang/Integer;
-	public final fun getExternalIds ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getOverview ()Ljava/lang/String;
-	public final fun getSeasonNumber ()Ljava/lang/Integer;
-	public final fun getStillPath ()Ljava/lang/String;
-	public final fun getVoteAverage ()Ljava/lang/Double;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbEpisode$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre;Ljava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbGenre$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getImdbId ()Ljava/lang/String;
-	public final fun getTvdbId ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component11 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public final fun component12 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public final fun component13 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public final fun component14 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun component15 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun component16 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/Double;
-	public final fun component8 ()Ljava/util/List;
-	public final fun component9 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCredits ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public final fun getDisplayTitle ()Ljava/lang/String;
-	public final fun getExternalIds ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public final fun getGenres ()Ljava/util/List;
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getImdbId ()Ljava/lang/String;
-	public final fun getOriginalTitle ()Ljava/lang/String;
-	public final fun getOverview ()Ljava/lang/String;
-	public final fun getPosterPath ()Ljava/lang/String;
-	public final fun getRecommendations ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun getReleaseDate ()Ljava/lang/String;
-	public final fun getReleaseDates ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;
-	public final fun getRuntime ()Ljava/lang/Integer;
-	public final fun getSimilar ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getVideos ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public final fun getVoteAverage ()Ljava/lang/Double;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMovieDetail$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResults ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbMultiResult$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResults ()Ljava/util/List;
-	public final fun getTotalPages ()Ljava/lang/Integer;
-	public final fun getTotalResults ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCertification ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateEntry$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCountry ()Ljava/lang/String;
-	public final fun getReleaseDates ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDateResult$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResults ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbReleaseDates$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/Double;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDisplayTitle ()Ljava/lang/String;
-	public final fun getFirstAirDate ()Ljava/lang/String;
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getMediaType ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getOriginalName ()Ljava/lang/String;
-	public final fun getOriginalTitle ()Ljava/lang/String;
-	public final fun getPosterPath ()Ljava/lang/String;
-	public final fun getReleaseDate ()Ljava/lang/String;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getVoteAverage ()Ljava/lang/Double;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public final fun isTv ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSearchResult$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/Integer;Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail;Ljava/lang/Integer;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEpisodes ()Ljava/util/List;
-	public final fun getSeasonNumber ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonDetail$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getEpisodeCount ()Ljava/lang/Integer;
-	public final fun getSeasonNumber ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbSeasonSummary$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component10 ()Ljava/util/List;
-	public final fun component11 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public final fun component12 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public final fun component13 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public final fun component14 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun component15 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun component16 ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/Double;
-	public final fun component8 ()Ljava/util/List;
-	public final fun component9 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getContentRatings ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbContentRatings;
-	public final fun getCredits ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbCredits;
-	public final fun getDisplayTitle ()Ljava/lang/String;
-	public final fun getEpisodeRunTime ()Ljava/util/List;
-	public final fun getExternalIds ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbIds;
-	public final fun getFirstAirDate ()Ljava/lang/String;
-	public final fun getGenres ()Ljava/util/List;
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getOriginalName ()Ljava/lang/String;
-	public final fun getOverview ()Ljava/lang/String;
-	public final fun getPosterPath ()Ljava/lang/String;
-	public final fun getRecommendations ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun getSeasons ()Ljava/util/List;
-	public final fun getSimilar ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbPageResult;
-	public final fun getVideos ()Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public final fun getVoteAverage ()Ljava/lang/Double;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbTvDetail$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getKey ()Ljava/lang/String;
-	public final fun getSite ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideo$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getResults ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TmdbProvider$TmdbVideos$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public class com/lagradost/cloudstream3/metaproviders/TraktProvider : com/lagradost/cloudstream3/MainAPI {
-	public fun <init> ()V
-	public fun getHasMainPage ()Z
-	public fun getMainPage ()Ljava/util/List;
-	public fun getMainPage (ILcom/lagradost/cloudstream3/MainPageRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getName ()Ljava/lang/String;
-	public fun getProviderType ()Lcom/lagradost/cloudstream3/ProviderType;
-	public fun getSupportedTypes ()Ljava/util/Set;
-	public fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun search (Ljava/lang/String;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setName (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Airs {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDay ()Ljava/lang/String;
-	public final fun getTime ()Ljava/lang/String;
-	public final fun getTimezone ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Airs$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Airs$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Cast {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/lang/Long;
-	public final fun component4 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;
-	public final fun component5 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun copy (Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast;Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCharacter ()Ljava/lang/String;
-	public final fun getCharacters ()Ljava/util/List;
-	public final fun getEpisodeCount ()Ljava/lang/Long;
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun getPerson ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Cast$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Cast;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Cast$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Data {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data$Companion;
-	public fun <init> ()V
-	public fun <init> (Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;)V
-	public synthetic fun <init> (Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/lagradost/cloudstream3/TvType;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;
-	public final fun copy (Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data;Lcom/lagradost/cloudstream3/TvType;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMediaDetails ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;
-	public final fun getType ()Lcom/lagradost/cloudstream3/TvType;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Data$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Data;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Data$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Ids {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/Integer;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getImdb ()Ljava/lang/String;
-	public final fun getSlug ()Ljava/lang/String;
-	public final fun getTmdb ()Ljava/lang/Integer;
-	public final fun getTrakt ()Ljava/lang/Integer;
-	public final fun getTvdb ()Ljava/lang/Integer;
-	public final fun getTvrage ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Ids$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Ids$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Images {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Ljava/util/List;
-	public final fun component5 ()Ljava/util/List;
-	public final fun component6 ()Ljava/util/List;
-	public final fun component7 ()Ljava/util/List;
-	public final fun component8 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getBanner ()Ljava/util/List;
-	public final fun getClearArt ()Ljava/util/List;
-	public final fun getFanart ()Ljava/util/List;
-	public final fun getHeadshot ()Ljava/util/List;
-	public final fun getLogo ()Ljava/util/List;
-	public final fun getPoster ()Ljava/util/List;
-	public final fun getScreenshot ()Ljava/util/List;
-	public final fun getThumb ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Images$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Images$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZ)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component10 ()Ljava/lang/Integer;
-	public final fun component11 ()Ljava/lang/String;
-	public final fun component12 ()Ljava/lang/String;
-	public final fun component13 ()Ljava/lang/String;
-	public final fun component14 ()Ljava/lang/Integer;
-	public final fun component15 ()Ljava/lang/String;
-	public final fun component16 ()Z
-	public final fun component17 ()Ljava/lang/Integer;
-	public final fun component18 ()Ljava/lang/Integer;
-	public final fun component19 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component20 ()Ljava/lang/String;
-	public final fun component21 ()Ljava/lang/String;
-	public final fun component22 ()Ljava/lang/String;
-	public final fun component23 ()Z
-	public final fun component24 ()Z
-	public final fun component25 ()Z
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/Integer;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/Integer;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZ)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAiredDate ()Ljava/lang/String;
-	public final fun getAiredYear ()Ljava/lang/Integer;
-	public final fun getAniId ()Ljava/lang/String;
-	public final fun getAnimeId ()Ljava/lang/String;
-	public final fun getDate ()Ljava/lang/String;
-	public final fun getEpisode ()Ljava/lang/Integer;
-	public final fun getEpsTitle ()Ljava/lang/String;
-	public final fun getId ()Ljava/lang/Integer;
-	public final fun getImdbId ()Ljava/lang/String;
-	public final fun getJpTitle ()Ljava/lang/String;
-	public final fun getLastSeason ()Ljava/lang/Integer;
-	public final fun getOrgTitle ()Ljava/lang/String;
-	public final fun getSeason ()Ljava/lang/Integer;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getTmdbId ()Ljava/lang/Integer;
-	public final fun getTraktId ()Ljava/lang/Integer;
-	public final fun getTraktSlug ()Ljava/lang/String;
-	public final fun getTvdbId ()Ljava/lang/Integer;
-	public final fun getTvrageId ()Ljava/lang/String;
-	public final fun getType ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public final fun isAnime ()Z
-	public final fun isAsian ()Z
-	public final fun isBollywood ()Z
-	public final fun isCartoon ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$LinkData$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component11 ()Ljava/lang/String;
-	public final fun component12 ()Ljava/lang/String;
-	public final fun component13 ()Ljava/lang/Double;
-	public final fun component14 ()Ljava/lang/Long;
-	public final fun component15 ()Ljava/lang/Long;
-	public final fun component16 ()Ljava/lang/String;
-	public final fun component17 ()Ljava/util/List;
-	public final fun component18 ()Ljava/util/List;
-	public final fun component19 ()Ljava/util/List;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component20 ()Ljava/lang/String;
-	public final fun component21 ()Ljava/lang/Integer;
-	public final fun component22 ()Ljava/lang/String;
-	public final fun component23 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;
-	public final fun component24 ()Ljava/lang/String;
-	public final fun component25 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun component26 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;
-	public final fun component3 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/Integer;
-	public final fun component8 ()Ljava/lang/String;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAiredEpisodes ()Ljava/lang/Integer;
-	public final fun getAirs ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Airs;
-	public final fun getAvailableTranslations ()Ljava/util/List;
-	public final fun getCertification ()Ljava/lang/String;
-	public final fun getCommentCount ()Ljava/lang/Long;
-	public final fun getCountry ()Ljava/lang/String;
-	public final fun getFirstAired ()Ljava/lang/String;
-	public final fun getGenres ()Ljava/util/List;
-	public final fun getHomepage ()Ljava/lang/String;
-	public final fun getIds ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun getLanguage ()Ljava/lang/String;
-	public final fun getLanguages ()Ljava/util/List;
-	public final fun getMedia ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;
-	public final fun getNetwork ()Ljava/lang/String;
-	public final fun getOverview ()Ljava/lang/String;
-	public final fun getRating ()Ljava/lang/Double;
-	public final fun getReleased ()Ljava/lang/String;
-	public final fun getRuntime ()Ljava/lang/Integer;
-	public final fun getStatus ()Ljava/lang/String;
-	public final fun getTagline ()Ljava/lang/String;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getTrailer ()Ljava/lang/String;
-	public final fun getUpdatedAt ()Ljava/lang/String;
-	public final fun getVotes ()Ljava/lang/Long;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$MediaDetails$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun component4 ()Ljava/lang/Double;
-	public final fun component5 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Ljava/lang/Double;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getIds ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun getRating ()Ljava/lang/Double;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getYear ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$MediaSummary$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$People {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun copy (Ljava/util/List;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCast ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$People$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$People;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$People$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Person {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun component3 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun copy (Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getIds ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Person$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Person;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Person$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component10 ()Ljava/lang/Double;
-	public final fun component11 ()Ljava/lang/String;
-	public final fun component12 ()Ljava/lang/String;
-	public final fun component13 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun component6 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Ljava/lang/Integer;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAiredEpisodes ()Ljava/lang/Integer;
-	public final fun getEpisodeCount ()Ljava/lang/Integer;
-	public final fun getEpisodes ()Ljava/util/List;
-	public final fun getFirstAired ()Ljava/lang/String;
-	public final fun getIds ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun getNetwork ()Ljava/lang/String;
-	public final fun getNumber ()Ljava/lang/Integer;
-	public final fun getOverview ()Ljava/lang/String;
-	public final fun getRating ()Ljava/lang/Double;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getUpdatedAt ()Ljava/lang/String;
-	public final fun getVotes ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$Seasons$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode {
-	public static final field Companion Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode$Companion;
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
-	public synthetic fun <init> (Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component10 ()Ljava/lang/Double;
-	public final fun component11 ()Ljava/lang/Integer;
-	public final fun component12 ()Ljava/lang/Integer;
-	public final fun component13 ()Ljava/lang/String;
-	public final fun component14 ()Ljava/lang/String;
-	public final fun component15 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun component6 ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun component7 ()Ljava/lang/Integer;
-	public final fun component8 ()Ljava/lang/Integer;
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableTranslations ()Ljava/util/List;
-	public final fun getCommentCount ()Ljava/lang/Integer;
-	public final fun getEpisodeType ()Ljava/lang/String;
-	public final fun getFirstAired ()Ljava/lang/String;
-	public final fun getIds ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Ids;
-	public final fun getImages ()Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$Images;
-	public final fun getNumber ()Ljava/lang/Integer;
-	public final fun getNumberAbs ()Ljava/lang/Integer;
-	public final fun getOverview ()Ljava/lang/String;
-	public final fun getRating ()Ljava/lang/Double;
-	public final fun getRuntime ()Ljava/lang/Integer;
-	public final fun getSeason ()Ljava/lang/Integer;
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getUpdatedAt ()Ljava/lang/String;
-	public final fun getVotes ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final synthetic class com/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/metaproviders/TraktProvider$TraktEpisode$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/ArchComponentExtKt {
-	public static final field DEBUG_EXCEPTION Ljava/lang/String;
-	public static final field DEBUG_PRINT Ljava/lang/String;
-	public static final fun debugAssert (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
-	public static final fun debugException (Lkotlin/jvm/functions/Function0;)V
-	public static final fun debugPrint (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-	public static synthetic fun debugPrint$default (Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
-	public static final fun debugWarning (Lkotlin/jvm/functions/Function0;)V
-	public static final fun debugWarning (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
-	public static final fun getAllMessages (Ljava/lang/Throwable;)Ljava/lang/String;
-	public static final fun getStackTracePretty (Ljava/lang/Throwable;Z)Ljava/lang/String;
-	public static synthetic fun getStackTracePretty$default (Ljava/lang/Throwable;ZILjava/lang/Object;)Ljava/lang/String;
-	public static final fun launchSafe (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchSafe$default (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public static final fun logError (Ljava/lang/Throwable;)V
-	public static final fun normalSafeApiCall (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
-	public static final fun safe (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
-	public static final fun safeApiCall (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun safeAsync (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun safeFail (Ljava/lang/Throwable;)Lcom/lagradost/cloudstream3/mvvm/Resource;
-	public static final fun suspendSafeApiCall (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun throwAbleToResource (Ljava/lang/Throwable;)Lcom/lagradost/cloudstream3/mvvm/Resource;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/ArchComponentExt_jvmCommonKt {
-	public static final fun platformThrowAbleToResource (Ljava/lang/Throwable;)Lcom/lagradost/cloudstream3/mvvm/Resource;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/DebugException : java/lang/Exception {
-	public fun <init> (Ljava/lang/String;)V
-}
-
-public abstract class com/lagradost/cloudstream3/mvvm/Resource {
-	public static final field Companion Lcom/lagradost/cloudstream3/mvvm/Resource$Companion;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/Resource$Companion {
-	public final fun fromResult (Ljava/lang/Object;)Lcom/lagradost/cloudstream3/mvvm/Resource;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/Resource$Failure : com/lagradost/cloudstream3/mvvm/Resource {
-	public fun <init> (ZLjava/lang/String;)V
-	public final fun component1 ()Z
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (ZLjava/lang/String;)Lcom/lagradost/cloudstream3/mvvm/Resource$Failure;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/mvvm/Resource$Failure;ZLjava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/mvvm/Resource$Failure;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getErrorString ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun isNetworkError ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/Resource$Loading : com/lagradost/cloudstream3/mvvm/Resource {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/lagradost/cloudstream3/mvvm/Resource$Loading;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/mvvm/Resource$Loading;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/mvvm/Resource$Loading;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/mvvm/Resource$Success : com/lagradost/cloudstream3/mvvm/Resource {
-	public fun <init> (Ljava/lang/Object;)V
-	public final fun component1 ()Ljava/lang/Object;
-	public final fun copy (Ljava/lang/Object;)Lcom/lagradost/cloudstream3/mvvm/Resource$Success;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/mvvm/Resource$Success;Ljava/lang/Object;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/mvvm/Resource$Success;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getValue ()Ljava/lang/Object;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/network/WebViewResolver : okhttp3/Interceptor {
-	public static final field Companion Lcom/lagradost/cloudstream3/network/WebViewResolver$Companion;
-	public fun <init> (Lkotlin/text/Regex;Ljava/util/List;Ljava/lang/String;ZLjava/lang/String;Lkotlin/jvm/functions/Function1;J)V
-	public synthetic fun <init> (Lkotlin/text/Regex;Ljava/util/List;Ljava/lang/String;ZLjava/lang/String;Lkotlin/jvm/functions/Function1;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun intercept (Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-	public final fun resolveUsingWebView (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun resolveUsingWebView (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun resolveUsingWebView (Lokhttp3/Request;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun resolveUsingWebView$default (Lcom/lagradost/cloudstream3/network/WebViewResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun resolveUsingWebView$default (Lcom/lagradost/cloudstream3/network/WebViewResolver;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun resolveUsingWebView$default (Lcom/lagradost/cloudstream3/network/WebViewResolver;Lokhttp3/Request;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/network/WebViewResolver$Companion {
-	public final fun getDEFAULT_TIMEOUT ()J
-	public final fun getWebViewUserAgent ()Ljava/lang/String;
-	public final fun setWebViewUserAgent (Ljava/lang/String;)V
-}
-
-public abstract class com/lagradost/cloudstream3/plugins/BasePlugin {
-	public fun <init> ()V
-	public fun beforeUnload ()V
-	public final fun getFilename ()Ljava/lang/String;
-	public final fun get__filename ()Ljava/lang/String;
-	public fun load ()V
-	public final fun registerExtractorAPI (Lcom/lagradost/cloudstream3/utils/ExtractorApi;)V
-	public final fun registerMainAPI (Lcom/lagradost/cloudstream3/MainAPI;)V
-	public final fun setFilename (Ljava/lang/String;)V
-	public final fun set__filename (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/plugins/BasePlugin$Manifest {
-	public static final field Companion Lcom/lagradost/cloudstream3/plugins/BasePlugin$Manifest$Companion;
-	public fun <init> ()V
-	public final fun getName ()Ljava/lang/String;
-	public final fun getPluginClassName ()Ljava/lang/String;
-	public final fun getRequiresResources ()Z
-	public final fun getVersion ()Ljava/lang/Integer;
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setPluginClassName (Ljava/lang/String;)V
-	public final fun setRequiresResources (Z)V
-	public final fun setVersion (Ljava/lang/Integer;)V
-}
-
-public final synthetic class com/lagradost/cloudstream3/plugins/BasePlugin$Manifest$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/plugins/BasePlugin$Manifest$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/plugins/BasePlugin$Manifest;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/plugins/BasePlugin$Manifest;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/plugins/BasePlugin$Manifest$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/plugins/BasePluginKt {
-	public static final field PLUGIN_TAG Ljava/lang/String;
-}
-
-public abstract interface annotation class com/lagradost/cloudstream3/plugins/CloudstreamPlugin : java/lang/annotation/Annotation {
-}
-
-public final class com/lagradost/cloudstream3/syncproviders/SyncIdName : java/lang/Enum {
-	public static final field Anilist Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static final field Imdb Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static final field Kitsu Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static final field LocalList Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static final field MyAnimeList Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static final field Simkl Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static final field Trakt Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-	public static fun values ()[Lcom/lagradost/cloudstream3/syncproviders/SyncIdName;
-}
-
-public final class com/lagradost/cloudstream3/utils/AppUtils {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/AppUtils;
-	public final fun toJson (Ljava/lang/Object;)Ljava/lang/String;
-}
-
-public class com/lagradost/cloudstream3/utils/AtomicList : java/util/List, kotlin/jvm/internal/markers/KMappedMarker {
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun add (ILjava/lang/Object;)V
-	public fun add (Ljava/lang/Object;)Z
-	public fun addAll (ILjava/util/Collection;)Z
-	public fun addAll (Ljava/util/Collection;)Z
-	public fun clear ()V
-	public fun contains (Ljava/lang/Object;)Z
-	public fun containsAll (Ljava/util/Collection;)Z
-	public final fun distinctBy (Lkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/utils/AtomicList;
-	public final fun filter (Lkotlin/jvm/functions/Function1;)Lcom/lagradost/cloudstream3/utils/AtomicList;
-	public fun get (I)Ljava/lang/Object;
-	public fun getSize ()I
-	public fun indexOf (Ljava/lang/Object;)I
-	public fun isEmpty ()Z
-	public fun iterator ()Ljava/util/Iterator;
-	public fun lastIndexOf (Ljava/lang/Object;)I
-	public fun listIterator ()Ljava/util/ListIterator;
-	public fun listIterator (I)Ljava/util/ListIterator;
-	public final fun plus (Ljava/lang/Object;)Lcom/lagradost/cloudstream3/utils/AtomicList;
-	public final fun plus (Ljava/util/Collection;)Lcom/lagradost/cloudstream3/utils/AtomicList;
-	public fun remove (I)Ljava/lang/Object;
-	public fun remove (Ljava/lang/Object;)Z
-	public fun removeAll (Ljava/util/Collection;)Z
-	public fun replaceAll (Ljava/util/function/UnaryOperator;)V
-	public fun retainAll (Ljava/util/Collection;)Z
-	public fun set (ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun size ()I
-	public fun sort (Ljava/util/Comparator;)V
-	public fun subList (II)Ljava/util/List;
-	public fun toArray ()[Ljava/lang/Object;
-	public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
-	public final fun withLock (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/utils/AtomicMutableList : com/lagradost/cloudstream3/utils/AtomicList, java/util/List, kotlin/jvm/internal/markers/KMutableList {
-	public fun <init> ()V
-	public fun <init> (Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun add (ILjava/lang/Object;)V
-	public fun add (Ljava/lang/Object;)Z
-	public fun addAll (ILjava/util/Collection;)Z
-	public fun addAll (Ljava/util/Collection;)Z
-	public fun clear ()V
-	public fun iterator ()Ljava/util/Iterator;
-	public fun listIterator ()Ljava/util/ListIterator;
-	public fun listIterator (I)Ljava/util/ListIterator;
-	public final fun remove (I)Ljava/lang/Object;
-	public fun remove (Ljava/lang/Object;)Z
-	public fun removeAll (Ljava/util/Collection;)Z
-	public fun removeAt (I)Ljava/lang/Object;
-	public fun retainAll (Ljava/util/Collection;)Z
-	public fun set (ILjava/lang/Object;)Ljava/lang/Object;
-	public fun subList (II)Ljava/util/List;
-}
-
-public final class com/lagradost/cloudstream3/utils/Coroutines {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/Coroutines;
-	public final fun atomicListOf ([Ljava/lang/Object;)Lcom/lagradost/cloudstream3/utils/AtomicMutableList;
-	public final fun ioSafe (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/Job;
-	public final fun ioWork (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun ioWorkSafe (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun main (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public final fun mainWork (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun runOnMainThread (Lkotlin/jvm/functions/Function0;)V
-	public final fun threadSafeListOf ([Ljava/lang/Object;)Ljava/util/List;
-}
-
-public final class com/lagradost/cloudstream3/utils/Coroutines_jvmCommonKt {
-	public static final fun getWorkerDispatcher ()Lkotlinx/coroutines/CoroutineDispatcher;
-}
-
-public final class com/lagradost/cloudstream3/utils/Coroutines_jvmKt {
-	public static final fun runOnMainThreadNative (Lkotlin/jvm/functions/Function0;)V
-}
-
-public class com/lagradost/cloudstream3/utils/DrmExtractorLink : com/lagradost/cloudstream3/utils/ExtractorLink {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/util/HashMap;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/util/HashMap;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/util/HashMap;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/util/HashMap;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getAudioTracks ()Ljava/util/List;
-	public fun getExtractorData ()Ljava/lang/String;
-	public fun getHeaders ()Ljava/util/Map;
-	public fun getKey ()Ljava/lang/String;
-	public fun getKeyRequestParameters ()Ljava/util/HashMap;
-	public fun getKid ()Ljava/lang/String;
-	public fun getKty ()Ljava/lang/String;
-	public fun getLicenseUrl ()Ljava/lang/String;
-	public fun getName ()Ljava/lang/String;
-	public fun getQuality ()I
-	public fun getReferer ()Ljava/lang/String;
-	public fun getSource ()Ljava/lang/String;
-	public fun getType ()Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public fun getUrl ()Ljava/lang/String;
-	public final synthetic fun getUuid ()Ljava/util/UUID;
-	public fun getUuid ()Lkotlin/uuid/Uuid;
-	public fun setAudioTracks (Ljava/util/List;)V
-	public fun setExtractorData (Ljava/lang/String;)V
-	public fun setHeaders (Ljava/util/Map;)V
-	public fun setKey (Ljava/lang/String;)V
-	public fun setKeyRequestParameters (Ljava/util/HashMap;)V
-	public fun setKid (Ljava/lang/String;)V
-	public fun setKty (Ljava/lang/String;)V
-	public fun setLicenseUrl (Ljava/lang/String;)V
-	public fun setQuality (I)V
-	public fun setReferer (Ljava/lang/String;)V
-	public fun setType (Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;)V
-	public final synthetic fun setUuid (Ljava/util/UUID;)V
-	public fun setUuid (Lkotlin/uuid/Uuid;)V
-}
-
-public abstract class com/lagradost/cloudstream3/utils/ExtractorApi {
-	public fun <init> ()V
-	public fun getExtractorUrl (Ljava/lang/String;)Ljava/lang/String;
-	public abstract fun getMainUrl ()Ljava/lang/String;
-	public abstract fun getName ()Ljava/lang/String;
-	public abstract fun getRequiresReferer ()Z
-	public final fun getSafeUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun getSafeUrl$default (Lcom/lagradost/cloudstream3/utils/ExtractorApi;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun getSourcePlugin ()Ljava/lang/String;
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getUrl (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun getUrl$default (Lcom/lagradost/cloudstream3/utils/ExtractorApi;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun getUrl$default (Lcom/lagradost/cloudstream3/utils/ExtractorApi;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun setSourcePlugin (Ljava/lang/String;)V
-}
-
-public final class com/lagradost/cloudstream3/utils/ExtractorApiKt {
-	public static final fun fixUrl (Lcom/lagradost/cloudstream3/utils/ExtractorApi;Ljava/lang/String;)Ljava/lang/String;
-	public static final fun getAndUnpack (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun getCLEARKEY_UUID ()Ljava/util/UUID;
-	public static final fun getExtractorApiFromName (Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/ExtractorApi;
-	public static final fun getExtractorApis ()Lcom/lagradost/cloudstream3/utils/AtomicMutableList;
-	public static final fun getINFER_TYPE ()Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static final fun getPLAYREADY_UUID ()Ljava/util/UUID;
-	public static final fun getPacked (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun getPostForm (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun getQualityFromName (Ljava/lang/String;)I
-	public static final fun getSchemaStripRegex ()Lkotlin/text/Regex;
-	public static final fun getWIDEVINE_UUID ()Ljava/util/UUID;
-	public static final fun httpsify (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun loadExtractor (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun loadExtractor (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun loadExtractor$default (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newDrmExtractorLink (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/UUID;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newDrmExtractorLink$default (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/UUID;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun newExtractorLink (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newExtractorLink$default (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun requireReferer (Ljava/lang/String;)Z
-	public static final fun toUs (J)J
-	public static final fun unshortenLinkSafe (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class com/lagradost/cloudstream3/utils/ExtractorLink : com/lagradost/cloudstream3/IDownloadableMinimum {
-	public static final field Companion Lcom/lagradost/cloudstream3/utils/ExtractorLink$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZLjava/util/Map;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZLjava/util/Map;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZLjava/util/Map;Ljava/lang/String;Z)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZLjava/util/Map;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/Map;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getAllHeaders ()Ljava/util/Map;
-	public fun getAudioTracks ()Ljava/util/List;
-	public fun getExtractorData ()Ljava/lang/String;
-	public fun getHeaders ()Ljava/util/Map;
-	public fun getName ()Ljava/lang/String;
-	public fun getQuality ()I
-	public fun getReferer ()Ljava/lang/String;
-	public fun getSource ()Ljava/lang/String;
-	public fun getType ()Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public fun getUrl ()Ljava/lang/String;
-	public final fun getVideoSize (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun getVideoSize$default (Lcom/lagradost/cloudstream3/utils/ExtractorLink;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun isDash ()Z
-	public final fun isM3u8 ()Z
-	public fun setAudioTracks (Ljava/util/List;)V
-	public fun setExtractorData (Ljava/lang/String;)V
-	public fun setHeaders (Ljava/util/Map;)V
-	public fun setQuality (I)V
-	public fun setReferer (Ljava/lang/String;)V
-	public fun setType (Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;)V
-	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Lcom/lagradost/cloudstream3/utils/ExtractorLink;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
-}
-
-public final synthetic class com/lagradost/cloudstream3/utils/ExtractorLink$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/ExtractorLink$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/lagradost/cloudstream3/utils/ExtractorLink;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/lagradost/cloudstream3/utils/ExtractorLink;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/utils/ExtractorLink$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/lagradost/cloudstream3/utils/ExtractorLinkPlayList : com/lagradost/cloudstream3/utils/ExtractorLink {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;IZLjava/util/Map;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;IZLjava/util/Map;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()I
-	public final fun component6 ()Ljava/util/Map;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun component8 ()Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public final fun component9 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;)Lcom/lagradost/cloudstream3/utils/ExtractorLinkPlayList;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/ExtractorLinkPlayList;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILjava/util/Map;Ljava/lang/String;Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;Ljava/util/List;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/ExtractorLinkPlayList;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getAudioTracks ()Ljava/util/List;
-	public fun getExtractorData ()Ljava/lang/String;
-	public fun getHeaders ()Ljava/util/Map;
-	public fun getName ()Ljava/lang/String;
-	public final fun getPlaylist ()Ljava/util/List;
-	public fun getQuality ()I
-	public fun getReferer ()Ljava/lang/String;
-	public fun getSource ()Ljava/lang/String;
-	public fun getType ()Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public fun hashCode ()I
-	public fun setAudioTracks (Ljava/util/List;)V
-	public fun setExtractorData (Ljava/lang/String;)V
-	public fun setHeaders (Ljava/util/Map;)V
-	public fun setQuality (I)V
-	public fun setReferer (Ljava/lang/String;)V
-	public fun setType (Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;)V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/ExtractorLinkType : java/lang/Enum {
-	public static final field DASH Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static final field M3U8 Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static final field MAGNET Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static final field TORRENT Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static final field VIDEO Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getMimeType ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-	public static fun values ()[Lcom/lagradost/cloudstream3/utils/ExtractorLinkType;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser;
-	public final fun parse (Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$DrmInitData {
-	public fun <init> (Ljava/lang/String;[Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()[Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;
-	public final fun copy (Ljava/lang/String;[Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$DrmInitData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$DrmInitData;Ljava/lang/String;[Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$DrmInitData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getSchemeDatas ()[Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;
-	public final fun getSchemeType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$Format {
-	public static final field Companion Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format$Companion;
-	public static final field NO_VALUE I
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIFIFII)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIFIFIIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component11 ()Ljava/lang/String;
-	public final fun component12 ()I
-	public final fun component13 ()I
-	public final fun component14 ()F
-	public final fun component15 ()I
-	public final fun component16 ()F
-	public final fun component17 ()I
-	public final fun component18 ()I
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()I
-	public final fun component5 ()I
-	public final fun component6 ()I
-	public final fun component7 ()I
-	public final fun component8 ()I
-	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIFIFII)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIFIFIIILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAccessibilityChannel ()I
-	public final fun getAverageBitrate ()I
-	public final fun getBitrate ()I
-	public final fun getChannelCount ()I
-	public final fun getCodecs ()Ljava/lang/String;
-	public final fun getContainerMimeType ()Ljava/lang/String;
-	public final fun getFrameRate ()F
-	public final fun getHeight ()I
-	public final fun getId ()Ljava/lang/String;
-	public final fun getLabel ()Ljava/lang/String;
-	public final fun getLanguage ()Ljava/lang/String;
-	public final fun getPeakBitrate ()I
-	public final fun getPixelWidthHeightRatio ()F
-	public final fun getRoleFlags ()I
-	public final fun getRotationDegrees ()I
-	public final fun getSampleMimeType ()Ljava/lang/String;
-	public final fun getSelectionFlags ()I
-	public final fun getWidth ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$Format$Companion {
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist {
-	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/util/List;Ljava/util/Map;Ljava/util/List;Z)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/util/List;Ljava/util/Map;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/util/Map;
-	public final fun component11 ()Ljava/util/List;
-	public final fun component12 ()Z
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/util/List;
-	public final fun component4 ()Ljava/util/List;
-	public final fun component5 ()Ljava/util/List;
-	public final fun component6 ()Ljava/util/List;
-	public final fun component7 ()Ljava/util/List;
-	public final fun component8 ()Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public final fun component9 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/util/List;Ljava/util/Map;Ljava/util/List;Z)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/util/List;Ljava/util/Map;Ljava/util/List;ZILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAudios ()Ljava/util/List;
-	public final fun getBaseUri ()Ljava/lang/String;
-	public final fun getClosedCaptions ()Ljava/util/List;
-	public final fun getHasIndependentSegments ()Z
-	public final fun getMuxedAudioFormat ()Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public final fun getMuxedCaptionFormats ()Ljava/util/List;
-	public final fun getSessionKeyDrmInitData ()Ljava/util/List;
-	public final fun getSubtitles ()Ljava/util/List;
-	public final fun getTags ()Ljava/util/List;
-	public final fun getVariableDefinitions ()Ljava/util/Map;
-	public final fun getVariants ()Ljava/util/List;
-	public final fun getVideos ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes {
-	public static final field APPLICATION_AIT Ljava/lang/String;
-	public static final field APPLICATION_CAMERA_MOTION Ljava/lang/String;
-	public static final field APPLICATION_CEA608 Ljava/lang/String;
-	public static final field APPLICATION_CEA708 Ljava/lang/String;
-	public static final field APPLICATION_DEPTH_METADATA Ljava/lang/String;
-	public static final field APPLICATION_DVBSUBS Ljava/lang/String;
-	public static final field APPLICATION_EMSG Ljava/lang/String;
-	public static final field APPLICATION_EXIF Ljava/lang/String;
-	public static final field APPLICATION_EXTERNALLY_LOADED_IMAGE Ljava/lang/String;
-	public static final field APPLICATION_ICY Ljava/lang/String;
-	public static final field APPLICATION_ID3 Ljava/lang/String;
-	public static final field APPLICATION_M3U8 Ljava/lang/String;
-	public static final field APPLICATION_MATROSKA Ljava/lang/String;
-	public static final field APPLICATION_MEDIA3_CUES Ljava/lang/String;
-	public static final field APPLICATION_MP4 Ljava/lang/String;
-	public static final field APPLICATION_MP4CEA608 Ljava/lang/String;
-	public static final field APPLICATION_MP4VTT Ljava/lang/String;
-	public static final field APPLICATION_MPD Ljava/lang/String;
-	public static final field APPLICATION_PGS Ljava/lang/String;
-	public static final field APPLICATION_RTSP Ljava/lang/String;
-	public static final field APPLICATION_SCTE35 Ljava/lang/String;
-	public static final field APPLICATION_SDP Ljava/lang/String;
-	public static final field APPLICATION_SS Ljava/lang/String;
-	public static final field APPLICATION_SUBRIP Ljava/lang/String;
-	public static final field APPLICATION_TTML Ljava/lang/String;
-	public static final field APPLICATION_TX3G Ljava/lang/String;
-	public static final field APPLICATION_VOBSUB Ljava/lang/String;
-	public static final field APPLICATION_WEBM Ljava/lang/String;
-	public static final field AUDIO_AAC Ljava/lang/String;
-	public static final field AUDIO_AC3 Ljava/lang/String;
-	public static final field AUDIO_AC4 Ljava/lang/String;
-	public static final field AUDIO_ALAC Ljava/lang/String;
-	public static final field AUDIO_ALAW Ljava/lang/String;
-	public static final field AUDIO_AMR Ljava/lang/String;
-	public static final field AUDIO_AMR_NB Ljava/lang/String;
-	public static final field AUDIO_AMR_WB Ljava/lang/String;
-	public static final field AUDIO_DTS Ljava/lang/String;
-	public static final field AUDIO_DTS_EXPRESS Ljava/lang/String;
-	public static final field AUDIO_DTS_HD Ljava/lang/String;
-	public static final field AUDIO_DTS_X Ljava/lang/String;
-	public static final field AUDIO_EXOPLAYER_MIDI Ljava/lang/String;
-	public static final field AUDIO_E_AC3 Ljava/lang/String;
-	public static final field AUDIO_E_AC3_JOC Ljava/lang/String;
-	public static final field AUDIO_FLAC Ljava/lang/String;
-	public static final field AUDIO_IAMF Ljava/lang/String;
-	public static final field AUDIO_MATROSKA Ljava/lang/String;
-	public static final field AUDIO_MIDI Ljava/lang/String;
-	public static final field AUDIO_MLAW Ljava/lang/String;
-	public static final field AUDIO_MP4 Ljava/lang/String;
-	public static final field AUDIO_MPEG Ljava/lang/String;
-	public static final field AUDIO_MPEGH_MHA1 Ljava/lang/String;
-	public static final field AUDIO_MPEGH_MHM1 Ljava/lang/String;
-	public static final field AUDIO_MPEG_L1 Ljava/lang/String;
-	public static final field AUDIO_MPEG_L2 Ljava/lang/String;
-	public static final field AUDIO_MSGSM Ljava/lang/String;
-	public static final field AUDIO_OGG Ljava/lang/String;
-	public static final field AUDIO_OPUS Ljava/lang/String;
-	public static final field AUDIO_RAW Ljava/lang/String;
-	public static final field AUDIO_TRUEHD Ljava/lang/String;
-	public static final field AUDIO_UNKNOWN Ljava/lang/String;
-	public static final field AUDIO_VORBIS Ljava/lang/String;
-	public static final field AUDIO_WAV Ljava/lang/String;
-	public static final field AUDIO_WEBM Ljava/lang/String;
-	public static final field BASE_TYPE_APPLICATION Ljava/lang/String;
-	public static final field BASE_TYPE_AUDIO Ljava/lang/String;
-	public static final field BASE_TYPE_IMAGE Ljava/lang/String;
-	public static final field BASE_TYPE_TEXT Ljava/lang/String;
-	public static final field BASE_TYPE_VIDEO Ljava/lang/String;
-	public static final field CODEC_E_AC3_JOC Ljava/lang/String;
-	public static final field IMAGE_AVIF Ljava/lang/String;
-	public static final field IMAGE_BMP Ljava/lang/String;
-	public static final field IMAGE_HEIC Ljava/lang/String;
-	public static final field IMAGE_HEIF Ljava/lang/String;
-	public static final field IMAGE_JPEG Ljava/lang/String;
-	public static final field IMAGE_JPEG_R Ljava/lang/String;
-	public static final field IMAGE_PNG Ljava/lang/String;
-	public static final field IMAGE_RAW Ljava/lang/String;
-	public static final field IMAGE_WEBP Ljava/lang/String;
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes;
-	public static final field TEXT_SSA Ljava/lang/String;
-	public static final field TEXT_UNKNOWN Ljava/lang/String;
-	public static final field TEXT_VTT Ljava/lang/String;
-	public static final field VIDEO_APV Ljava/lang/String;
-	public static final field VIDEO_AV1 Ljava/lang/String;
-	public static final field VIDEO_AVI Ljava/lang/String;
-	public static final field VIDEO_DIVX Ljava/lang/String;
-	public static final field VIDEO_DOLBY_VISION Ljava/lang/String;
-	public static final field VIDEO_FLV Ljava/lang/String;
-	public static final field VIDEO_H263 Ljava/lang/String;
-	public static final field VIDEO_H264 Ljava/lang/String;
-	public static final field VIDEO_H265 Ljava/lang/String;
-	public static final field VIDEO_MATROSKA Ljava/lang/String;
-	public static final field VIDEO_MJPEG Ljava/lang/String;
-	public static final field VIDEO_MP2T Ljava/lang/String;
-	public static final field VIDEO_MP4 Ljava/lang/String;
-	public static final field VIDEO_MP42 Ljava/lang/String;
-	public static final field VIDEO_MP43 Ljava/lang/String;
-	public static final field VIDEO_MP4V Ljava/lang/String;
-	public static final field VIDEO_MPEG Ljava/lang/String;
-	public static final field VIDEO_MPEG2 Ljava/lang/String;
-	public static final field VIDEO_MV_HEVC Ljava/lang/String;
-	public static final field VIDEO_OGG Ljava/lang/String;
-	public static final field VIDEO_PS Ljava/lang/String;
-	public static final field VIDEO_RAW Ljava/lang/String;
-	public static final field VIDEO_UNKNOWN Ljava/lang/String;
-	public static final field VIDEO_VC1 Ljava/lang/String;
-	public static final field VIDEO_VP8 Ljava/lang/String;
-	public static final field VIDEO_VP9 Ljava/lang/String;
-	public static final field VIDEO_WEBM Ljava/lang/String;
-	public final fun getMediaMimeType (Ljava/lang/String;)Ljava/lang/String;
-	public final fun getMimeTypeFromMp4ObjectType (I)Ljava/lang/String;
-	public final fun getObjectTypeFromMp4aRFC6381CodecString (Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes$Mp4aObjectType;
-	public final fun getTrackType (Ljava/lang/String;)I
-	public final fun getTrackTypeOfCodec (Ljava/lang/String;)I
-	public final fun isAudio (Ljava/lang/String;)Z
-	public final fun isDolbyVisionCodec (Ljava/lang/String;Ljava/lang/String;)Z
-	public final fun isImage (Ljava/lang/String;)Z
-	public final fun isText (Ljava/lang/String;)Z
-	public final fun isVideo (Ljava/lang/String;)Z
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes$Mp4aObjectType {
-	public fun <init> (II)V
-	public final fun component1 ()I
-	public final fun component2 ()I
-	public final fun copy (II)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes$Mp4aObjectType;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes$Mp4aObjectType;IIILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$MimeTypes$Mp4aObjectType;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAudioObjectTypeIndication ()I
-	public final fun getObjectTypeIndication ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$Mp4Box {
-	public static final field FULL_HEADER_SIZE I
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Mp4Box;
-	public static final field TYPE_pssh I
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException : java/io/IOException {
-	public static final field Companion Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException$Companion;
-	public static final field DATA_TYPE_MANIFEST I
-	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ZI)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Throwable;
-	public final fun component3 ()Z
-	public final fun component4 ()I
-	public final fun copy (Ljava/lang/String;Ljava/lang/Throwable;ZI)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException;Ljava/lang/String;Ljava/lang/Throwable;ZIILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getCause ()Ljava/lang/Throwable;
-	public final fun getContentIsMalformed ()Z
-	public final fun getDataType ()I
-	public fun getMessage ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException$Companion {
-	public final fun createForMalformedManifest (Ljava/lang/String;Ljava/lang/Throwable;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$ParserException;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$PsshAtomUtil {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$PsshAtomUtil;
-	public final fun buildPsshAtom (Lkotlin/uuid/Uuid;[Lkotlin/uuid/Uuid;[B)[B
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$Rendition {
-	public fun <init> (Lio/ktor/http/Url;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Lio/ktor/http/Url;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun copy (Lio/ktor/http/Url;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Rendition;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Rendition;Lio/ktor/http/Url;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Rendition;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFormat ()Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public final fun getGroupId ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getUrl ()Lio/ktor/http/Url;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData {
-	public fun <init> (Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/lang/String;[B)V
-	public synthetic fun <init> (Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/lang/String;[BILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lkotlin/uuid/Uuid;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()[B
-	public final fun copy (Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/lang/String;[B)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;Lkotlin/uuid/Uuid;Ljava/lang/String;Ljava/lang/String;[BILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$SchemeData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getData ()[B
-	public final fun getLicenseServerUrl ()Ljava/lang/String;
-	public final fun getMimeType ()Ljava/lang/String;
-	public final fun getUuid ()Lkotlin/uuid/Uuid;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$UrlUtil {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$UrlUtil;
-	public final fun resolveToUrl (Ljava/lang/String;Ljava/lang/String;)Lio/ktor/http/Url;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$Util {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Util;
-	public final fun getCodecsOfType (Ljava/lang/String;I)Ljava/lang/String;
-	public final fun getCodecsWithoutType (Ljava/lang/String;I)Ljava/lang/String;
-	public final fun split (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
-	public final fun splitAtFirst (Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;
-	public final fun splitCodecs (Ljava/lang/String;)[Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$Variant {
-	public fun <init> (Lio/ktor/http/Url;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Lio/ktor/http/Url;
-	public final fun component2 ()Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun copy (Lio/ktor/http/Url;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Variant;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Variant;Lio/ktor/http/Url;Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Variant;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAudioGroupId ()Ljava/lang/String;
-	public final fun getCaptionGroupId ()Ljava/lang/String;
-	public final fun getFormat ()Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$Format;
-	public final fun getSubtitleGroupId ()Ljava/lang/String;
-	public final fun getUrl ()Lio/ktor/http/Url;
-	public final fun getVideoGroupId ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun isPlayableStandalone (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist;)Z
-	public final fun isTrickPlay ()Z
-	public final fun mustContainAudio (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$HlsMultivariantPlaylist;)Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/HlsPlaylistParser$VariantInfo {
-	public fun <init> (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()I
-	public final fun component2 ()I
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun copy (IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$VariantInfo;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$VariantInfo;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/HlsPlaylistParser$VariantInfo;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAudioGroupId ()Ljava/lang/String;
-	public final fun getAverageBitrate ()I
-	public final fun getCaptionGroupId ()Ljava/lang/String;
-	public final fun getPeakBitrate ()I
-	public final fun getSubtitleGroupId ()Ljava/lang/String;
-	public final fun getVideoGroupId ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/JsContext {
-	public synthetic fun <init> (JJLkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun eval (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun get (Ljava/lang/String;)Ljava/lang/Object;
-	public final fun getMaxExecutionTime-UwyO8pc ()J
-	public final fun getMaxInstructions ()J
-	public final fun set (Ljava/lang/String;Ljava/lang/Object;)V
-	public final fun setMaxExecutionTime-LRDsOJo (J)V
-	public final fun setMaxInstructions (J)V
-}
-
-public final class com/lagradost/cloudstream3/utils/JsHunter {
-	public fun <init> (Ljava/lang/String;)V
-	public final fun dehunt ()Ljava/lang/String;
-	public final fun detect ()Z
-}
-
-public final class com/lagradost/cloudstream3/utils/JsInterpreterKt {
-	public static final fun evalJs-1Y68eR8 (Ljava/lang/String;Ljava/lang/String;JJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun evalJs-1Y68eR8$default (Ljava/lang/String;Ljava/lang/String;JJLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun jsValueToString (Ljava/lang/Object;)Ljava/lang/String;
-	public static final fun newJsContext (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun newJsContext$default (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/utils/JsUnpacker {
-	public static final field Companion Lcom/lagradost/cloudstream3/utils/JsUnpacker$Companion;
-	public fun <init> (Ljava/lang/String;)V
-	public final fun detect ()Z
-	public final fun unpack ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/JsUnpacker$Companion {
-	public final fun getC ()Ljava/util/List;
-	public final fun getZ ()Ljava/util/List;
-	public final fun load (Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/Levenshtein {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/Levenshtein;
-	public final fun partialRatio (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)I
-	public static synthetic fun partialRatio$default (Lcom/lagradost/cloudstream3/utils/Levenshtein;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
-	public final fun ratio (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)I
-	public static synthetic fun ratio$default (Lcom/lagradost/cloudstream3/utils/Levenshtein;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
-}
-
-public final class com/lagradost/cloudstream3/utils/M3u8Helper {
-	public static final field Companion Lcom/lagradost/cloudstream3/utils/M3u8Helper$Companion;
-	public fun <init> ()V
-	public final fun m3u8Generation (Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;Ljava/lang/Boolean;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun m3u8Generation$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper;Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;Ljava/lang/Boolean;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/utils/M3u8Helper$Companion {
-	public final fun generateM3u8 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun generateM3u8$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper$Companion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream {
-	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Integer;
-	public final fun component3 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;)Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getQuality ()Ljava/lang/Integer;
-	public final fun getStreamUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/M3u8Helper2 {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/M3u8Helper2;
-	public final fun generateM3u8 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun generateM3u8$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun getDecrypted ([B[B[BI)[B
-	public static synthetic fun getDecrypted$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2;[B[B[BIILjava/lang/Object;)[B
-	public final fun hslLazy (Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;ZZILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun hslLazy$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2;Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;ZZILkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun m3u8Generation (Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun m3u8Generation$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2;Lcom/lagradost/cloudstream3/utils/M3u8Helper$M3u8Stream;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/utils/M3u8Helper2$LazyHlsDownloadData {
-	public fun <init> ([B[BZLjava/util/List;Ljava/lang/String;Ljava/util/Map;)V
-	public final fun component3 ()Z
-	public final fun component4 ()Ljava/util/List;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/util/Map;
-	public final fun copy ([B[BZLjava/util/List;Ljava/lang/String;Ljava/util/Map;)Lcom/lagradost/cloudstream3/utils/M3u8Helper2$LazyHlsDownloadData;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2$LazyHlsDownloadData;[B[BZLjava/util/List;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/M3u8Helper2$LazyHlsDownloadData;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAllTsLinks ()Ljava/util/List;
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getRelativeUrl ()Ljava/lang/String;
-	public final fun getSize ()I
-	public fun hashCode ()I
-	public final fun isEncrypted ()Z
-	public final fun resolveLink (ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun resolveLinkSafe (IIJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun resolveLinkSafe$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2$LazyHlsDownloadData;IIJLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun resolveLinkWhileSafe (IIJLkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun resolveLinkWhileSafe$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2$LazyHlsDownloadData;IIJLkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/M3u8Helper2$TsLink {
-	public fun <init> (Ljava/lang/String;Ljava/lang/Double;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Double;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Double;)Lcom/lagradost/cloudstream3/utils/M3u8Helper2$TsLink;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/M3u8Helper2$TsLink;Ljava/lang/String;Ljava/lang/Double;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/M3u8Helper2$TsLink;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getTime ()Ljava/lang/Double;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/PlayListItem {
-	public fun <init> (Ljava/lang/String;J)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()J
-	public final fun copy (Ljava/lang/String;J)Lcom/lagradost/cloudstream3/utils/PlayListItem;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/PlayListItem;Ljava/lang/String;JILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/PlayListItem;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDurationUs ()J
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/Qualities : java/lang/Enum {
-	public static final field Companion Lcom/lagradost/cloudstream3/utils/Qualities$Companion;
-	public static final field P1080 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P144 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P1440 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P2160 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P240 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P360 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P480 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field P720 Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static final field Unknown Lcom/lagradost/cloudstream3/utils/Qualities;
-	public final fun getDefaultPriority ()I
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getValue ()I
-	public final fun setValue (I)V
-	public static fun valueOf (Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/Qualities;
-	public static fun values ()[Lcom/lagradost/cloudstream3/utils/Qualities;
-}
-
-public final class com/lagradost/cloudstream3/utils/Qualities$Companion {
-	public final fun getStringByInt (Ljava/lang/Integer;)Ljava/lang/String;
-	public final fun getStringByIntFull (I)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/ShortLink {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/ShortLink;
-	public final fun isShortLink (Ljava/lang/String;)Z
-	public final fun unshorten (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun unshorten$default (Lcom/lagradost/cloudstream3/utils/ShortLink;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public final fun unshortenAdfly (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unshortenDavisonbarker (Ljava/lang/String;)Ljava/lang/String;
-	public final fun unshortenIsecure (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unshortenLinksafe (Ljava/lang/String;)Ljava/lang/String;
-	public final fun unshortenLinkup (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unshortenNuovoIndirizzo (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unshortenNuovoLink (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unshortenUprot (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/lagradost/cloudstream3/utils/ShortLink$ShortUrl {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)V
-	public fun <init> (Lkotlin/text/Regex;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)V
-	public final fun component1 ()Lkotlin/text/Regex;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Lkotlin/jvm/functions/Function2;
-	public final fun copy (Lkotlin/text/Regex;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lcom/lagradost/cloudstream3/utils/ShortLink$ShortUrl;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/ShortLink$ShortUrl;Lkotlin/text/Regex;Ljava/lang/String;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/ShortLink$ShortUrl;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFunction ()Lkotlin/jvm/functions/Function2;
-	public final fun getRegex ()Lkotlin/text/Regex;
-	public final fun getType ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/StringUtils {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/StringUtils;
-	public final fun decodeUri (Ljava/lang/String;)Ljava/lang/String;
-	public final fun decodeUrl (Ljava/lang/String;)Ljava/lang/String;
-	public final fun encodeUri (Ljava/lang/String;)Ljava/lang/String;
-	public final fun encodeUrl (Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/SubtitleHelper {
-	public static final field INSTANCE Lcom/lagradost/cloudstream3/utils/SubtitleHelper;
-	public final fun fromCodeToLangTagIETF (Ljava/lang/String;)Ljava/lang/String;
-	public final fun fromCodeToOpenSubtitlesTag (Ljava/lang/String;)Ljava/lang/String;
-	public final fun fromLanguageToTagIETF (Ljava/lang/String;Ljava/lang/Boolean;)Ljava/lang/String;
-	public static synthetic fun fromLanguageToTagIETF$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)Ljava/lang/String;
-	public final fun fromLanguageToThreeLetters (Ljava/lang/String;)Ljava/lang/String;
-	public final fun fromLanguageToTwoLetters (Ljava/lang/String;Z)Ljava/lang/String;
-	public final fun fromTagToEnglishLanguageName (Ljava/lang/String;)Ljava/lang/String;
-	public final fun fromTagToLanguageName (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-	public static synthetic fun fromTagToLanguageName$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
-	public final fun fromThreeLettersToLanguage (Ljava/lang/String;)Ljava/lang/String;
-	public final fun fromTwoLettersToLanguage (Ljava/lang/String;)Ljava/lang/String;
-	public final fun getFlagFromIso (Ljava/lang/String;)Ljava/lang/String;
-	public final fun getIndexMapIETF_tag ()Ljava/util/Map;
-	public final fun getIndexMapISO_639_1 ()Ljava/util/Map;
-	public final fun getIndexMapISO_639_2_B ()Ljava/util/Map;
-	public final fun getIndexMapISO_639_3 ()Ljava/util/Map;
-	public final fun getIndexMapLanguageName ()Ljava/util/Map;
-	public final fun getIndexMapNativeName ()Ljava/util/Map;
-	public final fun getIndexMapOpenSubtitles ()Ljava/util/Map;
-	public final fun getLanguages ()Ljava/util/List;
-	public final fun getNameNextToFlagEmoji (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-	public static synthetic fun getNameNextToFlagEmoji$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
-	public final fun isWellFormedTagIETF (Ljava/lang/String;)Z
-}
-
-public final class com/lagradost/cloudstream3/utils/SubtitleHelper$Language639 {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/SubtitleHelper$Language639;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper$Language639;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/SubtitleHelper$Language639;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getISO_639_1 ()Ljava/lang/String;
-	public final fun getISO_639_2_B ()Ljava/lang/String;
-	public final fun getISO_639_2_T ()Ljava/lang/String;
-	public final fun getISO_639_3 ()Ljava/lang/String;
-	public final fun getISO_639_6 ()Ljava/lang/String;
-	public final fun getLanguageName ()Ljava/lang/String;
-	public final fun getNativeName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/SubtitleHelper$LanguageMetadata {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/lang/String;
-	public final fun component7 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/lagradost/cloudstream3/utils/SubtitleHelper$LanguageMetadata;
-	public static synthetic fun copy$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper$LanguageMetadata;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/lagradost/cloudstream3/utils/SubtitleHelper$LanguageMetadata;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getIETF_tag ()Ljava/lang/String;
-	public final fun getISO_639_1 ()Ljava/lang/String;
-	public final fun getISO_639_2_B ()Ljava/lang/String;
-	public final fun getISO_639_3 ()Ljava/lang/String;
-	public final fun getLanguageName ()Ljava/lang/String;
-	public final fun getNativeName ()Ljava/lang/String;
-	public final fun getOpenSubtitles ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun localizedName (Ljava/lang/String;)Ljava/lang/String;
-	public static synthetic fun localizedName$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper$LanguageMetadata;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
-	public final fun nameNextToFlagEmoji (Ljava/lang/String;)Ljava/lang/String;
-	public static synthetic fun nameNextToFlagEmoji$default (Lcom/lagradost/cloudstream3/utils/SubtitleHelper$LanguageMetadata;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/lagradost/cloudstream3/utils/SubtitleHelperPlatform_jvmKt {
-	public static final fun getCurrentLocale ()Ljava/lang/String;
-	public static final fun localizedLanguageName (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-}
-
-public abstract class com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer : kotlinx/serialization/json/JsonTransformingSerializer {
-	public fun <init> (Lkotlinx/serialization/KSerializer;)V
-	protected fun transformSerialize (Lkotlinx/serialization/json/JsonElement;)Lkotlinx/serialization/json/JsonElement;
-}
-
-public abstract class com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer : kotlinx/serialization/json/JsonTransformingSerializer {
-	public fun <init> (Lkotlinx/serialization/KSerializer;Ljava/util/Set;)V
-	protected fun transformSerialize (Lkotlinx/serialization/json/JsonElement;)Lkotlinx/serialization/json/JsonElement;
-}
-
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 59a36ce7f..9b769d1e5 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -41,7 +41,10 @@ kotlin {
     jvm()
 
     compilerOptions {
-        freeCompilerArgs.add("-Xexpect-actual-classes")
+        freeCompilerArgs.addAll(
+            "-Xexpect-actual-classes",
+            "-Xannotation-default-target=param-property"
+        )
     }
 
     sourceSets {
@@ -59,13 +62,16 @@ kotlin {
             implementation(libs.kotlinx.atomicfu)
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.kotlinx.datetime)
-            implementation(libs.kotlinx.io.core)
             implementation(libs.kotlinx.serialization.json) // JSON Parser
             implementation(libs.ksoup) // HTML Parser
             implementation(libs.ktor.http)
             implementation(libs.nicehttp) // HTTP Library
             implementation(libs.rhino) // Run JavaScript
+            implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
             implementation(libs.bundles.cryptography) // Cryptography
+
+            // Deprecated; will be removed once extensions have time to migrate from using it
+            implementation("me.xdrop:fuzzywuzzy:1.4.0")
         }
 
         commonTest.dependencies {
@@ -84,17 +90,6 @@ kotlin {
         androidMain { dependsOn(jvmCommonMain) }
         jvmMain { dependsOn(jvmCommonMain) }
     }
-
-    @OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
-    // https://kotlinlang.org/docs/gradle-binary-compatibility-validation.html
-    abiValidation {
-        filters {
-            exclude {
-                annotatedWith.add("com.lagradost.cloudstream3.Prerelease")
-                annotatedWith.add("com.lagradost.cloudstream3.InternalAPI")
-            }
-        }
-    }
 }
 
 tasks.withType<KotlinJvmCompile> {
diff --git a/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt b/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt
index 6ace780ec..5e5897deb 100644
--- a/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt
@@ -3,14 +3,19 @@ package com.lagradost.api
 import android.content.Context
 import java.lang.ref.WeakReference
 
-private var contextRef: WeakReference<Context>? = null
+var ctx: WeakReference<Context>? = null
 
 /**
  * Helper function for Android specific context. Not usable in JVM.
  * Do not use this unless absolutely necessary.
  */
-actual fun getContext(): Any? = contextRef?.get()
-
-actual fun setContext(context: Any?) {
-    contextRef = (context as? Context)?.let { WeakReference(it) }
+actual fun getContext(): Any? {
+    return ctx?.get()
 }
+
+actual fun setContext(context: WeakReference<Any>) {
+    val actualContext = context.get() as? Context
+    if (actualContext != null) {
+        ctx = WeakReference(actualContext)
+    }
+}
\ No newline at end of file
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.android.kt
deleted file mode 100644
index 1a87b512d..000000000
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.android.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import java.util.Locale
-
-// TODO: add androidMain actual using LocaleListCompat.getAdjustedDefault() to respect
-// per-app language preferences set via AppCompatDelegate.setApplicationLocales()
-
-actual fun getCurrentLocale(): String =
-    Locale.getDefault().toLanguageTag()
-
-actual fun localizedLanguageName(ietfTag: String, localizedTo: String): String? {
-    val localeOfLangCode = Locale.forLanguageTag(ietfTag)
-    val localeOfLocalizeTo = Locale.forLanguageTag(localizedTo)
-    val displayName = localeOfLangCode.getDisplayName(localeOfLocalizeTo)
-
-    // Locale.getDisplayName() falls back to the raw tag or "language (country)" form
-    // when it doesn't know how to render the name.
-    val langCodeWithCountry = "${localeOfLangCode.language} ("
-    val failed =
-        displayName.equals(ietfTag, ignoreCase = true) ||
-        displayName.contains(langCodeWithCountry, ignoreCase = true)
-
-    return if (failed) null else displayName
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/api/ContextHelper.kt b/library/src/commonMain/kotlin/com/lagradost/api/ContextHelper.kt
index 451ec80e8..fb54e3ca9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/api/ContextHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/api/ContextHelper.kt
@@ -1,15 +1,16 @@
 package com.lagradost.api
 
-/**
- * Set context for Android-specific code such as webview.
- * Does nothing on non-Android platforms.
- */
-expect fun setContext(context: Any?)
+import java.lang.ref.WeakReference
 
+/**
+ * Set context for android specific code such as webview.
+ * Does nothing on JVM.
+ */
+expect fun setContext(context: WeakReference<Any>)
 /**
  * Helper function for Android specific context.
  * Do not use this unless absolutely necessary.
  * setContext() must be called before this is called.
- * @return Context if on Android, null if not.
+ * @return Context if on android, null if not.
  */
 expect fun getContext(): Any?
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index ca024b463..72d69dc45 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -39,8 +39,6 @@ import kotlinx.datetime.format.byUnicodePattern
 import kotlinx.datetime.format.char
 import kotlinx.datetime.format.parse
 import kotlinx.datetime.toInstant
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
 import kotlin.jvm.JvmName
@@ -97,6 +95,7 @@ class ErrorLoadingException(message: String? = null) : Exception(message)
 
 //val baseHeader = mapOf("User-Agent" to USER_AGENT)
 
+@Prerelease
 val json = Json {
     encodeDefaults = true
     explicitNulls = false
@@ -326,7 +325,7 @@ object APIHolder {
         ).toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
 
         return app.post("https://graphql.anilist.co", requestBody = data)
-            .parsedSafe<AniSearch>()
+            .parsedSafe()
     }
 }
 
@@ -394,19 +393,18 @@ const val PROVIDER_STATUS_SLOW = 2
 const val PROVIDER_STATUS_OK = 1
 const val PROVIDER_STATUS_DOWN = 0
 
-@Serializable
 data class ProvidersInfoJson(
-    @JsonProperty("name") @SerialName("name") var name: String,
-    @JsonProperty("url") @SerialName("url") var url: String,
-    @JsonProperty("credentials") @SerialName("credentials") var credentials: String? = null,
-    @JsonProperty("status") @SerialName("status") var status: Int,
+    @JsonProperty("name") var name: String,
+    @JsonProperty("url") var url: String,
+    @JsonProperty("credentials") var credentials: String? = null,
+    @JsonProperty("status") var status: Int,
 )
 
-@Serializable
 data class SettingsJson(
-    @JsonProperty("enableAdult") @SerialName("enableAdult") var enableAdult: Boolean = false,
+    @JsonProperty("enableAdult") var enableAdult: Boolean = false,
 )
 
+
 data class MainPageData(
     val name: String,
     val data: String,
@@ -761,64 +759,18 @@ fun MainAPI.fixUrl(url: String): String {
     }
 }
 
-/**
- * Sort the urls based on quality
- *
+/** Sort the urls based on quality
  * @param urls Set of [ExtractorLink]
- */
+ * */
 fun sortUrls(urls: Set<ExtractorLink>): List<ExtractorLink> {
     return urls.sortedBy { t -> -t.quality }
 }
 
-/**
- * Splits the parameters of a [Url] into a map of key-value pairs.
- *
- * Unlike a manual `split("&")` / `split("=")` implementation, this relies on Ktor's
- * built-in parameters parser ([Url.parameters]), which already handles URL-decoding,
- * malformed pairs, and parameters without a value.
- *
- * Note: if a parameter key appears multiple times (e.g. `?a=1&a=2`), only the **first**
- * value is kept, since the return type is `Map<String, String>`. Use [Url.parameters]
- * directly if you need all values for repeated keys.
- *
- * @param url the [Url] whose parameters should be extracted.
- * @return a map of decoded parameter names to their first decoded value.
- *
- * @sample
- * splitUrlParameters(Url("https://example.com/path?foo=bar&baz=qux"))
- * // returns {"foo": "bar", "baz": "qux"}
- */
-@Prerelease
-fun splitUrlParameters(url: Url): Map<String, String> {
-    return url.parameters.entries().associate { (key, values) -> key to values.firstOrNull().orEmpty() }
-}
-
-/**
- * Splits the parameters of a raw URL [String] into a map of key-value pairs.
- *
- * Convenience overload for callers that have a URL as plain text rather than a parsed
- * [Url] instance. Internally parses [url] with Ktor's [Url] constructor and delegates
- * to [splitUrlParameters].
- *
- * @param url the URL string whose parameters should be extracted.
- * @return a map of decoded parameter names to their first decoded value.
- *
- * @sample
- * splitUrlParameters("https://example.com/path?foo=bar&baz=qux")
- * // returns {"foo": "bar", "baz": "qux"}
- */
-@Prerelease
-fun splitUrlParameters(url: String): Map<String, String> {
-    return splitUrlParameters(Url(url))
-}
-
-/**
- * Capitalize the first letter of string.
- *
+/** Capitalize the first letter of string.
  * @param str String to be capitalized
  * @return non-nullable String
  * @see capitalizeStringNullable
- */
+ * */
 fun capitalizeString(str: String): String {
     return capitalizeStringNullable(str) ?: str
 }
@@ -845,10 +797,18 @@ fun fixTitle(str: String): String {
     }
 }
 
-@Deprecated(
-    message = "Use newJsContext or evalJs instead.",
+/**
+ * Get rhino context in a safe way as it needs to be initialized on the main thread.
+ *
+ * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects()
+ *
+ * Use like the following: rhino.evaluateString(scope, js, "JavaScript", 1, null)
+ **/
+// Deprecate after next stable
+/* @Deprecated(
+    message = "Use JsContext or evalJs instead.",
     level = DeprecationLevel.WARNING,
-)
+) */
 suspend fun getRhinoContext(): org.mozilla.javascript.Context {
     return Coroutines.mainWork {
         val rhino = org.mozilla.javascript.Context.enter()
@@ -915,10 +875,10 @@ enum class DubStatus(val id: Int) {
  * of this as a decimal class specifically for ratings.
  * */
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
-@Serializable
 class Score private constructor(
     /** Decimal between [0, 10^9] representing the min score and max score respectively */
-    @JsonProperty("data") @SerialName("data") private val data: Int,
+    @JsonProperty("data")
+    private val data: Int,
 ) {
     override fun hashCode(): Int = this.data.hashCode()
     override fun equals(other: Any?): Boolean = other is Score && this.data == other.data
@@ -1138,6 +1098,7 @@ enum class TvType(value: Int?) {
 
     Audio(16),
     Podcast(17),
+    @Prerelease
     Video(18),
 }
 
@@ -1243,10 +1204,9 @@ suspend fun newSubtitleFile(
  * @see newAudioFile
  * */
 @ConsistentCopyVisibility
-@Serializable
 data class AudioFile internal constructor(
-    @JsonProperty("url") @SerialName("url") var url: String,
-    @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String>? = null,
+    var url: String,
+    var headers: Map<String, String>? = null
 )
 
 /** Creates an AudioFile with optional initializer for setting additional properties.
@@ -1869,7 +1829,7 @@ interface LoadResponse {
 
         /** Read the id string to get all other ids */
         fun readIdFromString(idString: String?): Map<SimklSyncServices, String> {
-            return tryParseJson<Map<SimklSyncServices, String>>(idString) ?: return emptyMap()
+            return tryParseJson(idString) ?: return emptyMap()
         }
 
         fun LoadResponse.isMovie(): Boolean {
@@ -2223,11 +2183,10 @@ data class NextAiring(
  * @param name To be shown next to the season like "Season $displaySeason $name" but if displaySeason is null then "$name"
  * @param displaySeason What to be displayed next to the season name, if null then the name is the only thing shown.
  * */
-@Serializable
 data class SeasonData(
-    @JsonProperty("season") @SerialName("season") val season: Int,
-    @JsonProperty("name") @SerialName("name") val name: String? = null,
-    @JsonProperty("displaySeason") @SerialName("displaySeason") val displaySeason: Int? = null, // will use season if null
+    val season: Int,
+    val name: String? = null,
+    val displaySeason: Int? = null, // will use season if null
 )
 
 /** Abstract interface of EpisodeResponse */
@@ -2576,21 +2535,13 @@ constructor(
 
 @OptIn(FormatStringsInDatetimeFormats::class)
 fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
-    if (date.isNullOrBlank()) return
+    if (date == null) return
     this.date = runCatching {
         // First try standard ISO 8601 (e.g. "2026-01-01T12:30:00.000Z", "2026-05-17T14:35+02:00")
         runCatching { Instant.parse(date).toEpochMilliseconds() }
             .getOrElse {
                 val fmt = DateTimeComponents.Format { byUnicodePattern(format) }
-
-                // Try parsing the full date first then only parse the beginning of the string
-                // May lose time, but better than failing.
-                val components = runCatching {
-                    DateTimeComponents.parse(date, fmt)
-                }.recoverCatching {
-                    DateTimeComponents.parse(date.trimStart().take(format.length), fmt)
-                }.getOrThrow()
-
+                val components = DateTimeComponents.parse(date, fmt)
                 /**
                  * Try multiple conversions in order of precision for non-ISO-8601 formats,
                  * since the date string may or may not include time and/or timezone offset:
@@ -2605,18 +2556,21 @@ fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
     }.onFailure { logError(it) }.getOrNull()
 }
 
+@Prerelease
 fun Episode.addDate(date: LocalDate?) {
     this.date = date?.atStartOfDayIn(TimeZone.currentSystemDefault())?.toEpochMilliseconds()
 }
 
+@Prerelease
 fun Episode.addDate(date: Instant?) {
     this.date = date?.toEpochMilliseconds()
 }
 
-@Deprecated(
+// Deprecate after next stable
+/* @Deprecated(
     message = "Use addDate with LocalDate, Instant, or String instead.",
     level = DeprecationLevel.WARNING,
-)
+) */
 fun Episode.addDate(date: java.util.Date?) {
     this.date = date?.time
 }
@@ -2754,6 +2708,7 @@ fun fetchUrls(text: String?): List<String> {
     return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
 }
 
+@Prerelease
 fun isUpcoming(dateString: String?): Boolean {
     return runCatching {
         val fmt = DateTimeComponents.Format {
@@ -2789,38 +2744,32 @@ data class Tracker(
     val cover: String? = null,
 )
 
-@Serializable
 data class AniSearch(
-    @JsonProperty("data") @SerialName("data") var data: Data? = Data(),
+    @JsonProperty("data") var data: Data? = Data()
 ) {
-    @Serializable
     data class Data(
-        @JsonProperty("Page") @SerialName("Page") var page: Page? = Page(),
+        @JsonProperty("Page") var page: Page? = Page()
     ) {
-        @Serializable
         data class Page(
-            @JsonProperty("media") @SerialName("media") var media: ArrayList<Media> = arrayListOf(),
+            @JsonProperty("media") var media: ArrayList<Media> = arrayListOf()
         ) {
-            @Serializable
             data class Media(
-                @JsonProperty("title") @SerialName("title") var title: Title? = null,
-                @JsonProperty("id") @SerialName("id") var id: Int? = null,
-                @JsonProperty("idMal") @SerialName("idMal") var idMal: Int? = null,
-                @JsonProperty("seasonYear") @SerialName("seasonYear") var seasonYear: Int? = null,
-                @JsonProperty("format") @SerialName("format") var format: String? = null,
-                @JsonProperty("coverImage") @SerialName("coverImage") var coverImage: CoverImage? = null,
-                @JsonProperty("bannerImage") @SerialName("bannerImage") var bannerImage: String? = null,
+                @JsonProperty("title") var title: Title? = null,
+                @JsonProperty("id") var id: Int? = null,
+                @JsonProperty("idMal") var idMal: Int? = null,
+                @JsonProperty("seasonYear") var seasonYear: Int? = null,
+                @JsonProperty("format") var format: String? = null,
+                @JsonProperty("coverImage") var coverImage: CoverImage? = null,
+                @JsonProperty("bannerImage") var bannerImage: String? = null,
             ) {
-                @Serializable
                 data class CoverImage(
-                    @JsonProperty("extraLarge") @SerialName("extraLarge") var extraLarge: String? = null,
-                    @JsonProperty("large") @SerialName("large") var large: String? = null,
+                    @JsonProperty("extraLarge") var extraLarge: String? = null,
+                    @JsonProperty("large") var large: String? = null,
                 )
 
-                @Serializable
                 data class Title(
-                    @JsonProperty("romaji") @SerialName("romaji") var romaji: String? = null,
-                    @JsonProperty("english") @SerialName("english") var english: String? = null,
+                    @JsonProperty("romaji") var romaji: String? = null,
+                    @JsonProperty("english") var english: String? = null,
                 ) {
                     fun isMatchingTitles(title: String?): Boolean {
                         if (title == null) return false
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
index dc8317fa0..127b075da 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
@@ -33,6 +33,7 @@ var app = Requests(responseParser = jsonResponseParser).apply {
 
 /** Same as the default app networking helper, but this instance ignores SSL certificates.
  * This should NEVER be used for sensitive networking operations such as logins. Only use this when required. */
+@Prerelease
 @UnsafeSSL
 var insecureApp = Requests(responseParser = jsonResponseParser).apply {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
index 0f33a6ff6..9e6cb99e5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
@@ -122,27 +122,4 @@ suspend fun <R> runAllAsync(
             }
         }
     }.map { it.await() }
-}
-
-/** amap with stronger cancellation guarantee, aka will only return when each job is joined */
-@OptIn(DelicateCoroutinesApi::class)
-@InternalAPI
-@Throws
-suspend fun <A, B> Collection<A>.cmap(f: suspend (A) -> B): List<B> =
-    with(CoroutineScope(currentCoroutineContext())) {
-        // 1. Spawn all jobs
-        map { async { f(it) } }.map { deferred ->
-            // 2. Await all jobs without throwing, and join if canceled
-            try {
-                Result.success(deferred.await())
-            } catch (e: CancellationException) {
-                withContext(NonCancellable) {
-                    deferred.join()
-                }
-                Result.failure(e)
-            } catch (t : Throwable) {
-                Result.failure(t)
-            }
-            // 3. Throw if something goes wrong
-        }.map { it.getOrThrow() }
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Acefile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Acefile.kt
index 5b214c5dd..a86c5f01a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Acefile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Acefile.kt
@@ -1,11 +1,8 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Acefile : ExtractorApi() {
     override val name = "Acefile"
@@ -16,7 +13,7 @@ open class Acefile : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val id = "/(?:d|download|player|f|file)/(\\w+)".toRegex().find(url)?.groupValues?.get(1)
         val script = getAndUnpack(app.get("$mainUrl/player/${id ?: return}").text)
@@ -30,14 +27,14 @@ open class Acefile : ExtractorApi() {
             newExtractorLink(
                 this.name,
                 this.name,
-                video ?: return,
+                video ?: return
             )
         )
 
     }
 
-    @Serializable
     data class Source(
-        @JsonProperty("data") @SerialName("data") val data: String? = null,
+        val data: String? = null,
     )
-}
+
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt
index e00ffcb57..a9f4a3eb9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt
@@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Blogger : ExtractorApi() {
     override val name = "Blogger"
@@ -24,10 +22,10 @@ open class Blogger : ExtractorApi() {
                             newExtractorLink(
                                 name,
                                 name,
-                                it.playUrl,
+                                it.play_url,
                             ) {
                                 this.referer = "https://www.youtube.com/"
-                                this.quality = when (it.formatId) {
+                                this.quality = when (it.format_id) {
                                     18 -> 360
                                     22 -> 720
                                     else -> Qualities.Unknown.value
@@ -38,13 +36,11 @@ open class Blogger : ExtractorApi() {
                 }
             }
         }
-
         return sources
     }
 
-    @Serializable
     private data class ResponseSource(
-        @JsonProperty("play_url") @SerialName("play_url") val playUrl: String,
-        @JsonProperty("format_id") @SerialName("format_id") val formatId: Int,
+        @JsonProperty("play_url") val play_url: String,
+        @JsonProperty("format_id") val format_id: Int
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
index 4781474d6..248b94a73 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
@@ -13,32 +13,30 @@ import dev.whyoleg.cryptography.DelicateCryptographyApi
 import dev.whyoleg.cryptography.algorithms.AES
 import io.ktor.http.Url
 import io.ktor.http.decodeURLPart
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class Bysezejataos : ByseSX() {
-    override val name = "Bysezejataos"
-    override val mainUrl = "https://bysezejataos.com"
+    override var name = "Bysezejataos"
+    override var mainUrl = "https://bysezejataos.com"
 }
 
 class ByseBuho : ByseSX() {
-    override val name = "ByseBuho"
-    override val mainUrl = "https://bysebuho.com"
+    override var name = "ByseBuho"
+    override var mainUrl = "https://bysebuho.com"
 }
 
 class ByseVepoin : ByseSX() {
-    override val name = "ByseVepoin"
-    override val mainUrl = "https://bysevepoin.com"
+    override var name = "ByseVepoin"
+    override var mainUrl = "https://bysevepoin.com"
 }
 
 class ByseQekaho : ByseSX() {
-    override val name = "ByseQekaho"
-    override val mainUrl = "https://byseqekaho.com"
+    override var name = "ByseQekaho"
+    override var mainUrl = "https://byseqekaho.com"
 }
 
 open class ByseSX : ExtractorApi() {
-    override val name = "Byse"
-    override val mainUrl = "https://byse.sx"
+    override var name = "Byse"
+    override var mainUrl = "https://byse.sx"
     override val requiresReferer = true
 
     private val aesGcm = CryptographyProvider.Default.get(AES.GCM)
@@ -88,15 +86,15 @@ open class ByseSX : ExtractorApi() {
     }
 
     @OptIn(DelicateCryptographyApi::class)
-    private suspend fun decryptPlayback(playback: Playback): String? {
+    private fun decryptPlayback(playback: Playback): String? {
         val keyBytes = buildAesKey(playback)
         val ivBytes = b64UrlDecode(playback.iv)
         val cipherBytes = b64UrlDecode(playback.payload)
 
-        val aesKey = aesGcm.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesGcm.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
         // 128-bit GCM tag (default)
         val cipher = aesKey.cipher()
-        val plainBytes = cipher.decryptWithIv(ivBytes, cipherBytes)
+        val plainBytes = cipher.decryptWithIvBlocking(ivBytes, cipherBytes)
 
         var jsonStr = plainBytes.decodeToString()
         if (jsonStr.startsWith("\uFEFF")) jsonStr = jsonStr.substring(1)
@@ -114,7 +112,7 @@ open class ByseSX : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val refererUrl = getBaseUrl(url)
         val playbackRoot = getPlayback(url) ?: return
@@ -125,58 +123,64 @@ open class ByseSX : ExtractorApi() {
             name,
             streamUrl,
             mainUrl,
-            headers = headers,
+            headers = headers
         ).forEach(callback)
     }
 }
 
-@Serializable
 data class DetailsRoot(
-    @JsonProperty("id") @SerialName("id") val id: Long,
-    @JsonProperty("code") @SerialName("code") val code: String,
-    @JsonProperty("title") @SerialName("title") val title: String,
-    @JsonProperty("poster_url") @SerialName("poster_url") val posterUrl: String,
-    @JsonProperty("description") @SerialName("description") val description: String,
-    @JsonProperty("created_at") @SerialName("created_at") val createdAt: String,
-    @JsonProperty("owner_private") @SerialName("owner_private") val ownerPrivate: Boolean,
-    @JsonProperty("embed_frame_url") @SerialName("embed_frame_url") val embedFrameUrl: String,
+    val id: Long,
+    val code: String,
+    val title: String,
+    @JsonProperty("poster_url")
+    val posterUrl: String,
+    val description: String,
+    @JsonProperty("created_at")
+    val createdAt: String,
+    @JsonProperty("owner_private")
+    val ownerPrivate: Boolean,
+    @JsonProperty("embed_frame_url")
+    val embedFrameUrl: String,
 )
 
-@Serializable
 data class PlaybackRoot(
-    @JsonProperty("playback") @SerialName("playback") val playback: Playback,
+    val playback: Playback,
 )
 
-@Serializable
 data class Playback(
-    @JsonProperty("algorithm") @SerialName("algorithm") val algorithm: String,
-    @JsonProperty("iv") @SerialName("iv") val iv: String,
-    @JsonProperty("payload") @SerialName("payload") val payload: String,
-    @JsonProperty("key_parts") @SerialName("key_parts") val keyParts: List<String>,
-    @JsonProperty("expires_at") @SerialName("expires_at") val expiresAt: String,
-    @JsonProperty("decrypt_keys") @SerialName("decrypt_keys") val decryptKeys: DecryptKeys,
-    @JsonProperty("iv2") @SerialName("iv2") val iv2: String,
-    @JsonProperty("payload2") @SerialName("payload2") val payload2: String,
+    val algorithm: String,
+    val iv: String,
+    val payload: String,
+    @JsonProperty("key_parts")
+    val keyParts: List<String>,
+    @JsonProperty("expires_at")
+    val expiresAt: String,
+    @JsonProperty("decrypt_keys")
+    val decryptKeys: DecryptKeys,
+    val iv2: String,
+    val payload2: String,
 )
 
-@Serializable
 data class DecryptKeys(
-    @JsonProperty("edge_1") @SerialName("edge_1") val edge1: String,
-    @JsonProperty("edge_2") @SerialName("edge_2") val edge2: String,
-    @JsonProperty("legacy_fallback") @SerialName("legacy_fallback") val legacyFallback: String,
+    @JsonProperty("edge_1")
+    val edge1: String,
+    @JsonProperty("edge_2")
+    val edge2: String,
+    @JsonProperty("legacy_fallback")
+    val legacyFallback: String,
 )
 
-@Serializable
 data class PlaybackDecrypt(
-    @JsonProperty("sources") @SerialName("sources") val sources: List<PlaybackDecryptSource>,
+    val sources: List<PlaybackDecryptSource>,
 )
 
-@Serializable
 data class PlaybackDecryptSource(
-    @JsonProperty("quality") @SerialName("quality") val quality: String,
-    @JsonProperty("label") @SerialName("label") val label: String,
-    @JsonProperty("mime_type") @SerialName("mime_type") val mimeType: String,
-    @JsonProperty("url") @SerialName("url") val url: String,
-    @JsonProperty("bitrate_kbps") @SerialName("bitrate_kbps") val bitrateKbps: Long,
-    @JsonProperty("height") @SerialName("height") val height: Int?,
+    val quality: String,
+    val label: String,
+    @JsonProperty("mime_type")
+    val mimeType: String,
+    val url: String,
+    @JsonProperty("bitrate_kbps")
+    val bitrateKbps: Long,
+    val height: Any?,
 )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
index 3b5189f0e..5c9f58efc 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
@@ -9,8 +8,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.StringUtils.decodeUrl
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Cda : ExtractorApi() {
     override var mainUrl = "https://ebd.cda.pl"
@@ -25,7 +22,7 @@ open class Cda : ExtractorApi() {
             "https://ebd.cda.pl/647x500/$mediaId", headers = mapOf(
                 "Referer" to "https://ebd.cda.pl/647x500/$mediaId",
                 "User-Agent" to USER_AGENT,
-                "Cookie" to "cda.player=html5",
+                "Cookie" to "cda.player=html5"
             )
         ).document
         val dataRaw = doc.selectFirst("[player_data]")?.attr("player_data") ?: return null
@@ -89,17 +86,15 @@ open class Cda : ExtractorApi() {
         else -> a
     }
 
-    @Serializable
     data class VideoPlayerData(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("qualities") @SerialName("qualities") val qualities: Map<String, String> = mapOf(),
-        @JsonProperty("quality") @SerialName("quality") val quality: String?,
-        @JsonProperty("ts") @SerialName("ts") val ts: Int?,
-        @JsonProperty("hash2") @SerialName("hash2") val hash2: String?,
+        val file: String,
+        val qualities: Map<String, String> = mapOf(),
+        val quality: String?,
+        val ts: Int?,
+        val hash2: String?
     )
 
-    @Serializable
     data class PlayerData(
-        @JsonProperty("video") @SerialName("video") val video: VideoPlayerData,
+        val video: VideoPlayerData
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
index 88b407f3b..2b2a820fe 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@@ -1,18 +1,15 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.Gson
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.newSubtitleFile
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import io.ktor.http.Url
 import io.ktor.http.decodeURLPart
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class Geodailymotion : Dailymotion() {
     override val name = "GeoDailymotion"
@@ -31,25 +28,25 @@ open class Dailymotion : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val embedUrl = getEmbedUrl(url) ?: return
         val id = getVideoId(embedUrl) ?: return
-        val metadataUrl = "$baseUrl/player/metadata/video/$id"
+        val metaDataUrl = "$baseUrl/player/metadata/video/$id"
+
+        val response = app.get(metaDataUrl, referer = embedUrl).text
+        val gson = Gson()
+        val meta = gson.fromJson(response, MetaData::class.java)
 
-        val response = app.get(metadataUrl, referer = embedUrl).text
-        val meta = parseJson<Metadata>(response)
         meta.qualities?.get("auto")?.forEach { quality ->
             val videoUrl = quality.url
             if (!videoUrl.isNullOrEmpty() && videoUrl.contains(".m3u8")) {
-                callback.invoke(
-                    newExtractorLink(
-                        name,
-                        name,
-                        videoUrl,
-                        ExtractorLinkType.M3U8,
-                    )
-                )
+                callback.invoke(newExtractorLink(
+                    name,
+                    name,
+                    videoUrl,
+                    ExtractorLinkType.M3U8
+                ))
             }
         }
 
@@ -58,7 +55,7 @@ open class Dailymotion : ExtractorApi() {
                 subtitleCallback(
                     newSubtitleFile(
                         subData.label,
-                        subUrl,
+                        subUrl
                     )
                 )
             }
@@ -71,7 +68,6 @@ open class Dailymotion : ExtractorApi() {
             val videoId = url.substringAfter("video=")
             return "$baseUrl/embed/video/$videoId"
         }
-
         return null
     }
 
@@ -81,27 +77,23 @@ open class Dailymotion : ExtractorApi() {
         return if (id.matches(videoIdRegex)) id else null
     }
 
-    @Serializable
-    data class Metadata(
-        @JsonProperty("qualities") @SerialName("qualities") val qualities: Map<String, List<Quality>>?,
-        @JsonProperty("subtitles") @SerialName("subtitles") val subtitles: SubtitlesWrapper?,
+    data class MetaData(
+        val qualities: Map<String, List<Quality>>?,
+        val subtitles: SubtitlesWrapper?
     )
 
-    @Serializable
     data class Quality(
-        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
+        val type: String?,
+        val url: String?
     )
 
-    @Serializable
     data class SubtitlesWrapper(
-        @JsonProperty("enable") @SerialName("enable") val enable: Boolean,
-        @JsonProperty("data") @SerialName("data") val data: Map<String, SubtitleData>?,
+        val enable: Boolean,
+        val data: Map<String, SubtitleData>?
     )
 
-    @Serializable
     data class SubtitleData(
-        @JsonProperty("label") @SerialName("label") val label: String,
-        @JsonProperty("urls") @SerialName("urls") val urls: List<String>,
+        val label: String,
+        val urls: List<String>
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 9117d1d78..099406f16 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -88,6 +88,7 @@ class MyVidPlay : DoodLaExtractor() {
     override var mainUrl = "https://myvidplay.com"
 }
 
+@Prerelease
 class Playmogo : DoodLaExtractor() {
     override var mainUrl = "https://playmogo.com"
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt
index ca821b21c..f4a5cdb2b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt
@@ -8,33 +8,35 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
 open class EmturbovidExtractor : ExtractorApi() {
-    override val name = "Emturbovid"
-    override val mainUrl = "https://emturbovid.com"
+    override var name = "Emturbovid"
+    override var mainUrl = "https://emturbovid.com"
     override val requiresReferer = false
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(url, referer = referer ?: "$mainUrl/")
-        val playerScript = response.document
-            .select("script")
-            .first { it.data().contains("var urlPlay") }
-            .html()
+        val response = app.get(
+            url, referer = referer ?: "$mainUrl/"
+        )
+        val playerScript =
+            response.document.selectXpath("//script[contains(text(),'var urlPlay')]")
+                .html()
 
         val sources = mutableListOf<ExtractorLink>()
         if (playerScript.isNotBlank()) {
-            val m3u8Url = playerScript.substringAfter("var urlPlay = '").substringBefore("'")
+            val m3u8Url =
+                playerScript.substringAfter("var urlPlay = '").substringBefore("'")
+
             sources.add(
                 newExtractorLink(
                     source = name,
                     name = name,
                     url = m3u8Url,
-                    type = ExtractorLinkType.M3U8,
+                    type = ExtractorLinkType.M3U8
                 ) {
                     this.referer = "$mainUrl/"
                     this.quality = Qualities.Unknown.value
                 }
             )
         }
-
         return sources
     }
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Firestream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Firestream.kt
index c4a74b908..c8ef5d0ac 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Firestream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Firestream.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
@@ -11,34 +10,32 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Prerelease
-class FirestreamSite : Firestream() {
-    override val mainUrl = "https://firestream.site"
-}
-
-open class Firestream : ExtractorApi() {
-    override val name = "Firestream"
-    override val mainUrl = "https://firestream.to"
-    override val requiresReferer = false
+class Firestream : ExtractorApi() {
+    override val name: String = "Firestream"
+    override val mainUrl: String = "https://firestream.to"
+    override val requiresReferer: Boolean = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
-        val id = url.removeSuffix("/").substringAfterLast("/").substringBefore("?")
+        val id = url.removeSuffix("/").substringAfterLast("/")
         val url = getExtractorUrl(id)
 
         val doc = app.get(url).document
         val token = doc.selectFirst("script[id=token-blob]")!!.data()
-        val videoResponse = app.post("$mainUrl/api/videos/$id/resolve", json = mapOf("blob" to token))
-            .parsed<VideoResponse>()
+
+        val videoResponse =
+            app.post("$mainUrl/api/videos/$id/resolve", json = mapOf("blob" to token))
+                .parsed<VideoResponse>()
 
         callback.invoke(
             newExtractorLink(
                 source = name,
                 name = name,
-                url = videoResponse.signedVideoUrl,
+                url = videoResponse.signedVideoUrl
             )
         )
     }
@@ -49,6 +46,7 @@ open class Firestream : ExtractorApi() {
 
     @Serializable
     private data class VideoResponse(
-        @JsonProperty("signedVideoUrl") @SerialName("signedVideoUrl") val signedVideoUrl: String,
+        @SerialName("signedVideoUrl")
+        val signedVideoUrl: String,
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt
index b58827652..eb6d474a5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt
@@ -10,17 +10,18 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+@Prerelease
 open class Flyfile : ExtractorApi() {
-    override val name = "FlyFile"
-    override val mainUrl = "https://flyfile.app"
-    override val requiresReferer = false
+    override val name: String = "FlyFile"
+    override val mainUrl: String = "https://flyfile.app"
     open val apiUrl: String = "https://api.flyfile.app"
+    override val requiresReferer: Boolean = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val videoId = url.substringAfterLast("/")
         val videoInfo = app.get("$apiUrl/api/streaming/assign/$videoId")
@@ -32,14 +33,16 @@ open class Flyfile : ExtractorApi() {
                 source = name,
                 name = name,
                 url = streamUrl,
-                type = ExtractorLinkType.M3U8,
+                type = ExtractorLinkType.M3U8
             )
         )
     }
 
     @Serializable
     private data class StreamInfo(
-        @SerialName("url") val url: String,
-        @SerialName("token") val token: String,
+        @SerialName("url")
+        val url: String,
+        @SerialName("token")
+        val token: String
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
index b6563fd63..ba297067e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
@@ -1,34 +1,31 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.JsonParser
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
 import io.ktor.http.Url
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
-class Techinmind : GDMirrorbot() {
-    override val name = "Techinmind Cloud AIO"
-    override val mainUrl = "https://stream.techinmind.space"
-    override val requiresReferer = true
+class Techinmind: GDMirrorbot() {
+    override var name = "Techinmind Cloud AIO"
+    override var mainUrl = "https://stream.techinmind.space"
+    override var requiresReferer = true
 }
 
 open class GDMirrorbot : ExtractorApi() {
-    override val name = "GDMirrorbot"
-    override val mainUrl = "https://gdmirrorbot.nl"
+    override var name = "GDMirrorbot"
+    override var mainUrl = "https://gdmirrorbot.nl"
     override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val (sid, host) = if (!url.contains("key=")) {
             Pair(url.substringAfterLast("embed/"), getBaseUrl(app.get(url).url))
@@ -39,58 +36,63 @@ open class GDMirrorbot : ExtractorApi() {
             val idType = Regex("""idType\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1) ?: "imdbid"
             val baseUrl = Regex("""let\s+baseUrl\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1)
             val hostUrl = baseUrl?.let { getBaseUrl(it) }
+
             if (finalId != null && myKey != null) {
                 val apiUrl = if (url.contains("/tv/")) {
                     val season = Regex("""/tv/\d+/(\d+)/""").find(url)?.groupValues?.get(1) ?: "1"
                     val episode = Regex("""/tv/\d+/\d+/(\d+)""").find(url)?.groupValues?.get(1) ?: "1"
                     "$mainUrl/myseriesapi?tmdbid=$finalId&season=$season&epname=$episode&key=$myKey"
-                } else "$mainUrl/mymovieapi?$idType=$finalId&key=$myKey"
+                } else {
+                    "$mainUrl/mymovieapi?$idType=$finalId&key=$myKey"
+                }
                 pageText = app.get(apiUrl).text
             }
 
-            val embedData = tryParseJson<EmbedData>(pageText)
+            val jsonElement = JsonParser.parseString(pageText)
+            if (!jsonElement.isJsonObject) return
+            val jsonObject = jsonElement.asJsonObject
+
             val embedId = url.substringAfterLast("/")
-            val sidValue = embedData?.data?.firstOrNull()?.fileSlug
+            val sidValue = jsonObject["data"]?.asJsonArray
+                ?.takeIf { it.size() > 0 }
+                ?.get(0)?.asJsonObject
+                ?.get("fileslug")?.asString
                 ?.takeIf { it.isNotBlank() } ?: embedId
+
             Pair(sidValue, hostUrl)
         }
 
         val postData = mapOf("sid" to sid)
         val responseText = app.post("$host/embedhelper.php", data = postData).text
 
-        val root = tryParseJson<EmbedHelper>(responseText) ?: return
-        val siteUrls = root.siteUrls ?: return
-        val siteFriendlyNames = root.siteFriendlyNames
+        val rootElement = JsonParser.parseString(responseText)
+        if (!rootElement.isJsonObject) return
+        val root = rootElement.asJsonObject
 
-        // mresult can arrive as a JSON object or a base64-encoded string
-        val mresult: Map<String, String>? = run {
-            val raw = responseText
-                .substringAfter("\"mresult\":")
-                .trimStart()
-            when {
-                raw.startsWith("\"") -> {
-                    // base64-encoded string
-                    tryParseJson<Map<String, String>>(
-                        try { base64Decode(raw.trim('"')) } catch (_: Exception) { return }
-                    )
-                }
-                raw.startsWith("{") -> tryParseJson<Map<String, String>>(
-                    raw.substringBefore("\n}").substringBefore(",\n\"").let { "$it" }
-                        .let { responseText.substringAfter("\"mresult\":").trimStart() }
-                )
-                else -> null
+        val siteUrls = root["siteUrls"]?.asJsonObject ?: return
+        val siteFriendlyNames = root["siteFriendlyNames"]?.asJsonObject
+
+        val decodedMresult = when {
+            root["mresult"]?.isJsonObject == true -> root["mresult"]!!.asJsonObject
+            root["mresult"]?.isJsonPrimitive == true -> try {
+                base64Decode(root["mresult"]!!.asString)
+                    .let { JsonParser.parseString(it).asJsonObject }
+            } catch (e: Exception) {
+                Log.e("GDMirrorbot", "Failed to decode mresult: $e")
+                return
             }
+            else -> return
         }
 
-        if (mresult == null) return
-        siteUrls.keys.intersect(mresult.keys).forEach { key ->
-            val base = siteUrls[key]?.trimEnd('/') ?: return@forEach
-            val path = mresult[key]?.trimStart('/') ?: return@forEach
+        siteUrls.keySet().intersect(decodedMresult.keySet()).forEach { key ->
+            val base = siteUrls[key]?.asString?.trimEnd('/') ?: return@forEach
+            val path = decodedMresult[key]?.asString?.trimStart('/') ?: return@forEach
             val fullUrl = "$base/$path"
-            val friendlyName = siteFriendlyNames?.get(key) ?: key
+            val friendlyName = siteFriendlyNames?.get(key)?.asString ?: key
+
             try {
                 when (friendlyName) {
-                    "StreamHG", "EarnVids" -> VidHidePro().getUrl(fullUrl, referer, subtitleCallback, callback)
+                    "StreamHG","EarnVids" -> VidHidePro().getUrl(fullUrl, referer, subtitleCallback, callback)
                     "RpmShare", "UpnShare", "StreamP2p" -> VidStack().getUrl(fullUrl, referer, subtitleCallback, callback)
                     else -> loadExtractor(fullUrl, referer ?: mainUrl, subtitleCallback, callback)
                 }
@@ -103,20 +105,5 @@ open class GDMirrorbot : ExtractorApi() {
     private fun getBaseUrl(url: String): String {
         return Url(url).let { "${it.protocol.name}://${it.host}" }
     }
-
-    @Serializable
-    private data class EmbedData(
-        @JsonProperty("data") @SerialName("data") val data: List<FileSlug>? = null,
-    )
-
-    @Serializable
-    private data class FileSlug(
-        @JsonProperty("fileslug") @SerialName("fileslug") val fileSlug: String? = null,
-    )
-
-    @Serializable
-    private data class EmbedHelper(
-        @JsonProperty("siteUrls") @SerialName("siteUrls") val siteUrls: Map<String, String>? = null,
-        @JsonProperty("siteFriendlyNames") @SerialName("siteFriendlyNames") val siteFriendlyNames: Map<String, String>? = null,
-    )
 }
+
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt
index 8fb0ae046..1203b2167 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt
@@ -4,14 +4,11 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
 
 open class GUpload: ExtractorApi() {
     override val name: String = "GUpload"
@@ -22,12 +19,12 @@ open class GUpload: ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val response = app.get(url, referer = referer).text
 
         val playerConfigString = response.substringAfter("const config = ").substringBefore(";")
-        val playerConfig = parseJson<VideoInfo>(playerConfigString)
+        val playerConfig = AppUtils.parseJson<VideoInfo>(playerConfigString)
 
         callback.invoke(
             newExtractorLink(
@@ -42,15 +39,14 @@ open class GUpload: ExtractorApi() {
         )
     }
 
-    @Serializable
     private data class VideoInfo(
-        @JsonProperty("videoUrl") @SerialName("videoUrl") val videoUrl: String,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") val posterUrl: String? = null,
-        @JsonProperty("videoId") @SerialName("videoId") val videoId: String? = null,
-        @JsonProperty("primaryColor") @SerialName("primaryColor") val primaryColor: String? = null,
-        @JsonProperty("audioTracks") @SerialName("audioTracks") val audioTracks: List<JsonElement> = emptyList(),
-        @JsonProperty("subtitleTracks") @SerialName("subtitleTracks") val subtitleTracks: List<JsonElement> = emptyList(),
-        @JsonProperty("vastFallbackList") @SerialName("vastFallbackList") val vastFallbackList: List<String> = emptyList(),
-        @JsonProperty("videoOwnerId") @SerialName("videoOwnerId") val videoOwnerId: Long = 0,
+        @JsonProperty("videoUrl") val videoUrl: String,
+        @JsonProperty("posterUrl") val posterUrl: String? = null,
+        @JsonProperty("videoId") val videoId: String? = null,
+        @JsonProperty("primaryColor") val primaryColor: String? = null,
+        @JsonProperty("audioTracks") val audioTracks: List<Any?> = emptyList(),
+        @JsonProperty("subtitleTracks") val subtitleTracks: List<Any?> = emptyList(),
+        @JsonProperty("vastFallbackList") val vastFallbackList: List<String> = emptyList(),
+        @JsonProperty("videoOwnerId") val videoOwnerId: Long = 0,
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
index 10abcce31..f484d766c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
@@ -5,16 +5,14 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import org.jsoup.nodes.Element
 
 class DatabaseGdrive2 : Gdriveplayer() {
-    override val mainUrl = "https://databasegdriveplayer.co"
+    override var mainUrl = "https://databasegdriveplayer.co"
 }
 
 class DatabaseGdrive : Gdriveplayer() {
-    override val mainUrl = "https://series.databasegdriveplayer.co"
+    override var mainUrl = "https://series.databasegdriveplayer.co"
 }
 
 class Gdriveplayerapi : Gdriveplayer() {
@@ -75,9 +73,10 @@ open class Gdriveplayer : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val document = app.get(url).document
+
         val eval = unpackJs(document)?.replace("\\", "") ?: return
         val data = Regex("data='(\\S+?)'").first(eval) ?: return
         val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
@@ -85,9 +84,9 @@ open class Gdriveplayer : ExtractorApi() {
             ?.joinToString("") {
                 it.toInt().toChar().toString()
             }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.encodeToByteArray() }
-                ?: throw ErrorLoadingException("can't find password")
-
+            ?: throw ErrorLoadingException("can't find password")
         val decryptedData = cryptoAESHandler(data, password, false, false)?.let { getAndUnpack(it) }?.replace("\\", "")
+
         val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],")
         val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],")
 
@@ -112,17 +111,16 @@ open class Gdriveplayer : ExtractorApi() {
                 subtitleCallback.invoke(
                     newSubtitleFile(
                         sub.label,
-                        httpsify(sub.file),
+                        httpsify(sub.file)
                     )
                 )
             }
         }
     }
 
-    @Serializable
     data class Tracks(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("kind") @SerialName("kind") val kind: String,
-        @JsonProperty("label") @SerialName("label") val label: String,
+        @JsonProperty("file") val file: String,
+        @JsonProperty("kind") val kind: String,
+        @JsonProperty("label") val label: String,
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
index 9edc54a41..2b42e42c7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
@@ -8,8 +8,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import kotlin.math.round
 
 open class Gofile : ExtractorApi() {
@@ -22,18 +20,20 @@ open class Gofile : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1) ?: return
+
         val token = app.post(
             "$mainApi/accounts",
         ).parsedSafe<AccountResponse>()?.data?.token ?: return
 
         val globalRes = app.get("$mainUrl/dist/js/config.js").text
         val wt = Regex("""appdata\.wt\s*=\s*[\"']([^\"']+)[\"']""").find(globalRes)?.groupValues?.get(1) ?: return
+
         val headers = mapOf(
             "Authorization" to "Bearer $token",
-            "X-Website-Token" to wt,
+            "X-Website-Token" to wt
         )
 
         val parsedResponse = app.get(
@@ -42,6 +42,7 @@ open class Gofile : ExtractorApi() {
         ).parsedSafe<GofileResponse>()
 
         val childrenMap = parsedResponse?.data?.children ?: return
+
         for ((_, file) in childrenMap) {
             if (file.link.isNullOrEmpty() || file.type != "file") continue
             val fileName = file.name ?: ""
@@ -53,7 +54,7 @@ open class Gofile : ExtractorApi() {
                     "Gofile",
                     "[Gofile] $fileName [$formattedSize]",
                     file.link,
-                    ExtractorLinkType.VIDEO,
+                    ExtractorLinkType.VIDEO
                 ) {
                     this.quality = getQuality(fileName)
                     this.headers = mapOf("Cookie" to "accountToken=$token")
@@ -83,31 +84,26 @@ open class Gofile : ExtractorApi() {
         }
     }
 
-    @Serializable
     data class AccountResponse(
-        @JsonProperty("data") @SerialName("data") val data: AccountData? = null,
+        @JsonProperty("data") val data: AccountData? = null
     )
 
-    @Serializable
     data class AccountData(
-        @JsonProperty("token") @SerialName("token") val token: String? = null,
+        @JsonProperty("token") val token: String? = null
     )
 
-    @Serializable
     data class GofileResponse(
-        @JsonProperty("data") @SerialName("data") val data: GofileData? = null,
+        @JsonProperty("data") val data: GofileData? = null
     )
 
-    @Serializable
     data class GofileData(
-        @JsonProperty("children") @SerialName("children") val children: Map<String, GofileFile>? = null,
+        @JsonProperty("children") val children: Map<String, GofileFile>? = null
     )
 
-    @Serializable
     data class GofileFile(
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("link") @SerialName("link") val link: String? = null,
-        @JsonProperty("size") @SerialName("size") val size: Long? = 0L,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("link") val link: String? = null,
+        @JsonProperty("size") val size: Long? = 0L
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
index f7fa2bef1..1ccd3e4d5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
@@ -8,41 +8,39 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.helper.AesHelper
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class HDMomPlayer : ExtractorApi() {
-    override val name = "HDMomPlayer"
-    override val mainUrl = "https://hdmomplayer.com"
+    override val name            = "HDMomPlayer"
+    override val mainUrl         = "https://hdmomplayer.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val m3uLink: String?
-        val extRef = referer ?: ""
-        val iSource = app.get(url, referer = extRef).text
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val m3uLink:String?
+        val extRef  = referer ?: ""
+        val iSource = app.get(url, referer=extRef).text
+
         val bePlayer = Regex("""bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);""").find(iSource)?.groupValues
         if (bePlayer != null) {
             val bePlayerPass = bePlayer.get(1)
             val bePlayerData = bePlayer.get(2)
-            val encrypted = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.encodeToByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
+            val encrypted    = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.encodeToByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
+
             m3uLink = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
         } else {
             m3uLink = Regex("""file:\"([^\"]+)""").find(iSource)?.groupValues?.get(1)
+
             val trackStr = Regex("""tracks:\[([^\]]+)""").find(iSource)?.groupValues?.get(1)
             if (trackStr != null) {
-                val tracks = parseJson<List<Track>>("[${trackStr}]")
+                val tracks:List<Track> = parseJson<List<Track>>("[${trackStr}]")
+
                 for (track in tracks) {
                     if (track.file == null || track.label == null) continue
                     if (track.label.contains("Forced")) continue
+
                     subtitleCallback.invoke(
                         newSubtitleFile(
                             lang = track.label,
-                            url = fixUrl(mainUrl + track.file),
+                            url  = fixUrl(mainUrl + track.file)
                         )
                     )
                 }
@@ -51,10 +49,10 @@ open class HDMomPlayer : ExtractorApi() {
 
         callback.invoke(
             newExtractorLink(
-                source = this.name,
-                name = this.name,
-                url = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
-                type = ExtractorLinkType.M3U8,
+                source  = this.name,
+                name    = this.name,
+                url     = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
+                type = ExtractorLinkType.M3U8
             ) {
                 this.referer = url
                 this.quality = Qualities.Unknown.value
@@ -62,12 +60,11 @@ open class HDMomPlayer : ExtractorApi() {
         )
     }
 
-    @Serializable
     data class Track(
-        @JsonProperty("file") @SerialName("file") val file: String?,
-        @JsonProperty("label") @SerialName("label") val label: String?,
-        @JsonProperty("kind") @SerialName("kind") val kind: String?,
-        @JsonProperty("language") @SerialName("language") val language: String?,
-        @JsonProperty("default") @SerialName("default") val default: String?,
+        @JsonProperty("file")     val file: String?,
+        @JsonProperty("label")    val label: String?,
+        @JsonProperty("kind")     val kind: String?,
+        @JsonProperty("language") val language: String?,
+        @JsonProperty("default")  val default: String?
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
index a991528da..9cff2049f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
@@ -2,60 +2,56 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.fasterxml.jackson.annotation.JsonProperty
 
 open class HDPlayerSystem : ExtractorApi() {
-    override val name = "HDPlayerSystem"
-    override val mainUrl = "https://hdplayersystem.live"
+    override val name            = "HDPlayerSystem"
+    override val mainUrl         = "https://hdplayersystem.live"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val extRef = referer ?: ""
-        val vidId = if (url.contains("video/")) {
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val extRef  = referer ?: ""
+        val vidId   = if (url.contains("video/")) {
             url.substringAfter("video/")
         } else {
             url.substringAfter("?data=")
         }
-        val postUrl = "$mainUrl/player/index.php?data=$vidId&do=getVideo"
+        val postUrl = "${mainUrl}/player/index.php?data=${vidId}&do=getVideo"
+
         val response = app.post(
             postUrl,
             data = mapOf(
                 "hash" to vidId,
-                "r" to extRef,
+                "r"    to extRef
             ),
             referer = extRef,
             headers = mapOf(
-                "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8",
-                "X-Requested-With" to "XMLHttpRequest",
+                "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
+                "X-Requested-With" to "XMLHttpRequest"
             )
         )
 
         val videoResponse = response.parsedSafe<SystemResponse>() ?: throw ErrorLoadingException("failed to parse response")
-        val m3uLink = videoResponse.securedLink
+        val m3uLink       = videoResponse.securedLink
+
         callback.invoke(
             newExtractorLink(
-                source = this.name,
-                name = this.name,
-                url = m3uLink,
-            ) { this.referer = extRef }
+                source  = this.name,
+                name    = this.name,
+                url     = m3uLink
+            ) {
+                this.referer = extRef
+            }
         )
     }
 
-    @Serializable
     data class SystemResponse(
-        @JsonProperty("hls") @SerialName("hls") val hls: String,
-        @JsonProperty("videoImage") @SerialName("videoImage") val videoImage: String? = null,
-        @JsonProperty("videoSource") @SerialName("videoSource") val videoSource: String,
-        @JsonProperty("securedLink") @SerialName("securedLink") val securedLink: String,
+        @JsonProperty("hls")         val hls: String,
+        @JsonProperty("videoImage")  val videoImage: String? = null,
+        @JsonProperty("videoSource") val videoSource: String,
+        @JsonProperty("securedLink") val securedLink: String
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hexload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hexload.kt
deleted file mode 100644
index 15ed8df6e..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hexload.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.api.Log
-import com.lagradost.cloudstream3.Prerelease
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Prerelease
-class Hexload: ExtractorApi() {
-    override val name: String = "Hexload"
-    override val mainUrl: String = "https://hexload.com"
-    override val requiresReferer: Boolean = false
-
-    private val jsDictEntryRegex = Regex("""(\w+):\s*['"](\w+)['"]""")
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val respData = app.get(url).text.substringAfter("data: {").substringBefore("success")
-        val requestArgs = jsDictEntryRegex.findAll(respData).associate {
-            it.groupValues[1] to it.groupValues[2]
-        }
-        Log.d("requestArgs", requestArgs.toString())
-        val streamResponse = app.post("$mainUrl/download", data = requestArgs)
-            .parsed<StreamResponse>()
-
-        callback.invoke(newExtractorLink(
-            name = name,
-            source = name,
-            url = streamResponse.result.url
-        ))
-    }
-
-    @Serializable
-    private data class StreamResponse(
-        val result: StreamResult,
-        @JsonProperty("server_time")
-        @SerialName("server_time")
-        val serverTime: String,
-        val msg: String,
-        val status: Long,
-    )
-
-    @Serializable
-    private data class StreamResult(
-        val size: String,
-        val url: String,
-        @JsonProperty("content_type")
-        @SerialName("content_type")
-        val contentType: String,
-        @JsonProperty("thumb_url")
-        @SerialName("thumb_url")
-        val thumbUrl: String,
-        @JsonProperty("image_url")
-        @SerialName("image_url")
-        val imageUrl: String,
-        @JsonProperty("file_name")
-        @SerialName("file_name")
-        val fileName: String,
-        val md5: String,
-    )
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubuCloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubuCloud.kt
deleted file mode 100644
index 85151b1d7..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubuCloud.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.Prerelease
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.newExtractorLink
-
-@Prerelease
-open class HubuCloud: ExtractorApi() {
-    override val name: String = "Hubu"
-    override val mainUrl: String = "https://hubu.cloud"
-    override val requiresReferer: Boolean = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val doc = app.get(url).document
-
-        val streamUrl = doc.select("source").attr("src")
-        callback.invoke(newExtractorLink(source = name, name = name, url = streamUrl))
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
index 9f66867f6..896228b51 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
@@ -9,8 +9,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getAndUnpack
 import com.lagradost.cloudstream3.utils.getPacked
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Jeniusplay : ExtractorApi() {
     override val name = "Jeniusplay"
@@ -21,15 +19,16 @@ open class Jeniusplay : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val document = app.get(url, referer = "$mainUrl/").document
         val hash = url.split("/").last().substringAfter("data=")
+
         val m3uLink = app.post(
             url = "$mainUrl/player/index.php?data=$hash&do=getVideo",
             data = mapOf("hash" to hash, "r" to "$referer"),
             referer = url,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         ).parsed<ResponseSource>().videoSource
 
         M3u8Helper.generateM3u8(
@@ -37,6 +36,7 @@ open class Jeniusplay : ExtractorApi() {
             m3uLink,
             url,
         ).forEach(callback)
+
         document.select("script").map { script ->
             if (getPacked(script.data()) != null) {
                 val unpacked = getAndUnpack(script.data())
@@ -45,10 +45,9 @@ open class Jeniusplay : ExtractorApi() {
         }
     }
 
-    @Serializable
     data class ResponseSource(
-        @JsonProperty("hls") @SerialName("hls") val hls: Boolean,
-        @JsonProperty("videoSource") @SerialName("videoSource") val videoSource: String,
-        @JsonProperty("securedLink") @SerialName("securedLink") val securedLink: String?,
+        @JsonProperty("hls") val hls: Boolean,
+        @JsonProperty("videoSource") val videoSource: String,
+        @JsonProperty("securedLink") val securedLink: String?,
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt
index 91b34ac2c..bfa94326a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt
@@ -7,8 +7,6 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Linkbox : ExtractorApi() {
     override val name = "Linkbox"
@@ -19,7 +17,7 @@ open class Linkbox : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val token = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1)
         val id = app.get("$mainUrl/api/file/share_out_list/?sortField=utime&sortAsc=0&pageNo=1&pageSize=50&shareToken=$token").parsedSafe<Responses>()?.data?.itemId
@@ -38,25 +36,22 @@ open class Linkbox : ExtractorApi() {
             }
     }
 
-    @Serializable
     data class Resolutions(
-        @JsonProperty("url") @SerialName("url") val url: String? = null,
-        @JsonProperty("resolution") @SerialName("resolution") val resolution: String? = null,
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("resolution") val resolution: String? = null,
     )
 
-    @Serializable
     data class ItemInfo(
-        @JsonProperty("resolutionList") @SerialName("resolutionList") val resolutionList: ArrayList<Resolutions>? = arrayListOf(),
+        @JsonProperty("resolutionList") val resolutionList: ArrayList<Resolutions>? = arrayListOf(),
     )
 
-    @Serializable
     data class Data(
-        @JsonProperty("itemInfo") @SerialName("itemInfo") val itemInfo: ItemInfo? = null,
-        @JsonProperty("itemId") @SerialName("itemId") val itemId: String? = null,
+        @JsonProperty("itemInfo") val itemInfo: ItemInfo? = null,
+        @JsonProperty("itemId") val itemId: String? = null,
     )
 
-    @Serializable
     data class Responses(
-        @JsonProperty("data") @SerialName("data") val data: Data? = null,
+        @JsonProperty("data") val data: Data? = null,
     )
-}
+
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
index 899c6ced5..f1fd1288c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
@@ -2,57 +2,51 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.fasterxml.jackson.annotation.JsonProperty
 
 open class MailRu : ExtractorApi() {
-    override val name = "MailRu"
-    override val mainUrl = "https://my.mail.ru"
+    override val name            = "MailRu"
+    override val mainUrl         = "https://my.mail.ru"
     override val requiresReferer = false
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val extRef = referer ?: ""
-        val vidId = url.substringAfter("video/embed/").trim()
-        val videoReq = app.get("$mainUrl/+/video/meta/$vidId", referer = url)
-        val videoKey = videoReq.cookies["video_key"].toString()
-        val videoData = AppUtils.tryParseJson<MailRuData>(videoReq.text) ?:
-            throw ErrorLoadingException("Video not found")
+
+        val vidId     = url.substringAfter("video/embed/").trim()
+        val videoReq  = app.get("${mainUrl}/+/video/meta/${vidId}", referer=url)
+        val videoKey  = videoReq.cookies["video_key"].toString()
+
+        val videoData = AppUtils.tryParseJson<MailRuData>(videoReq.text) ?: throw ErrorLoadingException("Video not found")
 
         for (video in videoData.videos) {
+
             val videoUrl = if (video.url.startsWith("//")) "https:${video.url}" else video.url
+
             callback.invoke(
                 newExtractorLink(
-                    source = this.name,
-                    name = this.name,
-                    url = videoUrl,
-                    type = ExtractorLinkType.M3U8,
+                    source  = this.name,
+                    name    = this.name,
+                    url     = videoUrl,
+                    type    = ExtractorLinkType.M3U8
                 ) {
                     this.referer = url
-                    this.headers = mapOf("Cookie" to "video_key=$videoKey")
+                    this.headers = mapOf("Cookie" to "video_key=${videoKey}")
                     this.quality = getQualityFromName(video.key)
                 }
             )
         }
     }
 
-    @Serializable
     data class MailRuData(
-        @JsonProperty("provider") @SerialName("provider") val provider: String,
-        @JsonProperty("videos") @SerialName("videos") val videos: List<MailRuVideoData>,
+        @JsonProperty("provider") val provider: String,
+        @JsonProperty("videos")   val videos: List<MailRuVideoData>
     )
 
-    @Serializable
     data class MailRuVideoData(
-        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("key") @SerialName("key") val key: String,
+        @JsonProperty("url") val url: String,
+        @JsonProperty("key") val key: String
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
index fd845e1a0..69c3b7759 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
@@ -7,26 +7,19 @@ import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Odnoklassniki : ExtractorApi() {
-    override val name = "Odnoklassniki"
-    override val mainUrl = "https://odnoklassniki.ru"
+    override val name            = "Odnoklassniki"
+    override val mainUrl         = "https://odnoklassniki.ru"
     override val requiresReferer = false
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val headers = mapOf(
             "Accept" to "*/*",
             "Connection" to "keep-alive",
@@ -36,33 +29,34 @@ open class Odnoklassniki : ExtractorApi() {
             "Origin" to mainUrl,
             "User-Agent" to USER_AGENT,
         )
-
-        val embedUrl = url.replace("/video/", "/videoembed/")
-        val videoReq = app.get(embedUrl, headers = headers).text.replace("\\&quot;", "\"").replace("\\\\", "\\")
+        val embedUrl = url.replace("/video/","/videoembed/")
+        val videoReq  = app.get(embedUrl, headers=headers).text.replace("\\&quot;", "\"").replace("\\\\", "\\")
             .replace(Regex("\\\\u([0-9A-Fa-f]{4})")) { matchResult ->
                 matchResult.groupValues[1].toInt(16).toChar().toString()
             }
-
         val videosStr = Regex(""""videos":(\[[^]]*])""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
-        val videos = tryParseJson<List<OkRuVideo>>(videosStr) ?: throw ErrorLoadingException("Video not found")
+        val videos    = AppUtils.tryParseJson<List<OkRuVideo>>(videosStr) ?: throw ErrorLoadingException("Video not found")
+
         for (video in videos) {
-            val videoUrl = if (video.url.startsWith("//")) "https:${video.url}" else video.url
-            val quality = video.name.uppercase()
+
+            val videoUrl  = if (video.url.startsWith("//")) "https:${video.url}" else video.url
+
+            val quality   = video.name.uppercase()
                 .replace("MOBILE", "144p")
                 .replace("LOWEST", "240p")
-                .replace("LOW", "360p")
-                .replace("SD", "480p")
-                .replace("HD", "720p")
-                .replace("FULL", "1080p")
-                .replace("QUAD", "1440p")
-                .replace("ULTRA", "4k")
+                .replace("LOW",    "360p")
+                .replace("SD",     "480p")
+                .replace("HD",     "720p")
+                .replace("FULL",   "1080p")
+                .replace("QUAD",   "1440p")
+                .replace("ULTRA",  "4k")
 
             callback.invoke(
                 newExtractorLink(
-                    source = this.name,
-                    name = this.name,
-                    url = videoUrl,
-                    type = INFER_TYPE,
+                    source  = this.name,
+                    name    = this.name,
+                    url     = videoUrl,
+                    type    = INFER_TYPE
                 ) {
                     this.referer = "$mainUrl/"
                     this.quality = getQualityFromName(quality)
@@ -72,9 +66,8 @@ open class Odnoklassniki : ExtractorApi() {
         }
     }
 
-    @Serializable
     data class OkRuVideo(
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("url")  val url: String,
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
index 7dd12d690..f96387d75 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
@@ -2,63 +2,57 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.fasterxml.jackson.annotation.JsonProperty
 
 open class PeaceMakerst : ExtractorApi() {
-    override val name = "PeaceMakerst"
-    override val mainUrl = "https://peacemakerst.com"
+    override val name            = "PeaceMakerst"
+    override val mainUrl         = "https://peacemakerst.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val m3uLink: String?
-        val extRef = referer ?: ""
-        val postUrl = "$url?do=getVideo"
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val m3uLink:String?
+        val extRef  = referer ?: ""
+        val postUrl = "${url}?do=getVideo"
+
         val response = app.post(
             postUrl,
             data = mapOf(
                 "hash" to url.substringAfter("video/"),
-                "r" to extRef,
-                "s" to "",
+                "r"    to extRef,
+                "s"    to ""
             ),
             referer = extRef,
             headers = mapOf(
-                "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8",
-                "X-Requested-With" to "XMLHttpRequest",
-            ),
+                "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
+                "X-Requested-With" to "XMLHttpRequest"
+            )
         )
-
         if (response.text.contains("teve2.com.tr\\/embed\\/")) {
-            val teve2Id = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
+            val teve2Id       = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
             val teve2Response = app.get(
-                "https://www.teve2.com.tr/action/media/$teve2Id",
-                referer = "https://www.teve2.com.tr/embed/$teve2Id",
+                "https://www.teve2.com.tr/action/media/${teve2Id}",
+                referer = "https://www.teve2.com.tr/embed/${teve2Id}"
             ).parsedSafe<Teve2ApiResponse>() ?: throw ErrorLoadingException("teve2 response is null")
-            m3uLink = teve2Response.media.link.serviceUrl + "//" + teve2Response.media.link.securePath
+
+            m3uLink           = teve2Response.media.link.serviceUrl + "//" + teve2Response.media.link.securePath
         } else {
             val videoResponse = response.parsedSafe<PeaceResponse>() ?: throw ErrorLoadingException("peace response is null")
-            val videoSources = videoResponse.videoSources
-            m3uLink = if (videoSources.isNotEmpty()) {
-                videoSources.lastOrNull()?.file
+            val videoSources  = videoResponse.videoSources
+            if (videoSources.isNotEmpty()) {
+                m3uLink = videoSources.lastOrNull()?.file
             } else {
-                null
+                m3uLink = null
             }
         }
 
         callback.invoke(
             newExtractorLink(
-                source = this.name,
-                name = this.name,
-                url = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
+                source  = this.name,
+                name    = this.name,
+                url     = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
             ) {
                 this.referer = extRef
                 this.quality = Qualities.Unknown.value
@@ -66,34 +60,29 @@ open class PeaceMakerst : ExtractorApi() {
         )
     }
 
-    @Serializable
     data class PeaceResponse(
-        @JsonProperty("videoImage") @SerialName("videoImage") val videoImage: String?,
-        @JsonProperty("videoSources") @SerialName("videoSources") val videoSources: List<VideoSource>,
-        @JsonProperty("sIndex") @SerialName("sIndex") val sourceIndex: String,
-        @JsonProperty("sourceList") @SerialName("sourceList") val sourceList: Map<String, String>,
+        @JsonProperty("videoImage")   val videoImage: String?,
+        @JsonProperty("videoSources") val videoSources: List<VideoSource>,
+        @JsonProperty("sIndex")       val sIndex: String,
+        @JsonProperty("sourceList")   val sourceList: Map<String, String>
     )
 
-    @Serializable
     data class VideoSource(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("label") @SerialName("label") val label: String,
-        @JsonProperty("type") @SerialName("type") val type: String,
+        @JsonProperty("file")  val file: String,
+        @JsonProperty("label") val label: String,
+        @JsonProperty("type")  val type: String
     )
 
-    @Serializable
     data class Teve2ApiResponse(
-        @JsonProperty("Media") @SerialName("Media") val media: Teve2Media,
+        @JsonProperty("Media") val media: Teve2Media
     )
 
-    @Serializable
     data class Teve2Media(
-        @JsonProperty("Link") @SerialName("Link") val link: Teve2Link,
+        @JsonProperty("Link") val link: Teve2Link
     )
 
-    @Serializable
     data class Teve2Link(
-        @JsonProperty("ServiceUrl") @SerialName("ServiceUrl") val serviceUrl: String,
-        @JsonProperty("SecurePath") @SerialName("SecurePath") val securePath: String,
+        @JsonProperty("ServiceUrl") val serviceUrl: String,
+        @JsonProperty("SecurePath") val securePath: String
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
index a5e71b619..c59022abb 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
@@ -1,28 +1,33 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
-open class PlayLtXyz : ExtractorApi() {
-    override val name = "PlayLt"
-    override val mainUrl = "https://play.playlt.xyz"
+open class PlayLtXyz: ExtractorApi() {
+    override val name: String = "PlayLt"
+    override val mainUrl: String = "https://play.playlt.xyz"
     override val requiresReferer = true
 
+    private data class ResponseData(
+        @JsonProperty("data") val data: String? = null
+    )
+
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
         val extractedLinksList = mutableListOf<ExtractorLink>()
+        //Log.i(this.name, "Result => (url) $url")
         var idUser = ""
         var idFile = ""
         var bodyText = ""
         val doc = app.get(url, referer = referer).document
+        //Log.i(this.name, "Result => (url, script) $url / ${doc.select("script")}")
         bodyText = doc.select("script").firstOrNull {
             val text = it.toString()
             text.contains("var idUser")
         }?.toString() ?: ""
+        //Log.i(this.name, "Result => (bodyText) $bodyText")
         if (bodyText.isNotBlank()) {
             idUser = "(?<=var idUser = \")(.*)(?=\";)".toRegex().find(bodyText)
                 ?.groupValues?.get(0) ?: ""
@@ -30,27 +35,29 @@ open class PlayLtXyz : ExtractorApi() {
             idFile = "(?<=var idfile = \")(.*)(?=\";)".toRegex().find(bodyText)
                 ?.groupValues?.get(0) ?: ""
         }
-
+        //Log.i(this.name, "Result => (idUser, idFile) $idUser / $idFile")
         if (idUser.isNotBlank() && idFile.isNotBlank()) {
+            //val sess = HttpSession()
             val ajaxHead = mapOf(
                 Pair("Origin", mainUrl),
                 Pair("Referer", mainUrl),
                 Pair("Sec-Fetch-Site", "same-site"),
                 Pair("Sec-Fetch-Mode", "cors"),
-                Pair("Sec-Fetch-Dest", "empty"),
+                Pair("Sec-Fetch-Dest", "empty")
             )
-
             val ajaxData = mapOf(
                 Pair("referrer", referer ?: mainUrl),
-                Pair("typeend", "html"),
+                Pair("typeend", "html")
             )
 
-            val postUrl = "https://api-plhq.playlt.xyz/apiv5/$idUser/$idFile"
-            val data = app.post(postUrl, headers = ajaxHead, data = ajaxData)
+            //idUser = 608f7c85cf0743547f1f1b4e
+            val posturl = "https://api-plhq.playlt.xyz/apiv5/$idUser/$idFile"
+            val data = app.post(posturl, headers = ajaxHead, data = ajaxData)
+            //Log.i(this.name, "Result => (posturl) $posturl")
             if (data.isSuccessful) {
-                val itemStr = data.text
-                Log.i(this.name, "Result => (data) $itemStr")
-                tryParseJson<ResponseData>(itemStr)?.let { item ->
+                val itemstr = data.text
+                Log.i(this.name, "Result => (data) $itemstr")
+                tryParseJson<ResponseData?>(itemstr)?.let { item ->
                     val linkUrl = item.data ?: ""
                     if (linkUrl.isNotBlank()) {
                         extractedLinksList.add(
@@ -58,7 +65,7 @@ open class PlayLtXyz : ExtractorApi() {
                                 source = name,
                                 name = name,
                                 url = linkUrl,
-                                type = ExtractorLinkType.M3U8,
+                                type = ExtractorLinkType.M3U8
                             ) {
                                 this.referer = url
                                 this.quality = Qualities.Unknown.value
@@ -68,12 +75,6 @@ open class PlayLtXyz : ExtractorApi() {
                 }
             }
         }
-
         return extractedLinksList
     }
-
-    @Serializable
-    private data class ResponseData(
-        @JsonProperty("data") @SerialName("data") val data: String? = null,
-    )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Playmate.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Playmate.kt
deleted file mode 100644
index e319d4c17..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Playmate.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.Prerelease
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Prerelease
-class Playmate : ExtractorApi() {
-    override val name: String = "Playmate"
-    override val mainUrl: String = "https://playmate.to"
-    override val requiresReferer: Boolean = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val id = url.substringAfterLast("/")
-
-        val resp = app.post(
-            "$mainUrl/api/s",
-            json = mapOf("c" to id, "d" to "web"),
-            headers = mapOf("User-Agent" to "Mozilla/5.0 (X11; Linux x86_64; rv:153.0) Gecko/20100101 Firefox/153.0")
-        ).parsed<StreamInfo>()
-
-        callback.invoke(newExtractorLink(source = name, name = name, url = resp.sx, type = ExtractorLinkType.M3U8))
-    }
-
-    @Serializable
-    private data class StreamInfo(
-        @SerialName("sx")
-        @JsonProperty("sx")
-        val sx: String,
-    )
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
index 46b83f10a..fe9624430 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
@@ -7,8 +7,8 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64DecodeArray
 import com.lagradost.cloudstream3.base64Encode
 import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
@@ -16,8 +16,6 @@ import dev.whyoleg.cryptography.CryptographyProvider
 import dev.whyoleg.cryptography.DelicateCryptographyApi
 import dev.whyoleg.cryptography.algorithms.AES
 import dev.whyoleg.cryptography.algorithms.MD5
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class Megacloud : Rabbitstream() {
     override val name = "Megacloud"
@@ -38,7 +36,6 @@ class Megacloud : Rabbitstream() {
                 extractedKey += sourcesArray[i].toString()
                 sourcesArray[i] = ' '
             }
-
             currentIndex += index[1]
         }
 
@@ -58,7 +55,7 @@ class Megacloud : Rabbitstream() {
             val matchKey2 = matchingKey(match.groupValues[2])
             try {
                 listOf(matchKey1.toInt(16), matchKey2.toInt(16))
-            } catch (_: NumberFormatException) {
+            } catch (e: NumberFormatException) {
                 emptyList()
             }
         }.filter { it.isNotEmpty() }
@@ -89,25 +86,26 @@ open class Rabbitstream : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val id = url.substringAfterLast("/").substringBefore("?")
+
         val response = app.get(
             "$mainUrl/$embed/getSources?id=$id",
             referer = mainUrl,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         )
 
         val encryptedMap = response.parsedSafe<SourcesEncrypted>()
         val sources = encryptedMap?.sources
         val decryptedSources = if (sources == null || encryptedMap.encrypted == false) {
-            response.parsedSafe<SourcesResponses>()
+            response.parsedSafe()
         } else {
             val (key, encData) = extractRealKey(sources)
-            val decrypted = tryParseJson<List<Sources>>(decrypt(encData, key))
+            val decrypted = decryptMapped<List<Sources>>(encData, key)
             SourcesResponses(
                 sources = decrypted,
-                tracks = encryptedMap.tracks,
+                tracks = encryptedMap.tracks
             )
         }
 
@@ -123,7 +121,7 @@ open class Rabbitstream : ExtractorApi() {
             subtitleCallback.invoke(
                 newSubtitleFile(
                     track?.label ?: return@map,
-                    track.file ?: return@map,
+                    track.file ?: return@map
                 )
             )
         }
@@ -135,65 +133,65 @@ open class Rabbitstream : ExtractorApi() {
         return extractedKey to sources
     }
 
-    private suspend fun decrypt(input: String, key: String): String {
+    private inline fun <reified T> decryptMapped(input: String, key: String): T? {
+        val decrypt = decrypt(input, key)
+        return AppUtils.tryParseJson(decrypt)
+    }
+
+    private fun decrypt(input: String, key: String): String {
         return decryptSourceUrl(
             generateKey(
                 salt = base64DecodeArray(input).copyOfRange(8, 16),
-                secret = key.encodeToByteArray(),
+                secret = key.encodeToByteArray()
             ), input
         )
     }
 
-    private suspend fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
+    private fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
         var key = md5(secret + salt)
         var currentKey = key
         while (currentKey.size < 48) {
             key = md5(key + secret + salt)
             currentKey += key
         }
-
         return currentKey
     }
 
-    private suspend fun md5(input: ByteArray): ByteArray =
-        md5Hasher.hash(input)
+    private fun md5(input: ByteArray): ByteArray =
+        md5Hasher.hashBlocking(input)
 
     @OptIn(DelicateCryptographyApi::class)
-    private suspend fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
+    private fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
         val cipherData = base64DecodeArray(sourceUrl)
         val encrypted = cipherData.copyOfRange(16, cipherData.size)
         val keyBytes = decryptionKey.copyOfRange(0, 32)
         val ivBytes = decryptionKey.copyOfRange(32, decryptionKey.size)
 
-        val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
-        val decryptedData = aesKey.cipher(padding = true).decryptWithIv(ivBytes, encrypted)
+        val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
+        val decryptedData = aesKey.cipher(padding = true).decryptWithIvBlocking(ivBytes, encrypted)
         return decryptedData.decodeToString()
     }
 
-    @Serializable
     data class Tracks(
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
-        @JsonProperty("kind") @SerialName("kind") val kind: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
     )
 
-    @Serializable
     data class Sources(
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("label") val label: String? = null,
     )
 
-    @Serializable
     data class SourcesResponses(
-        @JsonProperty("sources") @SerialName("sources") val sources: List<Sources?>? = emptyList(),
-        @JsonProperty("tracks") @SerialName("tracks") val tracks: List<Tracks?>? = emptyList(),
+        @JsonProperty("sources") val sources: List<Sources?>? = emptyList(),
+        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
     )
 
-    @Serializable
     data class SourcesEncrypted(
-        @JsonProperty("sources") @SerialName("sources") val sources: String? = null,
-        @JsonProperty("encrypted") @SerialName("encrypted") val encrypted: Boolean? = null,
-        @JsonProperty("tracks") @SerialName("tracks") val tracks: List<Tracks?>? = emptyList(),
+        @JsonProperty("sources") val sources: String? = null,
+        @JsonProperty("encrypted") val encrypted: Boolean? = null,
+        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SobreatsesuypExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SobreatsesuypExtractor.kt
index 0c5d7c974..be95940e0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SobreatsesuypExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SobreatsesuypExtractor.kt
@@ -2,53 +2,51 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
+import com.fasterxml.jackson.annotation.JsonProperty
 
 open class Sobreatsesuyp : ExtractorApi() {
-    override val name = "Sobreatsesuyp"
-    override val mainUrl = "https://sobreatsesuyp.com"
+    override val name            = "Sobreatsesuyp"
+    override val mainUrl         = "https://sobreatsesuyp.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val extRef = referer ?: ""
+
         val videoReq = app.get(url, referer = extRef).text
-        val file = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-        val postLink = "$mainUrl/" + file.replace("\\", "")
-        val rawList = app.post(postLink, referer = extRef).parsedSafe<List<JsonElement>>() ?: throw ErrorLoadingException("Post link not found")
+
+        val file     = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+        val postLink = "${mainUrl}/" + file.replace("\\", "")
+        val rawList  = app.post(postLink, referer = extRef).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
+
         val postJson: List<SobreatsesuypVideoData> = rawList.drop(1).map { item ->
             val mapItem = item as Map<*, *>
             SobreatsesuypVideoData(
                 title = mapItem["title"] as? String,
-                file = mapItem["file"] as? String,
+                file  = mapItem["file"]  as? String
             )
         }
 
         for (item in postJson) {
             if (item.file == null || item.title == null) continue
-            val videoData = app.post("$mainUrl/playlist/${item.file.substring(1)}.txt", referer = extRef).text
+
+            val videoData = app.post("${mainUrl}/playlist/${item.file.substring(1)}.txt", referer = extRef).text
+
             callback.invoke(
                 newExtractorLink(
-                    source = this.name,
-                    name = "${this.name} - ${item.title}",
-                    url = videoData,
-                ) { this.referer = extRef }
+                    source  = this.name,
+                    name    = "${this.name} - ${item.title}",
+                    url     = videoData,
+                ) {
+                    this.referer = extRef
+                }
             )
         }
     }
 
-    @Serializable
     data class SobreatsesuypVideoData(
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("file")  val file: String?  = null
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt
index 8c5eb5d6c..c89f4d226 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt
@@ -7,23 +7,22 @@ import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class StreamEmbed : ExtractorApi() {
-    override val name = "StreamEmbed"
-    override val mainUrl = "https://watch.gxplayer.xyz"
+    override var name = "StreamEmbed"
+    override var mainUrl = "https://watch.gxplayer.xyz"
     override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val jsonString = app.get(url, referer = mainUrl).text
             .substringAfter("var video = ").substringBefore(";")
         val video = parseJson<Details>(jsonString)
+
         M3u8Helper.generateM3u8(
             this.name,
             "$mainUrl/m3u8/${video.uid}/${video.md5}/master.txt?s=1&id=${video.id}&cache=${video.status}",
@@ -31,15 +30,14 @@ open class StreamEmbed : ExtractorApi() {
         ).forEach(callback)
     }
 
-    @Serializable
     private data class Details(
-        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("uid") @SerialName("uid") val uid: String,
-        @JsonProperty("slug") @SerialName("slug") val slug: String,
-        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("quality") @SerialName("quality") val quality: String,
-        @JsonProperty("type") @SerialName("type") val type: String,
-        @JsonProperty("status") @SerialName("status") val status: String,
-        @JsonProperty("md5") @SerialName("md5") val md5: String,
+        @JsonProperty("id") val id: String,
+        @JsonProperty("uid") val uid: String,
+        @JsonProperty("slug") val slug: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("quality") val quality: String,
+        @JsonProperty("type") val type: String,
+        @JsonProperty("status") val status: String,
+        @JsonProperty("md5") val md5: String,
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
index a7584d708..67cf1f8da 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -7,8 +7,6 @@ import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import kotlin.random.Random
 
 class Sblona : StreamSB() {
@@ -143,15 +141,17 @@ open class StreamSB : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
-        val regexId =
+        val regexID =
             Regex("(embed-[a-zA-Z\\d]{0,8}[a-zA-Z\\d_-]+|/e/[a-zA-Z\\d]{0,8}[a-zA-Z\\d_-]+)")
-        val id = regexId.findAll(url).map {
+        val id = regexID.findAll(url).map {
             it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
         val master = "$mainUrl/375664356a494546326c4b797c7c6e756577776778623171737/${encodeId(id)}"
-        val headers = mapOf("watchsb" to "sbstream")
+        val headers = mapOf(
+            "watchsb" to "sbstream",
+        )
         val mapped = app.get(
             master.lowercase(),
             headers = headers,
@@ -161,8 +161,9 @@ open class StreamSB : ExtractorApi() {
             name,
             mapped?.streamData?.file ?: return,
             url,
-            headers = headers,
+            headers = headers
         ).forEach(callback)
+
         mapped.streamData.subs?.map {sub ->
             subtitleCallback.invoke(
                 newSubtitleFile(
@@ -188,27 +189,25 @@ open class StreamSB : ExtractorApi() {
         }
     }
 
-    @Serializable
-    data class Subs(
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
+    data class Subs (
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
     )
 
-    @Serializable
-    data class StreamData(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("cdn_img") @SerialName("cdn_img") val cdnImg: String,
-        @JsonProperty("hash") @SerialName("hash") val hash: String,
-        @JsonProperty("subs") @SerialName("subs") val subs: ArrayList<Subs>? = arrayListOf(),
-        @JsonProperty("length") @SerialName("length") val length: String,
-        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("backup") @SerialName("backup") val backup: String,
+    data class StreamData (
+        @JsonProperty("file") val file: String,
+        @JsonProperty("cdn_img") val cdnImg: String,
+        @JsonProperty("hash") val hash: String,
+        @JsonProperty("subs") val subs: ArrayList<Subs>? = arrayListOf(),
+        @JsonProperty("length") val length: String,
+        @JsonProperty("id") val id: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("backup") val backup: String,
     )
 
-    @Serializable
-    data class Main(
-        @JsonProperty("stream_data") @SerialName("stream_data") val streamData: StreamData,
-        @JsonProperty("status_code") @SerialName("status_code") val statusCode: Int,
+    data class Main (
+        @JsonProperty("stream_data") val streamData: StreamData,
+        @JsonProperty("status_code") val statusCode: Int,
     )
+
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
index 03c94db9d..58aa25c8c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
@@ -28,6 +28,7 @@ class Ewish : StreamWishExtractor() {
     override val mainUrl = "https://embedwish.com"
 }
 
+@Prerelease
 class Hgcloudto : StreamWishExtractor() {
     override val name = "Hgcloud"
     override val mainUrl = "https://Hgcloud.to"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamcash.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamcash.kt
index 91ccfb2ad..2775c3062 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamcash.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamcash.kt
@@ -7,6 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
+@Prerelease
 open class Streamcash: ExtractorApi() {
     override val name: String = "Streamcash"
     override val mainUrl: String = "https://streamcash.to"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt
index d17e59c82..da2dd62be 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt
@@ -9,11 +9,10 @@ import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.nicehttp.RequestBodyTypes
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
 
+
 class Streamlare : Slmaxed() {
     override val mainUrl = "https://streamlare.com/"
 }
@@ -25,11 +24,27 @@ open class Slmaxed : ExtractorApi() {
 
     // https://slmaxed.com/e/oLvgezw3LjPzbp8E -> oLvgezw3LjPzbp8E
     val embedRegex = Regex("""/e/([^/]*)""")
+
+
+    data class JsonResponse(
+        @JsonProperty val status: String? = null,
+        @JsonProperty val message: String? = null,
+        @JsonProperty val type: String? = null,
+        @JsonProperty val token: String? = null,
+        @JsonProperty val result: Map<String, Result>? = null
+    )
+
+    data class Result(
+        @JsonProperty val label: String? = null,
+        @JsonProperty val file: String? = null,
+        @JsonProperty val type: String? = null
+    )
+
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val id = embedRegex.find(url)!!.groupValues[1]
         val json = app.post(
             "${mainUrl}api/video/stream/get",
-            requestBody = """{"id":"$id"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull()),
+            requestBody = """{"id":"$id"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
         ).parsed<JsonResponse>()
         return json.result?.mapNotNull {
             it.value.let { result ->
@@ -37,29 +52,18 @@ open class Slmaxed : ExtractorApi() {
                     this.name,
                     this.name,
                     result.file ?: return@mapNotNull null,
-                    type = if (result.type?.contains("hls", ignoreCase = true) == true) ExtractorLinkType.M3U8 else INFER_TYPE,
+                    type = if (result.type?.contains(
+                            "hls",
+                            ignoreCase = true
+                        ) == true
+                    ) ExtractorLinkType.M3U8 else INFER_TYPE
                 ) {
                     this.referer = url
-                    this.quality = result.label?.replace("p", "", ignoreCase = true)?.trim()?.toIntOrNull()
-                        ?: Qualities.Unknown.value
+                    this.quality =
+                        result.label?.replace("p", "", ignoreCase = true)?.trim()?.toIntOrNull()
+                            ?: Qualities.Unknown.value
                 }
             }
         }
     }
-
-    @Serializable
-    data class JsonResponse(
-        @JsonProperty("status") @SerialName("status") val status: String? = null,
-        @JsonProperty("message") @SerialName("message") val message: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("token") @SerialName("token") val token: String? = null,
-        @JsonProperty("result") @SerialName("result") val result: Map<String, Result>? = null,
-    )
-
-    @Serializable
-    data class Result(
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-    )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
index 1bcf9966b..9886300aa 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
@@ -8,8 +8,6 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import io.ktor.http.Url
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Streamplay : ExtractorApi() {
     override val name = "Streamplay"
@@ -20,36 +18,37 @@ open class Streamplay : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val request = app.get(url, referer = referer)
         val redirectUrl = request.url
         val mainServer = Url(redirectUrl).let { "${it.protocol.name}://${it.host}" }
         val key = redirectUrl.substringAfter("embed-").substringBefore(".html")
-        val token = request.document.select("script").find { it.data().contains("sitekey:") }?.data()
-            ?.substringAfterLast("sitekey: '")?.substringBefore("',")?.let { captchaKey ->
-                getCaptchaToken(
-                    redirectUrl,
-                    captchaKey,
-                    referer = "$mainServer/",
-                )
-            } ?: throw ErrorLoadingException("can't bypass captcha")
-
+        val token =
+            request.document.select("script").find { it.data().contains("sitekey:") }?.data()
+                ?.substringAfterLast("sitekey: '")?.substringBefore("',")?.let { captchaKey ->
+                    getCaptchaToken(
+                        redirectUrl,
+                        captchaKey,
+                        referer = "$mainServer/"
+                    )
+                } ?: throw ErrorLoadingException("can't bypass captcha")
         app.post(
             "$mainServer/player-$key-488x286.html", data = mapOf(
                 "op" to "embed",
-                "token" to token,
+                "token" to token
             ),
             referer = redirectUrl,
             headers = mapOf(
                 "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
-                "Content-Type" to "application/x-www-form-urlencoded",
-            ),
+                "Content-Type" to "application/x-www-form-urlencoded"
+            )
         ).document.select("script").find { script ->
             script.data().contains("eval(function(p,a,c,k,e,d)")
         }?.let {
             val data = getAndUnpack(it.data()).substringAfter("sources=[").substringBefore(",desc")
-                .replace("file", "\"file\"").replace("label", "\"label\"")
+                .replace("file", "\"file\"")
+                .replace("label", "\"label\"")
             tryParseJson<List<Source>>("[$data}]")?.map { res ->
                 callback.invoke(
                     newExtractorLink(
@@ -58,21 +57,24 @@ open class Streamplay : ExtractorApi() {
                         res.file ?: return@map null,
                     ) {
                         this.referer = "$mainServer/"
-                        this.headers = mapOf("Range" to "bytes=0-")
                         this.quality = when (res.label) {
                             "HD" -> Qualities.P720.value
                             "SD" -> Qualities.P480.value
                             else -> Qualities.Unknown.value
                         }
+                        this.headers = mapOf(
+                            "Range" to "bytes=0-"
+                        )
                     }
                 )
             }
         }
+
     }
 
-    @Serializable
     data class Source(
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
     )
+
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
index 6014105d8..1348f74d5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
@@ -2,68 +2,68 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
+import com.fasterxml.jackson.annotation.JsonProperty
 
 open class TRsTX : ExtractorApi() {
-    override val name = "TRsTX"
-    override val mainUrl = "https://trstx.org"
+    override val name            = "TRsTX"
+    override val mainUrl         = "https://trstx.org"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val extRef = referer ?: ""
-        val videoReq = app.get(url, referer = extRef).text
-        val file = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-        val postLink = "$mainUrl/" + file.replace("\\", "")
-        val rawList = app.post(postLink, referer = extRef).parsedSafe<List<JsonElement>>() ?: throw ErrorLoadingException("Post link not found")
+
+        val videoReq = app.get(url, referer=extRef).text
+
+        val file     = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+        val postLink = "${mainUrl}/" + file.replace("\\", "")
+        val rawList  = app.post(postLink, referer=extRef).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
+
         val postJson: List<TrstxVideoData> = rawList.drop(1).map { item ->
             val mapItem = item as Map<*, *>
             TrstxVideoData(
                 title = mapItem["title"] as? String,
-                file = mapItem["file"] as? String,
+                file  = mapItem["file"]  as? String
             )
         }
 
         val vidLinks = mutableSetOf<String>()
-        val vidMap = mutableListOf<Map<String, String>>()
+        val vidMap   = mutableListOf<Map<String, String>>()
         for (item in postJson) {
             if (item.file == null || item.title == null) continue
-            val fileUrl = "$mainUrl/playlist/" + item.file.substring(1) + ".txt"
-            val videoData = app.post(fileUrl, referer = extRef).text
-            if (videoData in vidLinks) continue
+
+            val fileUrl   = "${mainUrl}/playlist/" + item.file.substring(1) + ".txt"
+            val videoData = app.post(fileUrl, referer=extRef).text
+
+            if (videoData in vidLinks) { continue }
             vidLinks.add(videoData)
+
             vidMap.add(mapOf(
-                "title" to item.title,
-                "videoData" to videoData,
+                "title"     to item.title,
+                "videoData" to videoData
             ))
         }
 
         for (mapEntry in vidMap) {
-            val title = mapEntry["title"] ?: continue
+            val title    = mapEntry["title"] ?: continue
             val m3uLink = mapEntry["videoData"] ?: continue
+
             callback.invoke(
                 newExtractorLink(
-                    source = this.name,
-                    name = "${this.name} - $title",
-                    url = m3uLink,
-                ) { this.referer = extRef }
+                    source  = this.name,
+                    name    = "${this.name} - ${title}",
+                    url     = m3uLink,
+                ) {
+                    this.referer = extRef
+                }
             )
         }
     }
 
-    @Serializable
     data class TrstxVideoData(
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("file")  val file: String?  = null
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt
index e8022b323..4e330d1a7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt
@@ -6,42 +6,38 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Tantifilm : ExtractorApi() {
-    override val name = "Tantifilm"
-    override val mainUrl = "https://cercafilm.net"
+    override var name = "Tantifilm"
+    override var mainUrl = "https://cercafilm.net"
     override val requiresReferer = false
 
+    data class TantifilmJsonData (
+        @JsonProperty("success") val success : Boolean,
+        @JsonProperty("data") val data : List<TantifilmData>,
+        @JsonProperty("captions")val captions : List<String>,
+        @JsonProperty("is_vr") val is_vr : Boolean
+    )
+
+    data class TantifilmData (
+        @JsonProperty("file") val file : String,
+        @JsonProperty("label") val label : String,
+        @JsonProperty("type") val type : String
+    )
+
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val link = "$mainUrl/api/source/${url.substringAfterLast("/")}"
         val response = app.post(link).text.replace("""\""","")
-        val jsonVideoData = parseJson<TantifilmJsonData>(response)
-        return jsonVideoData.data.map {
+        val jsonvideodata = parseJson<TantifilmJsonData>(response)
+        return jsonvideodata.data.map {
             newExtractorLink(
                 this.name,
                 this.name,
-                it.file + ".${it.type}",
+                it.file+".${it.type}"
             ) {
                 this.referer = mainUrl
                 this.quality = it.label.filter{ it.isDigit() }.toInt()
             }
         }
     }
-
-    @Serializable
-    data class TantifilmJsonData(
-        @JsonProperty("success") @SerialName("success") val success: Boolean,
-        @JsonProperty("data") @SerialName("data") val data: List<TantifilmData>,
-        @JsonProperty("captions") @SerialName("captions") val captions: List<String>,
-        @JsonProperty("is_vr") @SerialName("is_vr") val isVr: Boolean,
-    )
-
-    @Serializable
-    data class TantifilmData(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("label") @SerialName("label") val label: String,
-        @JsonProperty("type") @SerialName("type") val type: String,
-    )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
index 9133ca99c..1c9cce2a8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
@@ -2,35 +2,29 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.fasterxml.jackson.annotation.JsonProperty
 
 open class TauVideo : ExtractorApi() {
-    override val name = "TauVideo"
-    override val mainUrl = "https://tau-video.xyz"
+    override val name            = "TauVideo"
+    override val mainUrl         = "https://tau-video.xyz"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val extRef = referer ?: ""
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val extRef   = referer ?: ""
         val videoKey = url.split("/").last()
-        val videoUrl = "$mainUrl/api/video/$videoKey"
+        val videoUrl = "${mainUrl}/api/video/${videoKey}"
+
         val api = app.get(videoUrl).parsedSafe<TauVideoUrls>() ?: throw ErrorLoadingException("TauVideo")
 
         for (video in api.urls) {
             callback.invoke(
                 newExtractorLink(
-                    source = this.name,
-                    name = this.name,
-                    url = video.url,
+                    source  = this.name,
+                    name    = this.name,
+                    url     = video.url,
                 ) {
                     this.referer = extRef
                     this.quality = getQualityFromName(video.label)
@@ -39,14 +33,12 @@ open class TauVideo : ExtractorApi() {
         }
     }
 
-    @Serializable
     data class TauVideoUrls(
-        @JsonProperty("urls") @SerialName("urls") val urls: List<TauVideoData>,
+        @JsonProperty("urls") val urls: List<TauVideoData>
     )
 
-    @Serializable
     data class TauVideoData(
-        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("label") @SerialName("label") val label: String,
+        @JsonProperty("url")   val url: String,
+        @JsonProperty("label") val label: String,
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt
index 97922127d..307825998 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt
@@ -3,51 +3,51 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Uservideo : ExtractorApi() {
-    override val name = "Uservideo"
-    override val mainUrl = "https://uservideo.xyz"
+    override val name: String = "Uservideo"
+    override val mainUrl: String = "https://uservideo.xyz"
     override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val script = app.get(url).document.selectFirst("script:containsData(hosts =)")?.data()
         val host = script?.substringAfter("hosts = [\"")?.substringBefore("\"];")
         val servers = script?.substringAfter("servers = \"")?.substringBefore("\";")
-        val quality = Regex("(\\d{3,4})[Pp]").find(url)?.groupValues?.getOrNull(1)?.toIntOrNull()
+
         val sources = app.get("$host/s/$servers").text.substringAfter("\"sources\":[").substringBefore("],").let {
-            tryParseJson<List<Sources>>("[$it]")
+            AppUtils.tryParseJson<List<Sources>>("[$it]")
         }
+        val quality = Regex("(\\d{3,4})[Pp]").find(url)?.groupValues?.getOrNull(1)?.toIntOrNull()
 
         sources?.map { source ->
             callback.invoke(
                 newExtractorLink(
                     name,
                     name,
-                    source.src ?: return@map null,
+                    source.src ?: return@map null
                 ) {
                     this.referer = url
                     this.quality = quality ?: Qualities.Unknown.value
                 }
             )
         }
+
     }
 
-    @Serializable
     data class Sources(
-        @JsonProperty("src") @SerialName("src") val src: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
+        @JsonProperty("src") val src: String? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("label") val label: String? = null,
     )
-}
+
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
index b3082cea6..6b82ee454 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
@@ -8,25 +8,25 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class Vicloud : ExtractorApi() {
-    override val name = "Vicloud"
-    override val mainUrl = "https://vicloud.sbs"
+    override val name: String = "Vicloud"
+    override val mainUrl: String = "https://vicloud.sbs"
     override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val id = Regex("\"apiQuery\":\"(.*?)\"").find(app.get(url).text)?.groupValues?.getOrNull(1)
         app.get(
             "$mainUrl/api/?$id=&_=$unixTimeMS",
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-            referer = url,
+            headers = mapOf(
+                "X-Requested-With" to "XMLHttpRequest"
+            ),
+            referer = url
         ).parsedSafe<Responses>()?.sources?.map { source ->
             callback.invoke(
                 newExtractorLink(
@@ -39,16 +39,16 @@ open class Vicloud : ExtractorApi() {
                 }
             )
         }
+
     }
 
-    @Serializable
     private data class Sources(
-        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
     )
 
-    @Serializable
     private data class Responses(
-        @JsonProperty("sources") @SerialName("sources") val sources: List<Sources>? = arrayListOf(),
+        @JsonProperty("sources") val sources: List<Sources>? = arrayListOf(),
     )
-}
+
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidara.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidara.kt
index e3a33b0cb..d74a1ccd6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidara.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidara.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.newSubtitleFile
@@ -44,72 +43,28 @@ class VidaraSo : Vidara() {
     override val mainUrl = "https://vidara.so"
 }
 
-@Prerelease
-class Odysseusa : Vidara() {
-    override val mainUrl = "https://odysseusa.cc"
-}
-
-@Prerelease
-class Handfacesnap : Vidara() {
-    override val mainUrl = "https://handfacesnap.cc"
-}
-
-@Prerelease
-class Namefacesnap : Vidara() {
-    override val mainUrl = "https://namefacesnap.cc"
-}
-
-@Prerelease
-class Thebesthostertv : Vidara() {
-    override val mainUrl = "https://thebesthosterv.com"
-}
-
-@Prerelease
-class Vidmatrixa : Vidara() {
-    override val mainUrl = "https://vidmatrixa.com"
-}
-
-@Prerelease
-class VidChampions : Vidara() {
-    override val mainUrl = "https://vidchampions.com/"
-}
-
-@Prerelease
-class Antarcticadocs : Vidara() {
-    override val mainUrl = "https://antarcticadocs.com"
-}
-
-@Prerelease
-class Nameitweb : Vidara() {
-    override val mainUrl = "https://nameitweb.com"
-}
-
 open class Vidara : ExtractorApi() {
-    override val name = "Vidara"
+    override val name: String = "Vidara"
     override val mainUrl = "https://vidara.to"
-    override val requiresReferer = false
+    override val requiresReferer: Boolean = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
-        // URLs sometimes contain a mirror selector query parameter, e.g. "https://vidara.to/xkNOuHSrCNMj?24"
-        // that is not part of the file code and hence we must remove it
-        val fileCode = url.substringAfterLast("/").substringBefore("?")
-        val fileInfo = app.post(
-            "$mainUrl/api/stream", json = mapOf(
-                "filecode" to fileCode,
-                "device" to "web"
-            )
-        ).parsed<StreamUpFileInfo>()
+        val fileCode = url.substringAfterLast("/")
+        val fileInfo =
+            app.post("$mainUrl/api/stream", json = mapOf("filecode" to fileCode, "device" to "web"))
+                .parsed<StreamUpFileInfo>()
+
         callback.invoke(
             newExtractorLink(
                 source = name,
                 name = name,
                 url = fileInfo.streamingUrl,
-                type = ExtractorLinkType.M3U8,
+                type = ExtractorLinkType.M3U8
             )
         )
 
@@ -122,15 +77,19 @@ open class Vidara : ExtractorApi() {
 
     @Serializable
     private data class StreamUpFileInfo(
-        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: String,
-        @JsonProperty("streaming_url") @SerialName("streaming_url") val streamingUrl: String,
-        @JsonProperty("subtitles") @SerialName("subtitles") val subtitles: List<StreamUpSubtitle>?,
+        val title: String,
+        val thumbnail: String,
+        @SerialName("streaming_url")
+        @JsonProperty("streaming_url")
+        val streamingUrl: String,
+        val subtitles: List<StreamUpSubtitle>?
     )
 
     @Serializable
     private data class StreamUpSubtitle(
-        @JsonProperty("file_path") @SerialName("file_path") val filePath: String,
-        @JsonProperty("language") @SerialName("language") val language: String,
+        @SerialName("file_path")
+        @JsonProperty("file_path")
+        val filePath: String,
+        val language: String,
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
index 0c8e41ab7..bc94ae0cc 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
@@ -7,32 +7,27 @@ import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 open class VideoSeyred : ExtractorApi() {
-    override val name = "VideoSeyred"
-    override val mainUrl = "https://videoseyred.in"
+    override val name            = "VideoSeyred"
+    override val mainUrl         = "https://videoseyred.in"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val extRef = referer ?: ""
-        val videoId = url.substringAfter("embed/").substringBefore("?")
-        val videoUrl = "$mainUrl/playlist/$videoId.json"
-        val responseRaw = app.get(videoUrl)
-        val responseList = tryParseJson<List<VideoSeyredSource>>(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
-        val response = responseList[0]
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val extRef   = referer ?: ""
+        val videoId  = url.substringAfter("embed/").substringBefore("?")
+        val videoUrl = "${mainUrl}/playlist/${videoId}.json"
+
+        val responseRaw                          = app.get(videoUrl)
+        val responseList: List<VideoSeyredSource> = tryParseJson<List<VideoSeyredSource>>(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
+        val response                              = responseList[0]
+
         for (track in response.tracks) {
             if (track.label != null && track.kind == "captions") {
                 subtitleCallback.invoke(
                     newSubtitleFile(
                         lang = track.label,
-                        url = fixUrl(track.file),
+                        url  = fixUrl(track.file)
                     )
                 )
             }
@@ -41,38 +36,35 @@ open class VideoSeyred : ExtractorApi() {
         for (source in response.sources) {
             callback.invoke(
                 newExtractorLink(
-                    source = this.name,
-                    name = this.name,
-                    url = source.file,
+                    source  = this.name,
+                    name    = this.name,
+                    url     = source.file,
                 ) {
-                    this.referer = "$mainUrl/"
+                    this.referer = "${mainUrl}/"
                     this.quality = Qualities.Unknown.value
                 }
             )
         }
     }
 
-    @Serializable
     data class VideoSeyredSource(
-        @JsonProperty("image") @SerialName("image") val image: String,
-        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("sources") @SerialName("sources") val sources: List<VSSource>,
-        @JsonProperty("tracks") @SerialName("tracks") val tracks: List<VSTrack>,
+        @JsonProperty("image")   val image: String,
+        @JsonProperty("title")   val title: String,
+        @JsonProperty("sources") val sources: List<VSSource>,
+        @JsonProperty("tracks")  val tracks: List<VSTrack>
     )
 
-    @Serializable
     data class VSSource(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("type") @SerialName("type") val type: String,
-        @JsonProperty("default") @SerialName("default") val default: String,
+        @JsonProperty("file")    val file: String,
+        @JsonProperty("type")    val type: String,
+        @JsonProperty("default") val default: String
     )
 
-    @Serializable
     data class VSTrack(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("kind") @SerialName("kind") val kind: String,
-        @JsonProperty("language") @SerialName("language") val language: String? = null,
-        @JsonProperty("label") @SerialName("label") val label: String? = null,
-        @JsonProperty("default") @SerialName("default") val default: String? = null,
+        @JsonProperty("file")     val file: String,
+        @JsonProperty("kind")     val kind: String,
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("label")    val label: String?    = null,
+        @JsonProperty("default")  val default: String?  = null
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt
index 5cb1706cd..df663f97f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt
@@ -4,28 +4,26 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
-class Videzz : Vidoza() {
-    override val mainUrl = "https://videzz.net"
+class Videzz: Vidoza() {
+    override val mainUrl: String = "https://videzz.net"
 }
 
-open class Vidoza : ExtractorApi() {
-    override val name = "Vidoza"
-    override val mainUrl = "https://vidoza.net"
-    override val requiresReferer = false
+open class Vidoza: ExtractorApi() {
+    override val name: String = "Vidoza"
+    override val mainUrl: String = "https://vidoza.net"
+    override val requiresReferer: Boolean = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val response = app.get(url).document
         val script = response.selectFirst("script:containsData(sourcesCode)")?.data()
@@ -34,27 +32,31 @@ open class Vidoza : ExtractorApi() {
         // e.g. sourcesCode: [{ src: "https://str38.vidoza.net/vod/v2/.../v.mp4", type: "video/mp4", label:"SD", res:"720"}],
         var sourcesArray = script.substringAfter("sourcesCode:").substringBefore("\n")
         arrayOf("src", "type", "label", "res").forEach {
-            // Add missing quotation marks, e.g. src: "https..." -> "src": "https..."
-            sourcesArray = sourcesArray.replace(Regex(""""?$it"?:"""), """"$it":""")
+            // add missing quotation marks, e.g. src: "https..." -> "src": "https..."
+            sourcesArray = sourcesArray
+                .replace(Regex(""""?$it"?:"""), """"$it":""")
         }
+        val videoData = AppUtils.parseJson<VinovoDataList>(sourcesArray)
 
-        val videoData = parseJson<ArrayList<VinovoVideoData>>(sourcesArray)
         for (stream in videoData) {
             callback.invoke(
                 newExtractorLink(
                     source = name,
                     name = name,
-                    url = stream.source,
-                ) { quality = getQualityFromName(stream.resolution) }
+                    url = stream.source
+                ) {
+                    quality = getQualityFromName(stream.resolution)
+                }
             )
         }
     }
 
-    @Serializable
+    private class VinovoDataList: ArrayList<VinovoVideoData>()
+
     private data class VinovoVideoData(
-        @JsonProperty("src") @SerialName("src") val source: String,
-        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("label") @SerialName("label") val label: String?,
-        @JsonProperty("res") @SerialName("res") val resolution: String?,
+        @JsonProperty("src") val source: String,
+        @JsonProperty("type") val type: String?,
+        @JsonProperty("label") val label: String?,
+        @JsonProperty("res") val resolution: String?,
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vids.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vids.kt
index 9eb01e321..1312570d3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vids.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vids.kt
@@ -7,6 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
+@Prerelease
 open class Vids : ExtractorApi() {
     override val name: String = "Vids"
     override val mainUrl: String = "https://vids.st"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
index 4cd85fdb5..49560d456 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
@@ -1,46 +1,18 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.Prerelease
+import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.base64Decode
-import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import com.lagradost.nicehttp.NiceResponse
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.jsonPrimitive
 
-open class Vixeo : Vidsonic() {
-    override val name: String = "Vixeo"
-    override val mainUrl: String = "https://vixeo.io"
-
-    @Prerelease
-    override fun extractEncodedVideoUrl(response: NiceResponse): String {
-        // Vixeo encodes the stream URL as Base64 instead of inlining it into JavaScript
-        val dataConfigBase64 = response.document.select("#streamsonic-player-root").attr("data-config")
-        val dataConfigRaw = base64Decode(dataConfigBase64)
-        val dataConfig = AppUtils.parseJson<JsonObject>(dataConfigRaw)
-        return dataConfig["source"]!!.jsonPrimitive.content
-    }
-}
-
-@Prerelease
-open class Vidsonic : ExtractorApi() {
+class Vidsonic() : ExtractorApi() {
     override val name: String = "Vidsonic"
     override val mainUrl: String = "https://vidsonic.net"
     override val requiresReferer: Boolean = false
 
-    @Prerelease
-    open fun extractEncodedVideoUrl(response: NiceResponse): String {
-        return response.text
-            .substringAfter("const _0x1 = ")
-            .substringBefore(";")
-            .replace("'", "")
-    }
-
     override suspend fun getUrl(
         url: String,
         referer: String?,
@@ -59,8 +31,12 @@ open class Vidsonic : ExtractorApi() {
         //     return _0x5.split('').reverse().join('');
         // };
         // const _0x7 = _0x2(_0x1); <-- now contains the stream URL
-        val response = app.get(url)
-        val encodedStreamUrl = extractEncodedVideoUrl(response)
+
+        val response = app.get(url).text
+        val encodedStreamUrl = response
+            .substringAfter("const _0x1 = ")
+            .substringBefore(";")
+            .replace("'", "")
 
         // (improved) Kotlin implementation of the JavaScript code from above
         val streamUrl = encodedStreamUrl
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vinovo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vinovo.kt
index 8fc42d65a..e905543a8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vinovo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vinovo.kt
@@ -1,33 +1,32 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder.getCaptchaToken
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class VinovoSi : VinovoTo() {
-    override val name = "VinovoSi"
-    override val mainUrl = "https://vinovo.si"
+    override var name = "VinovoSi"
+    override var mainUrl = "https://vinovo.si"
 }
 
 open class VinovoTo : ExtractorApi() {
-    override val mainUrl = "https://vinovo.to"
-    override val name = "VinovoTo"
-    override val requiresReferer = false
+    override val mainUrl: String = "https://vinovo.to"
+    override val name: String = "VinovoTo"
+    override val requiresReferer: Boolean = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val fixedUrl = url.replace("/d/", "/e/")
+
         val resp = app.get(fixedUrl, referer = referer)
         val doc = resp.document
 
@@ -36,20 +35,21 @@ open class VinovoTo : ExtractorApi() {
         val fileCode = doc.selectFirst("meta[name=\"file_code\"]")?.attr("content") ?: return
 
         val captchaToken = doc.selectFirst("meta[name=recaptcha]")?.attr("content") ?: return
-        val captchaSolution = getCaptchaToken(fixedUrl, captchaToken, "$mainUrl/") ?: return
+        val captchaSolution =
+            APIHolder.getCaptchaToken(fixedUrl, captchaToken, "$mainUrl/") ?: return
 
         val streamInfo = app.post(
             url = "$mainUrl/api/file/url/$fileCode",
             data = mapOf("token" to videoToken, "recaptcha" to captchaSolution),
             headers = mapOf(
                 "Origin" to mainUrl,
-                "X-Requested-With" to "XMLHttpRequest",
+                "X-Requested-With" to "XMLHttpRequest"
             ),
             cookies = resp.cookies,
-            referer = fixedUrl,
+            referer = fixedUrl
         ).parsed<VinovoFileResp>()
-
         val fileUrl = "$videoBaseUrl/stream/${streamInfo.token}"
+
         callback.invoke(
             newExtractorLink(source = name, name = name, url = fileUrl) {
                 val dataTitle = doc.selectFirst("video")?.attr("data-title").orEmpty()
@@ -59,9 +59,8 @@ open class VinovoTo : ExtractorApi() {
         )
     }
 
-    @Serializable
     private data class VinovoFileResp(
-        @JsonProperty("status") @SerialName("status") val status: String,
-        @JsonProperty("token") @SerialName("token") val token: String,
+        @JsonProperty("status") val status: String,
+        @JsonProperty("token") val token: String,
     )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
index b3ea4df1b..67eb49c9a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
@@ -1,18 +1,16 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class Tubeless : Voe() {
     override val name = "Tubeless"
@@ -21,12 +19,12 @@ class Tubeless : Voe() {
 
 class Simpulumlamerop : Voe() {
     override val name = "Simplum"
-    override val mainUrl = "https://simpulumlamerop.com"
+    override var mainUrl = "https://simpulumlamerop.com"
 }
 
 class Urochsunloath : Voe() {
     override val name = "Uroch"
-    override val mainUrl = "https://urochsunloath.com"
+    override var mainUrl = "https://urochsunloath.com"
 }
 
 class NathanFromSubject : Voe() {
@@ -35,7 +33,7 @@ class NathanFromSubject : Voe() {
 
 class Yipsu : Voe() {
     override val name = "Yipsu"
-    override val mainUrl = "https://yip.su"
+    override var mainUrl = "https://yip.su"
 }
 
 class MetaGnathTuggers : Voe() {
@@ -61,43 +59,38 @@ open class Voe : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         var res = app.get(url, referer = referer)
         val redirectUrl = redirectRegex.find(res.document.data())?.groupValues?.get(1)
         if (redirectUrl != null) {
             res = app.get(redirectUrl, referer = referer)
         }
-
-        val encodedString = res.document.selectFirst("script[type=application/json]")
-            ?.data()?.trim()
-            ?.substringAfter("[\"")
-            ?.substringBeforeLast("\"]")
-
+        val encodedString = res.document.selectFirst("script[type=application/json]")?.data()?.trim()?.substringAfter("[\"")?.substringBeforeLast("\"]")
         if (encodedString == null) {
             println("encoded string not found.")
             return
         }
-
         val decryptedJson = decryptF7(encodedString)
-        val m3u8 = decryptedJson?.source
-        val mp4 = decryptedJson?.directAccessUrl
+        val m3u8 = decryptedJson.get("source")?.asString
+        val mp4 = decryptedJson.get("direct_access_url")?.asString
+
         if (m3u8 != null) {
             M3u8Helper.generateM3u8(
                 name,
                 m3u8,
                 "$mainUrl/",
-                headers = mapOf("Origin" to "$mainUrl/"),
+                headers = mapOf("Origin" to "$mainUrl/")
             ).forEach(callback)
         }
-
-        if (mp4 != null) {
+        if (mp4!=null)
+        {
             callback.invoke(
                 newExtractorLink(
                     source = "$name MP4",
                     name = "$name MP4",
                     url = mp4,
-                    INFER_TYPE,
+                    INFER_TYPE
                 ) {
                     this.referer = url
                     this.quality = Qualities.Unknown.value
@@ -106,19 +99,20 @@ open class Voe : ExtractorApi() {
         }
     }
 
-    private fun decryptF7(p8: String): VoeDecrypted? {
+    private fun decryptF7(p8: String): JsonObject {
         return try {
             val vF = rot13(p8)
             val vF2 = replacePatterns(vF)
             val vF3 = removeUnderscores(vF2)
             val vF4 = base64Decode(vF3)
             val vF5 = charShift(vF4, 3)
-            val vF6 = vF5.reversed()
+            val vF6 = reverse(vF5)
             val vAtob = base64Decode(vF6)
-            parseJson<VoeDecrypted>(vAtob)
+
+            JsonParser.parseString(vAtob).asJsonObject
         } catch (e: Exception) {
             println("Decryption error: ${e.message}")
-            null
+            JsonObject()
         }
     }
 
@@ -145,9 +139,6 @@ open class Voe : ExtractorApi() {
         return input.map { (it.code - shift).toChar() }.joinToString("")
     }
 
-    @Serializable
-    private data class VoeDecrypted(
-        @JsonProperty("source") @SerialName("source") val source: String? = null,
-        @JsonProperty("direct_access_url") @SerialName("direct_access_url") val directAccessUrl: String? = null,
-    )
+    private fun reverse(input: String): String = input.reversed()
+
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
index 4392e64ed..6e3a8126d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
@@ -9,74 +9,96 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class StreamM4u : XStreamCdn() {
-    override val name = "StreamM4u"
-    override val mainUrl = "https://streamm4u.club"
+    override val name: String = "StreamM4u"
+    override val mainUrl: String = "https://streamm4u.club"
 }
 
 class Fembed9hd : XStreamCdn() {
-    override val name = "Fembed9hd"
-    override val mainUrl = "https://fembed9hd.com"
+    override var mainUrl = "https://fembed9hd.com"
+    override var name = "Fembed9hd"
 }
 
-class Cdnplayer : XStreamCdn() {
-    override val name = "Cdnplayer"
-    override val mainUrl = "https://cdnplayer.online"
+class Cdnplayer: XStreamCdn() {
+    override val name: String = "Cdnplayer"
+    override val mainUrl: String = "https://cdnplayer.online"
 }
 
-class Kotakajair : XStreamCdn() {
-    override val name = "Kotakajair"
-    override val mainUrl = "https://kotakajair.xyz"
+class Kotakajair: XStreamCdn() {
+    override val name: String = "Kotakajair"
+    override val mainUrl: String = "https://kotakajair.xyz"
 }
 
-class FEnet : XStreamCdn() {
-    override val name = "FEnet"
-    override val mainUrl = "https://fembed.net"
+class FEnet: XStreamCdn() {
+    override val name: String = "FEnet"
+    override val mainUrl: String = "https://fembed.net"
 }
 
-class Rasacintaku : XStreamCdn() {
-    override val mainUrl = "https://rasa-cintaku-semakin-berantai.xyz"
+class Rasacintaku: XStreamCdn() {
+    override val mainUrl: String = "https://rasa-cintaku-semakin-berantai.xyz"
 }
 
-class LayarKaca : XStreamCdn() {
-    override val name = "LayarKaca-xxi"
-    override val mainUrl = "https://layarkacaxxi.icu"
+class LayarKaca: XStreamCdn() {
+    override val name: String = "LayarKaca-xxi"
+    override val mainUrl: String = "https://layarkacaxxi.icu"
 }
 
-class DBfilm : XStreamCdn() {
-    override val name = "DBfilm"
-    override val mainUrl = "https://dbfilm.bar"
+class DBfilm: XStreamCdn() {
+    override val name: String = "DBfilm"
+    override val mainUrl: String = "https://dbfilm.bar"
 }
 
-class Luxubu : XStreamCdn() {
-    override val name = "FE"
-    override val mainUrl = "https://www.luxubu.review"
+class Luxubu : XStreamCdn(){
+    override val name: String = "FE"
+    override val mainUrl: String = "https://www.luxubu.review"
 }
 
-class FEmbed : XStreamCdn() {
-    override val name = "FEmbed"
-    override val mainUrl = "https://www.fembed.com"
+class FEmbed: XStreamCdn() {
+    override val name: String = "FEmbed"
+    override val mainUrl: String = "https://www.fembed.com"
 }
 
-class Fplayer : XStreamCdn() {
-    override val name = "Fplayer"
-    override val mainUrl = "https://fplayer.info"
+class Fplayer: XStreamCdn() {
+    override val name: String = "Fplayer"
+    override val mainUrl: String = "https://fplayer.info"
 }
 
-class FeHD : XStreamCdn() {
-    override val name = "FeHD"
-    override val mainUrl = "https://fembed-hd.com"
-    override val domainUrl = "fembed-hd.com"
+class FeHD: XStreamCdn() {
+    override val name: String = "FeHD"
+    override val mainUrl: String = "https://fembed-hd.com"
+    override var domainUrl: String = "fembed-hd.com"
 }
 
 open class XStreamCdn : ExtractorApi() {
-    override val name = "XStreamCdn"
-    override val mainUrl = "https://embedsito.com"
+    override val name: String = "XStreamCdn"
+    override val mainUrl: String = "https://embedsito.com"
     override val requiresReferer = false
-    open val domainUrl = "embedsito.com"
+    open var domainUrl: String = "embedsito.com"
+
+    private data class ResponseData(
+        @JsonProperty("file") val file: String,
+        @JsonProperty("label") val label: String,
+        //val type: String // Mp4
+    )
+
+    private data class Player(
+        @JsonProperty("poster_file") val poster_file: String? = null,
+    )
+
+    private data class ResponseJson(
+        @JsonProperty("success") val success: Boolean,
+        @JsonProperty("player") val player: Player? = null,
+        @JsonProperty("data") val data: List<ResponseData>?,
+        @JsonProperty("captions") val captions: List<Captions?>?,
+    )
+
+    private data class Captions(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("hash") val hash: String,
+        @JsonProperty("language") val language: String,
+        @JsonProperty("extension") val extension: String
+    )
 
     override fun getExtractorUrl(id: String): String {
         return "$domainUrl/api/source/$id"
@@ -86,17 +108,16 @@ open class XStreamCdn : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         val headers = mapOf(
             "Referer" to url,
             "User-Agent" to "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0",
         )
-
         val id = url.trimEnd('/').split("/").last()
-        val newUrl = "https://$domainUrl/api/source/$id"
+        val newUrl = "https://${domainUrl}/api/source/${id}"
         app.post(newUrl, headers = headers).let { res ->
-            val sources = tryParseJson<ResponseJson>(res.text)
+            val sources = tryParseJson<ResponseJson?>(res.text)
             sources?.let {
                 if (it.success && it.data != null) {
                     it.data.map { source ->
@@ -114,7 +135,7 @@ open class XStreamCdn : ExtractorApi() {
                 }
             }
 
-            val userData = sources?.player?.posterFile?.split("/")?.get(2)
+            val userData = sources?.player?.poster_file?.split("/")?.get(2)
             sources?.captions?.map {
                 subtitleCallback.invoke(
                     newSubtitleFile(
@@ -125,31 +146,4 @@ open class XStreamCdn : ExtractorApi() {
             }
         }
     }
-
-    @Serializable
-    private data class ResponseData(
-        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("label") @SerialName("label") val label: String,
-    )
-
-    @Serializable
-    private data class Player(
-        @JsonProperty("poster_file") @SerialName("poster_file") val posterFile: String? = null,
-    )
-
-    @Serializable
-    private data class ResponseJson(
-        @JsonProperty("success") @SerialName("success") val success: Boolean,
-        @JsonProperty("player") @SerialName("player") val player: Player? = null,
-        @JsonProperty("data") @SerialName("data") val data: List<ResponseData>?,
-        @JsonProperty("captions") @SerialName("captions") val captions: List<Captions?>?,
-    )
-
-    @Serializable
-    private data class Captions(
-        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("hash") @SerialName("hash") val hash: String,
-        @JsonProperty("language") @SerialName("language") val language: String,
-        @JsonProperty("extension") @SerialName("extension") val extension: String,
-    )
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt
index 88eb58333..9f2d6bde0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt
@@ -7,10 +7,8 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
-open class YourUpload : ExtractorApi() {
+open class YourUpload: ExtractorApi() {
     override val name = "Yourupload"
     override val mainUrl = "https://www.yourupload.com"
     override val requiresReferer = false
@@ -21,11 +19,13 @@ open class YourUpload : ExtractorApi() {
             val quality = Regex("\\d{3,4}p").find(this.select("title").text())?.groupValues?.get(0)
             this.select("script").map { script ->
                 if (script.data().contains("var jwplayerOptions = {")) {
-                    val data = script.data().substringAfter("var jwplayerOptions = {").substringBefore(",\n")
+                    val data =
+                        script.data().substringAfter("var jwplayerOptions = {").substringBefore(",\n")
                     val link = tryParseJson<ResponseSource>(
-                        "{${data.replace("file", "\"file\"").replace("'", "\"")}}"
+                        "{${
+                            data.replace("file", "\"file\"").replace("'", "\"")
+                        }}"
                     )
-
                     sources.add(
                         newExtractorLink(
                             source = name,
@@ -39,12 +39,11 @@ open class YourUpload : ExtractorApi() {
                 }
             }
         }
-
         return sources
     }
 
-    @Serializable
     private data class ResponseSource(
-        @JsonProperty("file") @SerialName("file") val file: String,
+        @JsonProperty("file") val file: String,
     )
-}
+
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt
index 4ae615846..22527bcfb 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt
@@ -9,7 +9,6 @@ import dev.whyoleg.cryptography.CryptographyProvider
 import dev.whyoleg.cryptography.DelicateCryptographyApi
 import dev.whyoleg.cryptography.algorithms.AES
 import dev.whyoleg.cryptography.algorithms.MD5
-import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -21,7 +20,8 @@ object AesHelper {
     private val md5Hasher = provider.get(MD5).hasher()
 
     @OptIn(DelicateCryptographyApi::class)
-    suspend fun cryptoAESHandler(
+    @Prerelease
+    fun cryptoAESHandler(
         data: String,
         pass: ByteArray,
         encrypt: Boolean = true,
@@ -35,21 +35,22 @@ object AesHelper {
             saltLength = parse.s.length / 2,
         ) ?: return null
 
-        val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, key)
+        val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, key)
         val cipher = aesKey.cipher(padding = padding)
 
         return if (!encrypt) {
-            val plainBytes = cipher.decryptWithIv(iv, base64DecodeArray(parse.ct))
+            val plainBytes = cipher.decryptWithIvBlocking(iv, base64DecodeArray(parse.ct))
             plainBytes.decodeToString()
         } else {
-            base64Encode(cipher.encryptWithIv(iv, parse.ct.encodeToByteArray()))
+            base64Encode(cipher.encryptWithIvBlocking(iv, parse.ct.encodeToByteArray()))
         }
     }
 
-    @Deprecated(
+    // Deprecate after next stable
+    /* @Deprecated(
         message = "Set padding = false for no padding",
         level = DeprecationLevel.WARNING,
-    )
+    ) */
     fun cryptoAESHandler(
         data: String,
         pass: ByteArray,
@@ -59,7 +60,7 @@ object AesHelper {
         // If it ends with NoPadding (e.g. "AES/CBC/NoPadding"), then it
         // doesn't have padding, otherwise we treat as if it does.
         val hasPadding = !padding.endsWith("NoPadding")
-        return runBlocking { cryptoAESHandler(data, pass, encrypt, hasPadding) }
+        return cryptoAESHandler(data, pass, encrypt, hasPadding)
     }
 
     // https://stackoverflow.com/a/41434590/8166854
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
index 86d402002..477c965ce 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
@@ -39,7 +39,7 @@ object GogoHelper {
     // https://github.com/saikou-app/saikou/blob/45d0a99b8a72665a29a1eadfb38c506b842a29d7/app/src/main/java/ani/saikou/parsers/anime/extractors/GogoCDN.kt#L97
     // No Licence on the function
     @OptIn(DelicateCryptographyApi::class)
-    private suspend fun cryptoHandler(
+    private fun cryptoHandler(
         string: String,
         iv: String,
         secretKeyString: String,
@@ -47,14 +47,14 @@ object GogoHelper {
     ): String {
         val ivBytes = iv.encodeToByteArray()
         val keyBytes = secretKeyString.encodeToByteArray()
-        val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
         val cipher = aesKey.cipher(padding = true)
 
         return if (!encrypt) {
-            val plainBytes = cipher.decryptWithIv(ivBytes, base64DecodeArray(string))
+            val plainBytes = cipher.decryptWithIvBlocking(ivBytes, base64DecodeArray(string))
             plainBytes.decodeToString()
         } else {
-            base64Encode(cipher.encryptWithIv(ivBytes, string.encodeToByteArray()))
+            base64Encode(cipher.encryptWithIvBlocking(ivBytes, string.encodeToByteArray()))
         }
     }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
index 2b388d4e0..c9ba4a624 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
@@ -9,12 +9,11 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlin.collections.orEmpty
 
+@Prerelease
 object JwPlayerHelper {
     private val sourceRegex = Regex(""""?sources"?:\s*(\[.*?\])""")
     private val tracksRegex = Regex(""""?tracks"?:\s*(\[.*?\])""")
@@ -54,12 +53,11 @@ object JwPlayerHelper {
         }.toList()
 
         var extractedLinks = sourceMatches.flatMap { link ->
-            val cleanUrl = link.file.replace("\\/", "/")
-            if (cleanUrl.contains(".m3u8") || cleanUrl.contains(".txt")) {
+            if (link.file.contains(".m3u8")) {
                 try {
                     M3u8Helper.generateM3u8(
                         source = sourceName,
-                        streamUrl = cleanUrl,
+                        streamUrl = link.file,
                         referer = mainUrl,
                         headers = headers,
                     )
@@ -72,7 +70,7 @@ object JwPlayerHelper {
                     newExtractorLink(
                         source = sourceName,
                         name = sourceName,
-                        url = fixUrl(cleanUrl, mainUrl),
+                        url = fixUrl(link.file, mainUrl),
                     ) {
                         this.referer = url
                         this.headers = headers
@@ -101,13 +99,11 @@ object JwPlayerHelper {
          */
         if (extractedLinks.isEmpty()) {
             extractedLinks = m3u8Regex.findAll(script).toList().map { match ->
-                val cleanUrl = match.groupValues[1].replace("\\/", "/")
-                val isM3u8 = cleanUrl.contains(".m3u8") || cleanUrl.contains(".txt")
+                val link = match.groupValues[1]
                 newExtractorLink(
                     source = sourceName,
                     name = sourceName,
-                    url = fixUrl(cleanUrl, mainUrl),
-                    type = if (isM3u8) ExtractorLinkType.M3U8 else INFER_TYPE,
+                    url = fixUrl(link, mainUrl),
                 ) {
                     this.referer = url
                     this.headers = headers
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
index 88dda631a..89f935da3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
@@ -1,9 +1,7 @@
 package com.lagradost.cloudstream3.metaproviders
 
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Actor
-import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.Episode
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.HomePageList
@@ -22,8 +20,6 @@ import com.lagradost.cloudstream3.SearchResponseList
 import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.TvSeriesSearchResponse
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.addDate
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.newEpisode
 import com.lagradost.cloudstream3.newHomePageResponse
 import com.lagradost.cloudstream3.newMovieLoadResponse
@@ -32,22 +28,35 @@ import com.lagradost.cloudstream3.newTvSeriesLoadResponse
 import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.runAllAsync
 import com.lagradost.cloudstream3.toNewSearchResponseList
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.uwetrottmann.tmdb2.Tmdb
+import com.uwetrottmann.tmdb2.entities.AppendToResponse
+import com.uwetrottmann.tmdb2.entities.BaseMovie
+import com.uwetrottmann.tmdb2.entities.BaseTvShow
+import com.uwetrottmann.tmdb2.entities.CastMember
+import com.uwetrottmann.tmdb2.entities.ContentRating
+import com.uwetrottmann.tmdb2.entities.Movie
+import com.uwetrottmann.tmdb2.entities.ReleaseDate
+import com.uwetrottmann.tmdb2.entities.ReleaseDatesResult
+import com.uwetrottmann.tmdb2.entities.TvSeason
+import com.uwetrottmann.tmdb2.entities.TvShow
+import com.uwetrottmann.tmdb2.entities.Videos
+import com.uwetrottmann.tmdb2.enumerations.AppendToResponseItem
+import com.uwetrottmann.tmdb2.enumerations.VideoType
+import retrofit2.awaitResponse
+import retrofit2.Response
+import java.util.Calendar
 
 /**
  * episode and season starting from 1
  * they are null if movie
- */
-@Serializable
+ * */
 data class TmdbLink(
-    @JsonProperty("imdbID") @SerialName("imdbID") val imdbID: String?,
-    @JsonProperty("tmdbID") @SerialName("tmdbID") val tmdbID: Int?,
-    @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-    @JsonProperty("season") @SerialName("season") val season: Int?,
-    @JsonProperty("movieName") @SerialName("movieName") val movieName: String? = null,
+    @JsonProperty("imdbID") val imdbID: String?,
+    @JsonProperty("tmdbID") val tmdbID: Int?,
+    @JsonProperty("episode") val episode: Int?,
+    @JsonProperty("season") val season: Int?,
+    @JsonProperty("movieName") val movieName: String? = null,
 )
 
 open class TmdbProvider : MainAPI() {
@@ -58,184 +67,19 @@ open class TmdbProvider : MainAPI() {
     open val useMetaLoadResponse = false
     open val apiName = "TMDB"
 
-    // As some sites don't support s0
+    // As some sites doesn't support s0
     open val disableSeasonZero = true
 
     override val hasMainPage = true
     override val providerType = ProviderType.MetaProvider
 
-    private val tmdbApiKey = "e6333b32409e02a4a6eba6fb7ff866bb"
-    private val tmdbApiUrl = "https://api.themoviedb.org/3"
-
-    @Serializable
-    data class TmdbIds(
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String? = null,
-        @JsonProperty("tvdb_id") @SerialName("tvdb_id") val tvdbId: Int? = null,
-    )
-
-    @Serializable
-    data class TmdbGenre(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-    )
-
-    @Serializable
-    data class TmdbCastMember(
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("character") @SerialName("character") val character: String? = null,
-        @JsonProperty("profile_path") @SerialName("profile_path") val profilePath: String? = null,
-    )
-
-    @Serializable
-    data class TmdbCredits(
-        @JsonProperty("cast") @SerialName("cast") val cast: List<TmdbCastMember>? = null,
-    )
-
-    @Serializable
-    data class TmdbVideo(
-        @JsonProperty("key") @SerialName("key") val key: String? = null,
-        @JsonProperty("site") @SerialName("site") val site: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-    )
-
-    @Serializable
-    data class TmdbVideos(
-        @JsonProperty("results") @SerialName("results") val results: List<TmdbVideo>? = null,
-    )
-
-    // Shared between movie and tv search results
-    @Serializable
-    data class TmdbSearchResult(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null, // movies
-        @JsonProperty("original_title") @SerialName("original_title") val originalTitle: String? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null, // tv
-        @JsonProperty("original_name") @SerialName("original_name") val originalName: String? = null,
-        @JsonProperty("poster_path") @SerialName("poster_path") val posterPath: String? = null,
-        @JsonProperty("vote_average") @SerialName("vote_average") val voteAverage: Double? = null,
-        @JsonProperty("release_date") @SerialName("release_date") val releaseDate: String? = null,
-        @JsonProperty("first_air_date") @SerialName("first_air_date") val firstAirDate: String? = null,
-        @JsonProperty("media_type") @SerialName("media_type") val mediaType: String? = null, // for multi-search
-    ) {
-        @get:JsonIgnore val isTv get() = name != null || mediaType == "tv"
-        @get:JsonIgnore val displayTitle get() = title ?: originalTitle ?: name ?: originalName ?: ""
-        @get:JsonIgnore val year get() = (releaseDate ?: firstAirDate)?.take(4)?.toIntOrNull()
-    }
-
-    @Serializable
-    data class TmdbPageResult(
-        @JsonProperty("results") @SerialName("results") val results: List<TmdbSearchResult>? = null,
-        @JsonProperty("total_pages") @SerialName("total_pages") val totalPages: Int? = null,
-        @JsonProperty("total_results") @SerialName("total_results") val totalResults: Int? = null,
-    )
-
-    @Serializable
-    data class TmdbMultiResult(
-        @JsonProperty("results") @SerialName("results") val results: List<TmdbSearchResult>? = null,
-    )
-
-    @Serializable
-    data class TmdbEpisode(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
-        @JsonProperty("episode_number") @SerialName("episode_number") val episodeNumber: Int? = null,
-        @JsonProperty("season_number") @SerialName("season_number") val seasonNumber: Int? = null,
-        @JsonProperty("still_path") @SerialName("still_path") val stillPath: String? = null,
-        @JsonProperty("air_date") @SerialName("air_date") val airDate: String? = null,
-        @JsonProperty("vote_average") @SerialName("vote_average") val voteAverage: Double? = null,
-        @JsonProperty("external_ids") @SerialName("external_ids") val externalIds: TmdbIds? = null,
-    )
-
-    @Serializable
-    data class TmdbSeasonDetail(
-        @JsonProperty("season_number") @SerialName("season_number") val seasonNumber: Int? = null,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: List<TmdbEpisode>? = null,
-    )
-
-    @Serializable
-    data class TmdbSeasonSummary(
-        @JsonProperty("season_number") @SerialName("season_number") val seasonNumber: Int? = null,
-        @JsonProperty("episode_count") @SerialName("episode_count") val episodeCount: Int? = null,
-    )
-
-    @Serializable
-    data class TmdbContentRating(
-        @JsonProperty("iso_3166_1") @SerialName("iso_3166_1") val country: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: String? = null,
-    )
-
-    @Serializable
-    data class TmdbContentRatings(
-        @JsonProperty("results") @SerialName("results") val results: List<TmdbContentRating>? = null,
-    )
-
-    @Serializable
-    data class TmdbReleaseDateEntry(
-        @JsonProperty("certification") @SerialName("certification") val certification: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: Int? = null,
-    )
-
-    @Serializable
-    data class TmdbReleaseDateResult(
-        @JsonProperty("iso_3166_1") @SerialName("iso_3166_1") val country: String? = null,
-        @JsonProperty("release_dates") @SerialName("release_dates") val releaseDates: List<TmdbReleaseDateEntry>? = null,
-    )
-
-    @Serializable
-    data class TmdbReleaseDates(
-        @JsonProperty("results") @SerialName("results") val results: List<TmdbReleaseDateResult>? = null,
-    )
-
-    @Serializable
-    data class TmdbTvDetail(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("original_name") @SerialName("original_name") val originalName: String? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
-        @JsonProperty("poster_path") @SerialName("poster_path") val posterPath: String? = null,
-        @JsonProperty("first_air_date") @SerialName("first_air_date") val firstAirDate: String? = null,
-        @JsonProperty("vote_average") @SerialName("vote_average") val voteAverage: Double? = null,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<TmdbGenre>? = null,
-        @JsonProperty("episode_run_time") @SerialName("episode_run_time") val episodeRunTime: List<Int>? = null,
-        @JsonProperty("seasons") @SerialName("seasons") val seasons: List<TmdbSeasonSummary>? = null,
-        @JsonProperty("external_ids") @SerialName("external_ids") val externalIds: TmdbIds? = null,
-        @JsonProperty("videos") @SerialName("videos") val videos: TmdbVideos? = null,
-        @JsonProperty("credits") @SerialName("credits") val credits: TmdbCredits? = null,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: TmdbPageResult? = null,
-        @JsonProperty("similar") @SerialName("similar") val similar: TmdbPageResult? = null,
-        @JsonProperty("content_ratings") @SerialName("content_ratings") val contentRatings: TmdbContentRatings? = null,
-    ) {
-        @get:JsonIgnore val displayTitle get() = name ?: originalName ?: ""
-        @get:JsonIgnore val year get() = firstAirDate?.take(4)?.toIntOrNull()
-    }
-
-    @Serializable
-    data class TmdbMovieDetail(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("original_title") @SerialName("original_title") val originalTitle: String? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
-        @JsonProperty("poster_path") @SerialName("poster_path") val posterPath: String? = null,
-        @JsonProperty("release_date") @SerialName("release_date") val releaseDate: String? = null,
-        @JsonProperty("vote_average") @SerialName("vote_average") val voteAverage: Double? = null,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<TmdbGenre>? = null,
-        @JsonProperty("runtime") @SerialName("runtime") val runtime: Int? = null,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String? = null,
-        @JsonProperty("external_ids") @SerialName("external_ids") val externalIds: TmdbIds? = null,
-        @JsonProperty("videos") @SerialName("videos") val videos: TmdbVideos? = null,
-        @JsonProperty("credits") @SerialName("credits") val credits: TmdbCredits? = null,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: TmdbPageResult? = null,
-        @JsonProperty("similar") @SerialName("similar") val similar: TmdbPageResult? = null,
-        @JsonProperty("release_dates") @SerialName("release_dates") val releaseDates: TmdbReleaseDates? = null,
-    ) {
-        @get:JsonIgnore val displayTitle get() = title ?: originalTitle ?: ""
-        @get:JsonIgnore val year get() = releaseDate?.take(4)?.toIntOrNull()
-    }
+    // Fuck it, public private api key because github actions won't co-operate.
+    // Please no stealy.
+    private val tmdb = Tmdb("e6333b32409e02a4a6eba6fb7ff866bb")
 
     private fun getImageUrl(link: String?): String? {
-        link ?: return null
-        return if (link.startsWith("/")) "https://image.tmdb.org/t/p/w500$link" else link
+        if (link == null) return null
+        return if (link.startsWith("/")) "https://image.tmdb.org/t/p/w500/$link" else link
     }
 
     private fun getUrl(id: Int?, tvShow: Boolean): String {
@@ -243,197 +87,199 @@ open class TmdbProvider : MainAPI() {
         else "https://www.themoviedb.org/movie/${id ?: -1}"
     }
 
-    private suspend fun getApi(path: String, extraParams: Map<String, String> = emptyMap()): String {
-        val params = buildMap {
-            put("api_key", tmdbApiKey)
-            putAll(extraParams)
-        }
-        return app.get(
-            url = "$tmdbApiUrl$path",
-            params = params,
-        ).text
-    }
-
-    private fun TmdbSearchResult.toSearchResponse() = if (isTv) {
-        newTvSeriesSearchResponse(
-            name = displayTitle,
+    private fun BaseTvShow.toSearchResponse(): TvSeriesSearchResponse {
+        return newTvSeriesSearchResponse(
+            name = this.name ?: this.original_name,
             url = getUrl(id, true),
             type = TvType.TvSeries,
-            fix = false,
+            fix = false
         ) {
             this.id = this@toSearchResponse.id
-            this.posterUrl = getImageUrl(posterPath)
-            this.score = Score.from10(voteAverage)
-            this.year = this@toSearchResponse.year
+            this.posterUrl = getImageUrl(poster_path)
+            this.score = Score.from10(vote_average)
+            this.year = first_air_date?.let {
+                Calendar.getInstance().apply {
+                    time = it
+                }.get(Calendar.YEAR)
+            }
         }
-    } else {
-        newMovieSearchResponse(
-            name = displayTitle,
+    }
+
+    private fun BaseMovie.toSearchResponse(): MovieSearchResponse {
+        return newMovieSearchResponse(
+            name = this.title ?: this.original_title,
             url = getUrl(id, false),
             type = TvType.Movie,
-            fix = false,
+            fix = false
         ) {
             this.id = this@toSearchResponse.id
-            this.posterUrl = getImageUrl(posterPath)
-            this.score = Score.from10(voteAverage)
-            this.year = this@toSearchResponse.year
-        }
-    }
-
-    private fun List<TmdbCastMember?>?.toActors(): List<Pair<Actor, String?>>? {
-        return this?.mapNotNull {
-            it ?: return@mapNotNull null
-            Pair(
-                Actor(it.name ?: return@mapNotNull null, getImageUrl(it.profilePath)),
-                it.character,
-            )
-        }
-    }
-
-    private fun TmdbVideos?.toTrailers(): List<String>? {
-        val skipTypes = setOf("Opening Credits", "Featurette")
-        return this?.results
-            ?.filter { it.type !in skipTypes }
-            ?.sortedBy { it.type }
-            ?.mapNotNull {
-                when (it.site?.trim()?.lowercase()) {
-                    "youtube" -> "https://www.youtube.com/watch?v=${it.key}"
-                    else -> null
-                }
+            this.posterUrl = getImageUrl(poster_path)
+            this.score = Score.from10(vote_average)
+            this.year = release_date?.let {
+                Calendar.getInstance().apply {
+                    time = it
+                }.get(Calendar.YEAR)
             }
+        }
     }
 
-    open suspend fun fetchContentRating(id: Int?, country: String): String? {
-        id ?: return null
-        // Try TV content ratings first
-        val tvRating = parseJson<TmdbContentRatings>(
-            getApi("/tv/$id/content_ratings")
-        ).results?.firstOrNull { it.country == country }?.rating
-        if (tvRating != null) return tvRating
-
-        // Fall back to movie release dates
-        return parseJson<TmdbReleaseDates>(
-            getApi("/movie/$id/release_dates")
-        ).results?.firstOrNull { it.country == country }
-            ?.releaseDates?.firstOrNull { !it.certification.isNullOrBlank() }
-            ?.certification
-    }
-
-    private suspend fun TmdbTvDetail.toLoadResponse(): TvSeriesLoadResponse {
-        val episodes = mutableListOf<Episode>()
-        val validSeasons = seasons?.filter { !disableSeasonZero || (it.seasonNumber ?: 0) != 0 }
-            ?: emptyList()
-
-        for (season in validSeasons) {
-            val seasonNum = season.seasonNumber ?: continue
-            val fullSeason = parseJson<TmdbSeasonDetail>(
-                getApi("/tv/$id/season/$seasonNum", mapOf("append_to_response" to "external_ids"))
+    private fun List<CastMember?>?.toActors(): List<Pair<Actor, String?>>? {
+        return this?.mapNotNull {
+            Pair(
+                Actor(it?.name ?: return@mapNotNull null, getImageUrl(it.profile_path)),
+                it.character
             )
+        }
+    }
+
+    private suspend fun TvShow.toLoadResponse(): TvSeriesLoadResponse {
+        val tvSeasonsService = tmdb.tvSeasonsService()
+        val episodes = mutableListOf<Episode>()
+
+        val validSeasons = this.seasons?.filter { !disableSeasonZero || (it.season_number ?: 0) != 0 } ?: emptyList()
+        for (season in validSeasons) {
+            val seasonNumber = season.season_number ?: continue
+
+            val response: Response<TvSeason> = tmdb.tvSeasonsService()
+                .season(this.id, seasonNumber, "external_ids,images,episodes")
+                .awaitResponse()
+
+            val fullSeason = response.body() ?: continue
 
             fullSeason.episodes?.forEach { episode ->
                 episodes += newEpisode(
                     TmdbLink(
-                        episode.externalIds?.imdbId ?: externalIds?.imdbId,
-                        id,
-                        episode.episodeNumber,
-                        episode.seasonNumber,
-                        displayTitle,
+                        episode.external_ids?.imdb_id ?: this.external_ids?.imdb_id,
+                        this.id,
+                        episode.episode_number,
+                        episode.season_number,
+                        this.name ?: this.original_name
                     ).toJson()
                 ) {
                     this.name = episode.name
-                    this.season = episode.seasonNumber
-                    this.episode = episode.episodeNumber
-                    this.score = Score.from10(episode.voteAverage)
+                    this.season = episode.season_number
+                    this.episode = episode.episode_number
+                    this.score = Score.from10(episode.vote_average)
                     this.description = episode.overview
-                    this.posterUrl = getImageUrl(episode.stillPath)
-                    this.addDate(episode.airDate)
+                    this.date = episode.air_date?.time
+                    this.posterUrl = getImageUrl(episode.still_path)
                 }
             }
         }
 
         return newTvSeriesLoadResponse(
-            displayTitle,
+            this.name ?: this.original_name,
             getUrl(id, true),
             TvType.TvSeries,
-            episodes,
+            episodes
         ) {
-            posterUrl = getImageUrl(posterPath)
-            this.year = this@toLoadResponse.year
+            posterUrl = getImageUrl(poster_path)
+            year = first_air_date?.let {
+                Calendar.getInstance().apply {
+                    time = it
+                }.get(Calendar.YEAR)
+            }
             plot = overview
-            addImdbId(externalIds?.imdbId)
+            addImdbId(external_ids?.imdb_id)
             tags = genres?.mapNotNull { it.name }
-            duration = episodeRunTime?.average()?.toInt()
-            score = Score.from10(voteAverage)
+            duration = episode_run_time?.average()?.toInt()
+            score = Score.from10(vote_average)
             addTrailer(videos.toTrailers())
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
             addActors(credits?.cast?.toList().toActors())
-            contentRating = contentRatings?.results?.firstOrNull { it.country == "US" }?.rating
-                ?: fetchContentRating(id, "US")
+            contentRating = fetchContentRating(id, "US")
         }
     }
 
-    private suspend fun TmdbMovieDetail.toLoadResponse(): MovieLoadResponse {
+    private fun Videos?.toTrailers(): List<String>? {
+        return this?.results?.filter { it.type != VideoType.OPENING_CREDITS && it.type != VideoType.FEATURETTE }
+            ?.sortedBy { it.type?.ordinal ?: 10000 }
+            ?.mapNotNull {
+                when (it.site?.trim()?.lowercase()) {
+                    "youtube" -> { // TODO FILL SITES
+                        "https://www.youtube.com/watch?v=${it.key}"
+                    }
+                    else -> null
+                }
+            }
+    }
+
+    private suspend fun Movie.toLoadResponse(): MovieLoadResponse {
         return newMovieLoadResponse(
-            displayTitle,
-            getUrl(id, false),
-            TvType.Movie,
-            TmdbLink(
-                imdbId ?: externalIds?.imdbId,
-                id,
+            this.title ?: this.original_title, getUrl(id, false), TvType.Movie, TmdbLink(
+                this.imdb_id,
+                this.id,
                 null,
                 null,
-                displayTitle,
+                this.title ?: this.original_title,
             ).toJson()
         ) {
-            posterUrl = getImageUrl(posterPath)
-            this.year = this@toLoadResponse.year
+            posterUrl = getImageUrl(poster_path)
+            year = release_date?.let {
+                Calendar.getInstance().apply {
+                    time = it
+                }.get(Calendar.YEAR)
+            }
             plot = overview
-            addImdbId(imdbId ?: externalIds?.imdbId)
+            addImdbId(external_ids?.imdb_id)
             tags = genres?.mapNotNull { it.name }
             duration = runtime
-            score = Score.from10(voteAverage)
+            score = Score.from10(vote_average)
             addTrailer(videos.toTrailers())
+
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
             addActors(credits?.cast?.toList().toActors())
-            contentRating = releaseDates?.results
-                ?.firstOrNull { it.country == "US" }
-                ?.releaseDates?.firstOrNull { !it.certification.isNullOrBlank() }
-                ?.certification
+
+            contentRating = fetchContentRating(id, "US")
         }
     }
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+
+        // SAME AS DISCOVER IT SEEMS
+//        val popularSeries = tmdb.tvService().popular(page, "en-US").execute().body()?.results?.map {
+//            it.toSearchResponse()
+//        } ?: listOf()
+//
+//        val popularMovies =
+//            tmdb.moviesService().popular(page, "en-US", "840").execute().body()?.results?.map {
+//                it.toSearchResponse()
+//            } ?: listOf()
+
         var discoverMovies: List<MovieSearchResponse> = listOf()
         var discoverSeries: List<TvSeriesSearchResponse> = listOf()
         var topMovies: List<MovieSearchResponse> = listOf()
         var topSeries: List<TvSeriesSearchResponse> = listOf()
         runAllAsync(
             {
-                discoverMovies = parseJson<TmdbPageResult>(
-                    getApi("/discover/movie", mapOf("page" to "$page"))
-                ).results?.map { it.toSearchResponse() as MovieSearchResponse } ?: listOf()
-            },
-            {
-                discoverSeries = parseJson<TmdbPageResult>(
-                    getApi("/discover/tv", mapOf("page" to "$page"))
-                ).results?.map { it.toSearchResponse() as TvSeriesSearchResponse } ?: listOf()
-            },
-            {
-                topMovies = parseJson<TmdbPageResult>(
-                    getApi("/movie/top_rated", mapOf("page" to "$page", "language" to "en-US", "region" to "US"))
-                ).results?.map { it.toSearchResponse() as MovieSearchResponse } ?: listOf()
-            },
-            {
-                topSeries = parseJson<TmdbPageResult>(
-                    getApi("/tv/top_rated", mapOf("page" to "$page", "language" to "en-US"))
-                ).results?.map { it.toSearchResponse() as TvSeriesSearchResponse } ?: listOf()
-            },
+                discoverMovies = tmdb.discoverMovie().page(page).build().awaitResponse().body()?.results?.map {
+                    it.toSearchResponse()
+                } ?: listOf()
+            }, {
+                discoverSeries = tmdb.discoverTv().page(page).build().awaitResponse().body()?.results?.map {
+                    it.toSearchResponse()
+                } ?: listOf()
+            }, {
+                // https://en.wikipedia.org/wiki/ISO_3166-1
+                topMovies =
+                    tmdb.moviesService().topRated(page, "en-US", "US").awaitResponse()
+                        .body()?.results?.map {
+                            it.toSearchResponse()
+                        } ?: listOf()
+            }, {
+                topSeries =
+                    tmdb.tvService().topRated(page, "en-US").awaitResponse().body()?.results?.map {
+                        it.toSearchResponse()
+                    } ?: listOf()
+            }
         )
 
         return newHomePageResponse(
             listOf(
+//                HomePageList("Popular Series", popularSeries),
+//                HomePageList("Popular Movies", popularMovies),
                 HomePageList("Popular Movies", discoverMovies),
                 HomePageList("Popular Series", discoverSeries),
                 HomePageList("Top Movies", topMovies),
@@ -442,14 +288,47 @@ open class TmdbProvider : MainAPI() {
         )
     }
 
-    open fun loadFromImdb(imdb: String, seasons: List<TmdbSeasonSummary>): LoadResponse? = null
-    open fun loadFromTmdb(tmdbId: Int, seasons: List<TmdbSeasonSummary>): LoadResponse? = null
-    open fun loadFromImdb(imdb: String): LoadResponse? = null
-    open fun loadFromTmdb(tmdbId: Int): LoadResponse? = null
+    open fun loadFromImdb(imdb: String, seasons: List<TvSeason>): LoadResponse? {
+        return null
+    }
 
+    open fun loadFromTmdb(tmdb: Int, seasons: List<TvSeason>): LoadResponse? {
+        return null
+    }
+
+    open fun loadFromImdb(imdb: String): LoadResponse? {
+        return null
+    }
+
+    open fun loadFromTmdb(tmdb: Int): LoadResponse? {
+        return null
+    }
+
+    open suspend fun fetchContentRating(id: Int?, country: String): String? {
+        id ?: return null
+
+        val contentRatings = tmdb.tvService().content_ratings(id).awaitResponse().body()?.results
+        return if (!contentRatings.isNullOrEmpty()) {
+            contentRatings.firstOrNull { it: ContentRating ->
+                it.iso_3166_1 == country
+            }?.rating
+        } else {
+            val releaseDates = tmdb.moviesService().releaseDates(id).awaitResponse().body()?.results
+            val certification = releaseDates?.firstOrNull { it: ReleaseDatesResult ->
+                it.iso_3166_1 == country
+            }?.release_dates?.firstOrNull { it: ReleaseDate ->
+                !it.certification.isNullOrBlank()
+            }?.certification
+
+            certification
+        }
+    }
+
+    // Possible to add recommendations and such here.
     override suspend fun load(url: String): LoadResponse? {
         // https://www.themoviedb.org/movie/7445-brothers
         // https://www.themoviedb.org/tv/71914-the-wheel-of-time
+
         val idRegex = Regex("""themoviedb\.org/(.*)/(\d+)""")
         val found = idRegex.find(url)
 
@@ -458,64 +337,86 @@ open class TmdbProvider : MainAPI() {
             ?: throw ErrorLoadingException("No id found")
 
         return if (useMetaLoadResponse) {
-            if (isTvSeries) {
-                val detail = parseJson<TmdbTvDetail>(
-                    getApi(
-                        "/tv/$id",
-                        mapOf(
-                            "language" to "en-US",
-                            "append_to_response" to "external_ids,videos,credits,recommendations,similar,content_ratings",
+            return if (isTvSeries) {
+                val body = tmdb.tvService()
+                    .tv(
+                        id,
+                        "en-US",
+                        AppendToResponse(
+                            AppendToResponseItem.EXTERNAL_IDS,
+                            AppendToResponseItem.VIDEOS
                         )
                     )
-                )
-                detail.toLoadResponse()
+                    .awaitResponse().body()
+                val response = body?.toLoadResponse()
+                if (response != null) {
+                    if (response.recommendations.isNullOrEmpty())
+                        tmdb.tvService().recommendations(id, 1, "en-US").awaitResponse().body()
+                            ?.let {
+                                it.results?.map { res -> res.toSearchResponse() }
+                            }?.let { list ->
+                                response.recommendations = list
+                            }
+
+                    if (response.actors.isNullOrEmpty())
+                        tmdb.tvService().credits(id, "en-US").awaitResponse().body()?.let {
+                            response.addActors(it.cast?.toActors())
+                        }
+                }
+
+                response
             } else {
-                val detail = parseJson<TmdbMovieDetail>(
-                    getApi(
-                        "/movie/$id",
-                        mapOf(
-                            "language" to "en-US",
-                            "append_to_response" to "external_ids,videos,credits,recommendations,similar,release_dates",
+                val body = tmdb.moviesService()
+                    .summary(
+                        id,
+                        "en-US",
+                        AppendToResponse(
+                            AppendToResponseItem.EXTERNAL_IDS,
+                            AppendToResponseItem.VIDEOS
                         )
                     )
-                )
-                detail.toLoadResponse()
+                    .awaitResponse().body()
+                val response = body?.toLoadResponse()
+                if (response != null) {
+                    if (response.recommendations.isNullOrEmpty())
+                        tmdb.moviesService().recommendations(id, 1, "en-US").awaitResponse().body()
+                            ?.let {
+                                it.results?.map { res -> res.toSearchResponse() }
+                            }?.let { list ->
+                                response.recommendations = list
+                            }
+
+                    if (response.actors.isNullOrEmpty())
+                        tmdb.moviesService().credits(id).awaitResponse().body()?.let {
+                            response.addActors(it.cast?.toActors())
+                        }
+                }
+                response
             }
         } else {
             loadFromTmdb(id)?.let { return it }
             if (isTvSeries) {
-                val externalIds = parseJson<TmdbIds>(getApi("/tv/$id/external_ids"))
-                val imdbId = externalIds.imdbId
-                if (imdbId != null) {
-                    val fromImdb = loadFromImdb(imdbId)
-                    if (fromImdb != null) return fromImdb
-                }
-                val seasons = parseJson<TmdbTvDetail>(getApi("/tv/$id")).seasons ?: listOf()
-                if (imdbId != null) {
-                    loadFromImdb(imdbId, seasons) ?: loadFromTmdb(id, seasons)
-                } else {
-                    loadFromTmdb(id, seasons)
+                tmdb.tvService().externalIds(id).awaitResponse().body()?.imdb_id?.let {
+                    val fromImdb = loadFromImdb(it)
+                    val result = if (fromImdb == null) {
+                        val details = tmdb.tvService().tv(id, "en-US").awaitResponse().body()
+                        loadFromImdb(it, details?.seasons ?: listOf())
+                            ?: loadFromTmdb(id, details?.seasons ?: listOf())
+                    } else fromImdb
+
+                    result
                 }
             } else {
-                val imdbId = parseJson<TmdbMovieDetail>(getApi("/movie/$id")).imdbId
-                if (imdbId != null) loadFromImdb(imdbId) else null
+                tmdb.moviesService().externalIds(id).awaitResponse()
+                    .body()?.imdb_id?.let { loadFromImdb(it) }
             }
         }
     }
 
     override suspend fun search(query: String, page: Int): SearchResponseList? {
-        return parseJson<TmdbMultiResult>(
-            getApi(
-                "/search/multi",
-                mapOf(
-                    "query" to query,
-                    "page" to "$page",
-                    "language" to "en-US",
-                    "include_adult" to "$includeAdult",
-                )
-            )
-        ).results?.mapNotNull {
-            if (it.mediaType == "person") null else it.toSearchResponse()
-        }?.toNewSearchResponseList()
+        return tmdb.searchService().multi(query, page, "en-US", "US", includeAdult).awaitResponse()
+            .body()?.results?.mapNotNull {
+                it.movie?.toSearchResponse() ?: it.tvShow?.toSearchResponse()
+            }?.toNewSearchResponseList()
     }
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 6011e14ea..dafec4d97 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -34,10 +34,6 @@ import com.lagradost.cloudstream3.newTvSeriesLoadResponse
 import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 
 open class TraktProvider : MainAPI() {
     override var name = "Trakt"
@@ -50,6 +46,7 @@ open class TraktProvider : MainAPI() {
     )
 
     private val traktApiUrl = "https://api.trakt.tv"
+
     private val traktClientId: String = BuildConfig.TRAKT_CLIENT_ID
 
     override val mainPage = mainPageOf(
@@ -61,21 +58,16 @@ open class TraktProvider : MainAPI() {
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         val apiResponse = getApi("${request.data}?extended=full,images&page=$page")
+
         val results = parseJson<List<MediaDetails>>(apiResponse).map { element ->
             element.toSearchResponse()
         }
-
         return newHomePageResponse(request.name, results)
     }
 
     private fun MediaDetails.toSearchResponse(): SearchResponse {
-        val media = this.media ?: MediaSummary(
-            title = this.title,
-            year = this.year,
-            ids = this.ids,
-            rating = this.rating,
-            images = this.images,
-        )
+
+        val media = this.media ?: this
         val mediaType = if (media.ids?.tvdb == null) TvType.Movie else TvType.TvSeries
         val poster = media.images?.poster?.firstOrNull()
         return if (mediaType == TvType.Movie) {
@@ -83,7 +75,7 @@ open class TraktProvider : MainAPI() {
                 name = media.title ?: "",
                 url = Data(
                     type = mediaType,
-                    mediaDetails = this,
+                    mediaDetails = media,
                 ).toJson(),
                 type = TvType.Movie,
             ) {
@@ -95,7 +87,7 @@ open class TraktProvider : MainAPI() {
                 name = media.title ?: "",
                 url = Data(
                     type = mediaType,
-                    mediaDetails = this,
+                    mediaDetails = media,
                 ).toJson(),
                 type = TvType.TvSeries,
             ) {
@@ -106,7 +98,9 @@ open class TraktProvider : MainAPI() {
     }
 
     override suspend fun search(query: String, page: Int): SearchResponseList? {
-        val apiResponse = getApi("$traktApiUrl/search/movie,show?extended=full,images&limit=20&page=$page&query=$query")
+        val apiResponse =
+            getApi("$traktApiUrl/search/movie,show?extended=full,images&limit=20&page=$page&query=$query")
+
         return newSearchResponseList(parseJson<List<MediaDetails>>(apiResponse).map { element ->
             element.toSearchResponse()
         })
@@ -121,7 +115,9 @@ open class TraktProvider : MainAPI() {
         val backDropUrl = fixPath(mediaDetails?.images?.fanart?.firstOrNull())
         val logoUrl = fixPath(mediaDetails?.images?.logo?.firstOrNull())
 
-        val resActor = getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=full,images")
+        val resActor =
+            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=full,images")
+
         val actors = parseJson<People>(resActor).cast?.map {
             ActorData(
                 Actor(
@@ -132,7 +128,9 @@ open class TraktProvider : MainAPI() {
             )
         }
 
-        val resRelated = getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=full,images&limit=20")
+        val resRelated =
+            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=full,images&limit=20")
+
         val relatedMedia = parseJson<List<MediaDetails>>(resRelated).map { it.toSearchResponse() }
 
         val isCartoon =
@@ -144,6 +142,7 @@ open class TraktProvider : MainAPI() {
         val uniqueUrl = data.mediaDetails?.ids?.trakt?.toJson() ?: data.toJson()
 
         if (data.type == TvType.Movie) {
+
             val linkData = LinkData(
                 id = mediaDetails?.ids?.tmdb,
                 traktId = mediaDetails?.ids?.trakt,
@@ -157,7 +156,7 @@ open class TraktProvider : MainAPI() {
                 year = mediaDetails?.year,
                 orgTitle = mediaDetails?.title,
                 isAnime = isAnime,
-                // jpTitle = later if needed as it requires another network request,
+                //jpTitle = later if needed as it requires another network request,
                 airedDate = mediaDetails?.released
                     ?: mediaDetails?.firstAired,
                 isAsian = isAsian,
@@ -191,6 +190,7 @@ open class TraktProvider : MainAPI() {
                 addTMDbId(mediaDetails.ids?.tmdb.toString())
             }
         } else {
+
             val resSeasons =
                 getApi("$traktApiUrl/shows/${mediaDetails?.ids?.trakt.toString()}/seasons?extended=full,images,episodes")
             val episodes = mutableListOf<Episode>()
@@ -198,7 +198,9 @@ open class TraktProvider : MainAPI() {
             var nextAir: NextAiring? = null
 
             seasons.forEach { season ->
+
                 season.episodes?.map { episode ->
+
                     val linkData = LinkData(
                         id = mediaDetails?.ids?.tmdb,
                         traktId = mediaDetails?.ids?.trakt,
@@ -232,7 +234,8 @@ open class TraktProvider : MainAPI() {
                             this.episode = episode.number
                             this.description = episode.overview
                             this.runTime = episode.runtime
-                            this.posterUrl = fixPath(episode.images?.screenshot?.firstOrNull())
+                            this.posterUrl = fixPath( episode.images?.screenshot?.firstOrNull())
+                            //this.rating = episode.rating?.times(10)?.roundToInt()
                             this.score = Score.from10(episode.rating)
 
                             this.addDate(episode.firstAired, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
@@ -304,164 +307,143 @@ open class TraktProvider : MainAPI() {
         return "https://$url"
     }
 
-    @Serializable
     data class Data(
-        @JsonProperty("type") @SerialName("type") val type: TvType? = null,
-        @JsonProperty("mediaDetails") @SerialName("mediaDetails") val mediaDetails: MediaDetails? = null,
+        val type: TvType? = null,
+        val mediaDetails: MediaDetails? = null,
     )
 
-    @Serializable
-    data class MediaSummary(
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
-    )
-
-    @OptIn(ExperimentalSerializationApi::class) // JsonNames is an experimental annotation for now
-    @Serializable
     data class MediaDetails(
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
-        @JsonProperty("tagline") @SerialName("tagline") val tagline: String? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
-        @JsonProperty("released") @SerialName("released") val released: String? = null,
-        @JsonProperty("runtime") @SerialName("runtime") val runtime: Int? = null,
-        @JsonProperty("country") @SerialName("country") val country: String? = null,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String? = null,
-        @JsonProperty("trailer") @SerialName("trailer") val trailer: String? = null,
-        @JsonProperty("homepage") @SerialName("homepage") val homepage: String? = null,
-        @JsonProperty("status") @SerialName("status") val status: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
-        @JsonProperty("votes") @SerialName("votes") val votes: Long? = null,
-        @JsonProperty("comment_count") @SerialName("comment_count") val commentCount: Long? = null,
-        @JsonProperty("language") @SerialName("language") val language: String? = null,
-        @JsonProperty("languages") @SerialName("languages") val languages: List<String>? = null,
-        @JsonProperty("available_translations") @SerialName("available_translations") val availableTranslations: List<String>? = null,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<String>? = null,
-        @JsonProperty("certification") @SerialName("certification") val certification: String? = null,
-        @JsonProperty("aired_episodes") @SerialName("aired_episodes") val airedEpisodes: Int? = null,
-        @JsonProperty("first_aired") @SerialName("first_aired") val firstAired: String? = null,
-        @JsonProperty("airs") @SerialName("airs") val airs: Airs? = null,
-        @JsonProperty("network") @SerialName("network") val network: String? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
-        @JsonProperty("media") @JsonAlias("movie", "show") @SerialName("media") @JsonNames("movie", "show") val media: MediaSummary? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
+        @JsonProperty("tagline") val tagline: String? = null,
+        @JsonProperty("overview") val overview: String? = null,
+        @JsonProperty("released") val released: String? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
+        @JsonProperty("country") val country: String? = null,
+        @JsonProperty("updatedAt") val updatedAt: String? = null,
+        @JsonProperty("trailer") val trailer: String? = null,
+        @JsonProperty("homepage") val homepage: String? = null,
+        @JsonProperty("status") val status: String? = null,
+        @JsonProperty("rating") val rating: Double? = null,
+        @JsonProperty("votes") val votes: Long? = null,
+        @JsonProperty("comment_count") val commentCount: Long? = null,
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("languages") val languages: List<String>? = null,
+        @JsonProperty("available_translations") val availableTranslations: List<String>? = null,
+        @JsonProperty("genres") val genres: List<String>? = null,
+        @JsonProperty("certification") val certification: String? = null,
+        @JsonProperty("aired_episodes") val airedEpisodes: Int? = null,
+        @JsonProperty("first_aired") val firstAired: String? = null,
+        @JsonProperty("airs") val airs: Airs? = null,
+        @JsonProperty("network") val network: String? = null,
+        @JsonProperty("images") val images: Images? = null,
+        @JsonProperty("movie") @JsonAlias("show") val media: MediaDetails? = null
     )
 
-    @Serializable
     data class Airs(
-        @JsonProperty("day") @SerialName("day") val day: String? = null,
-        @JsonProperty("time") @SerialName("time") val time: String? = null,
-        @JsonProperty("timezone") @SerialName("timezone") val timezone: String? = null,
+        @JsonProperty("day") val day: String? = null,
+        @JsonProperty("time") val time: String? = null,
+        @JsonProperty("timezone") val timezone: String? = null,
     )
 
-    @Serializable
     data class Ids(
-        @JsonProperty("trakt") @SerialName("trakt") val trakt: Int? = null,
-        @JsonProperty("slug") @SerialName("slug") val slug: String? = null,
-        @JsonProperty("tvdb") @SerialName("tvdb") val tvdb: Int? = null,
-        @JsonProperty("imdb") @SerialName("imdb") val imdb: String? = null,
-        @JsonProperty("tmdb") @SerialName("tmdb") val tmdb: Int? = null,
-        @JsonProperty("tvrage") @SerialName("tvrage") val tvrage: String? = null,
+        @JsonProperty("trakt") val trakt: Int? = null,
+        @JsonProperty("slug") val slug: String? = null,
+        @JsonProperty("tvdb") val tvdb: Int? = null,
+        @JsonProperty("imdb") val imdb: String? = null,
+        @JsonProperty("tmdb") val tmdb: Int? = null,
+        @JsonProperty("tvrage") val tvrage: String? = null,
     )
 
-    @Serializable
     data class Images(
-        @JsonProperty("poster") @SerialName("poster") val poster: List<String>? = null,
-        @JsonProperty("fanart") @SerialName("fanart") val fanart: List<String>? = null,
-        @JsonProperty("logo") @SerialName("logo") val logo: List<String>? = null,
-        @JsonProperty("clearart") @SerialName("clearart") val clearArt: List<String>? = null,
-        @JsonProperty("banner") @SerialName("banner") val banner: List<String>? = null,
-        @JsonProperty("thumb") @SerialName("thumb") val thumb: List<String>? = null,
-        @JsonProperty("screenshot") @SerialName("screenshot") val screenshot: List<String>? = null,
-        @JsonProperty("headshot") @SerialName("headshot") val headshot: List<String>? = null,
+        @JsonProperty("poster") val poster: List<String>? = null,
+        @JsonProperty("fanart") val fanart: List<String>? = null,
+        @JsonProperty("logo") val logo: List<String>? = null,
+        @JsonProperty("clearart") val clearArt: List<String>? = null,
+        @JsonProperty("banner") val banner: List<String>? = null,
+        @JsonProperty("thumb") val thumb: List<String>? = null,
+        @JsonProperty("screenshot") val screenshot: List<String>? = null,
+        @JsonProperty("headshot") val headshot: List<String>? = null,
     )
 
-    @Serializable
     data class People(
-        @JsonProperty("cast") @SerialName("cast") val cast: List<Cast>? = null,
+        @JsonProperty("cast") val cast: List<Cast>? = null,
     )
 
-    @Serializable
     data class Cast(
-        @JsonProperty("character") @SerialName("character") val character: String? = null,
-        @JsonProperty("characters") @SerialName("characters") val characters: List<String>? = null,
-        @JsonProperty("episode_count") @SerialName("episode_count") val episodeCount: Long? = null,
-        @JsonProperty("person") @SerialName("person") val person: Person? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("character") val character: String? = null,
+        @JsonProperty("characters") val characters: List<String>? = null,
+        @JsonProperty("episode_count") val episodeCount: Long? = null,
+        @JsonProperty("person") val person: Person? = null,
+        @JsonProperty("images") val images: Images? = null,
     )
 
-    @Serializable
     data class Person(
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
+        @JsonProperty("images") val images: Images? = null,
     )
 
-    @Serializable
     data class Seasons(
-        @JsonProperty("aired_episodes") @SerialName("aired_episodes") val airedEpisodes: Int? = null,
-        @JsonProperty("episode_count") @SerialName("episode_count") val episodeCount: Int? = null,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: List<TraktEpisode>? = null,
-        @JsonProperty("first_aired") @SerialName("first_aired") val firstAired: String? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
-        @JsonProperty("network") @SerialName("network") val network: String? = null,
-        @JsonProperty("number") @SerialName("number") val number: Int? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String? = null,
-        @JsonProperty("votes") @SerialName("votes") val votes: Int? = null,
+        @JsonProperty("aired_episodes") val airedEpisodes: Int? = null,
+        @JsonProperty("episode_count") val episodeCount: Int? = null,
+        @JsonProperty("episodes") val episodes: List<TraktEpisode>? = null,
+        @JsonProperty("first_aired") val firstAired: String? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
+        @JsonProperty("images") val images: Images? = null,
+        @JsonProperty("network") val network: String? = null,
+        @JsonProperty("number") val number: Int? = null,
+        @JsonProperty("overview") val overview: String? = null,
+        @JsonProperty("rating") val rating: Double? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("updated_at") val updatedAt: String? = null,
+        @JsonProperty("votes") val votes: Int? = null,
     )
 
-    @Serializable
     data class TraktEpisode(
-        @JsonProperty("available_translations") @SerialName("available_translations") val availableTranslations: List<String>? = null,
-        @JsonProperty("comment_count") @SerialName("comment_count") val commentCount: Int? = null,
-        @JsonProperty("episode_type") @SerialName("episode_type") val episodeType: String? = null,
-        @JsonProperty("first_aired") @SerialName("first_aired") val firstAired: String? = null,
-        @JsonProperty("ids") @SerialName("ids") val ids: Ids? = null,
-        @JsonProperty("images") @SerialName("images") val images: Images? = null,
-        @JsonProperty("number") @SerialName("number") val number: Int? = null,
-        @JsonProperty("number_abs") @SerialName("number_abs") val numberAbs: Int? = null,
-        @JsonProperty("overview") @SerialName("overview") val overview: String? = null,
-        @JsonProperty("rating") @SerialName("rating") val rating: Double? = null,
-        @JsonProperty("runtime") @SerialName("runtime") val runtime: Int? = null,
-        @JsonProperty("season") @SerialName("season") val season: Int? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String? = null,
-        @JsonProperty("votes") @SerialName("votes") val votes: Int? = null,
+        @JsonProperty("available_translations") val availableTranslations: List<String>? = null,
+        @JsonProperty("comment_count") val commentCount: Int? = null,
+        @JsonProperty("episode_type") val episodeType: String? = null,
+        @JsonProperty("first_aired") val firstAired: String? = null,
+        @JsonProperty("ids") val ids: Ids? = null,
+        @JsonProperty("images") val images: Images? = null,
+        @JsonProperty("number") val number: Int? = null,
+        @JsonProperty("number_abs") val numberAbs: Int? = null,
+        @JsonProperty("overview") val overview: String? = null,
+        @JsonProperty("rating") val rating: Double? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("updated_at") val updatedAt: String? = null,
+        @JsonProperty("votes") val votes: Int? = null,
     )
 
-    @Serializable
     data class LinkData(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("trakt_id") @SerialName("trakt_id") val traktId: Int? = null,
-        @JsonProperty("trakt_slug") @SerialName("trakt_slug") val traktSlug: String? = null,
-        @JsonProperty("tmdb_id") @SerialName("tmdb_id") val tmdbId: Int? = null,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String? = null,
-        @JsonProperty("tvdb_id") @SerialName("tvdb_id") val tvdbId: Int? = null,
-        @JsonProperty("tvrage_id") @SerialName("tvrage_id") val tvrageId: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("season") @SerialName("season") val season: Int? = null,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int? = null,
-        @JsonProperty("ani_id") @SerialName("ani_id") val aniId: String? = null,
-        @JsonProperty("anime_id") @SerialName("anime_id") val animeId: String? = null,
-        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
-        @JsonProperty("org_title") @SerialName("org_title") val orgTitle: String? = null,
-        @JsonProperty("is_anime") @SerialName("is_anime") val isAnime: Boolean = false,
-        @JsonProperty("aired_year") @SerialName("aired_year") val airedYear: Int? = null,
-        @JsonProperty("last_season") @SerialName("last_season") val lastSeason: Int? = null,
-        @JsonProperty("eps_title") @SerialName("eps_title") val epsTitle: String? = null,
-        @JsonProperty("jp_title") @SerialName("jp_title") val jpTitle: String? = null,
-        @JsonProperty("date") @SerialName("date") val date: String? = null,
-        @JsonProperty("aired_date") @SerialName("aired_date") val airedDate: String? = null,
-        @JsonProperty("is_asian") @SerialName("is_asian") val isAsian: Boolean = false,
-        @JsonProperty("is_bollywood") @SerialName("is_bollywood") val isBollywood: Boolean = false,
-        @JsonProperty("is_cartoon") @SerialName("is_cartoon") val isCartoon: Boolean = false,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("trakt_id") val traktId: Int? = null,
+        @JsonProperty("trakt_slug") val traktSlug: String? = null,
+        @JsonProperty("tmdb_id") val tmdbId: Int? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("tvdb_id") val tvdbId: Int? = null,
+        @JsonProperty("tvrage_id") val tvrageId: String? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
+        @JsonProperty("ani_id") val aniId: String? = null,
+        @JsonProperty("anime_id") val animeId: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("org_title") val orgTitle: String? = null,
+        @JsonProperty("is_anime") val isAnime: Boolean = false,
+        @JsonProperty("aired_year") val airedYear: Int? = null,
+        @JsonProperty("last_season") val lastSeason: Int? = null,
+        @JsonProperty("eps_title") val epsTitle: String? = null,
+        @JsonProperty("jp_title") val jpTitle: String? = null,
+        @JsonProperty("date") val date: String? = null,
+        @JsonProperty("aired_date") val airedDate: String? = null,
+        @JsonProperty("is_asian") val isAsian: Boolean = false,
+        @JsonProperty("is_bollywood") val isBollywood: Boolean = false,
+        @JsonProperty("is_cartoon") val isCartoon: Boolean = false,
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index 73de880db..4cd8eefa6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -4,11 +4,15 @@ import androidx.annotation.AnyThread
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.utils.AppDebug
-import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.WorkerThread
 import kotlinx.coroutines.*
+import java.io.InterruptedIOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLHandshakeException
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlin.reflect.full.NoSuchPropertyException
 
 const val DEBUG_EXCEPTION = "THIS IS A DEBUG EXCEPTION!"
 const val DEBUG_PRINT = "DEBUG PRINT"
@@ -57,7 +61,7 @@ sealed class Resource<out T> {
     companion object {
         fun <T> fromResult(result: Result<T>) : Resource<T> {
             val value = result.getOrNull()
-            return if (value != null) {
+            return if(value != null) {
                 Success(value)
             } else {
                 throwAbleToResource(result.exceptionOrNull() ?: Exception("this should not be possible"))
@@ -68,6 +72,7 @@ sealed class Resource<out T> {
 
 fun logError(throwable: Throwable) {
     Log.d("ApiError", "-------------------------------------------------------------------")
+    Log.d("ApiError", "safeApiCall: " + throwable.localizedMessage)
     Log.d("ApiError", "safeApiCall: " + throwable.message)
     throwable.printStackTrace()
     Log.d("ApiError", "-------------------------------------------------------------------")
@@ -124,21 +129,16 @@ suspend fun <T> suspendSafeApiCall(apiCall: suspend () -> T): T? {
 }
 
 fun Throwable.getAllMessages(): String {
-    return (this.message ?: "") + (this.cause?.getAllMessages()?.let { "\n$it" } ?: "")
+    return (this.localizedMessage ?: "") + (this.cause?.getAllMessages()?.let { "\n$it" } ?: "")
 }
 
 fun Throwable.getStackTracePretty(showMessage: Boolean = true): String {
-    val prefix = if (showMessage) this.message?.let { "\n$it" } ?: "" else ""
-    return prefix + this.stackTraceToString()
-        .lines()
-        .mapNotNull { line ->
-            val trimmed = line.trim()
-            if (!trimmed.startsWith("at ")) return@mapNotNull null
-            // pull "File.kt:42" out of "at com.pkg.Class.method(File.kt:42)"
-            Regex("""\(([^)]+)\)$""").find(trimmed)?.groupValues?.get(1)
-                ?.replace(":", " ")
-        }
-        .joinToString("\n")
+    val prefix = if (showMessage) this.localizedMessage?.let { "\n$it" } ?: "" else ""
+    return prefix + this.stackTrace.joinToString(
+        separator = "\n"
+    ) {
+        "${it.fileName} ${it.lineNumber}"
+    }
 }
 
 fun <T> safeFail(throwable: Throwable): Resource<T> {
@@ -162,26 +162,50 @@ fun CoroutineScope.launchSafe(
     return this.launch(context, start, obj)
 }
 
-expect fun <T> platformThrowAbleToResource(throwable: Throwable): Resource<T>
-
 fun <T> throwAbleToResource(
     throwable: Throwable
 ): Resource<T> {
     return when (throwable) {
+        is NoSuchMethodException, is NoSuchFieldException, is NoSuchMethodError, is NoSuchFieldError, is NoSuchPropertyException -> {
+            Resource.Failure(
+                false,
+                "App or extension is outdated, update the app or try pre-release.\n${throwable.message}" // todo add exact version?
+            )
+        }
+
         is NullPointerException -> {
-            val traceLine = throwable.stackTraceToString()
-                .lines()
-                .firstOrNull { it.contains("provider.kt", ignoreCase = true) }
-                ?.let { Regex("""\(([^)]+)\)$""").find(it)?.groupValues?.get(1) }
-            if (traceLine != null) {
-                return Resource.Failure(
-                    false,
-                    "NullPointerException at $traceLine\nSite might have updated or added Cloudflare/DDOS protection"
-                )
+            for (line in throwable.stackTrace) {
+                if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
+                    return Resource.Failure(
+                        false,
+                        "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
+                    )
+                }
             }
             safeFail(throwable)
         }
 
+        is SocketTimeoutException, is InterruptedIOException -> {
+            Resource.Failure(
+                true,
+                "Connection Timeout\nPlease try again later."
+            )
+        }
+//        is HttpException -> {
+//            Resource.Failure(
+//                false,
+//                throwable.statusCode,
+//                null,
+//                throwable.message ?: "HttpException"
+//            )
+//        }
+        is UnknownHostException -> {
+            Resource.Failure(
+                true,
+                "Cannot connect to server, try again later.\n${throwable.message}"
+            )
+        }
+
         is ErrorLoadingException -> {
             Resource.Failure(
                 true,
@@ -193,13 +217,20 @@ fun <T> throwAbleToResource(
             Resource.Failure(false, "This operation is not implemented.")
         }
 
+        is SSLHandshakeException -> {
+            Resource.Failure(
+                true,
+                (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
+            )
+        }
+
         is CancellationException -> {
             throwable.cause?.let {
                 throwAbleToResource(it)
             } ?: safeFail(throwable)
         }
 
-        else -> platformThrowAbleToResource(throwable)
+        else -> safeFail(throwable)
     }
 }
 
@@ -207,9 +238,9 @@ fun <T> throwAbleToResource(
 suspend fun <T> safeApiCall(
     @WorkerThread apiCall: suspend () -> T,
 ): Resource<T> {
-    return apiCall.ioWork { work ->
+    return withContext(Dispatchers.IO) {
         try {
-            Resource.Success(work.invoke())
+            Resource.Success(apiCall.invoke())
         } catch (throwable: Throwable) {
             logError(throwable)
             throwAbleToResource(throwable)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
index 4a269c525..444709f88 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
@@ -10,7 +10,6 @@ import kotlinx.coroutines.*
 @AnyThread
 expect fun runOnMainThreadNative(@MainThread work: (() -> Unit))
 
-expect val workerDispatcher: CoroutineDispatcher
 internal expect annotation class WorkerThread()
 
 object Coroutines {
@@ -25,7 +24,7 @@ object Coroutines {
     @AnyThread
     fun <T> T.ioSafe(@WorkerThread work: suspend (CoroutineScope.(T) -> Unit)): Job {
         val value = this
-        return CoroutineScope(workerDispatcher).launchSafe {
+        return CoroutineScope(Dispatchers.IO).launchSafe {
             work(value)
         }
     }
@@ -33,7 +32,7 @@ object Coroutines {
     @AnyThread
     suspend fun <T, V> V.ioWorkSafe(@WorkerThread work: suspend (CoroutineScope.(V) -> T)): T? {
         val value = this
-        return withContext(workerDispatcher) {
+        return withContext(Dispatchers.IO) {
             try {
                 work(value)
             } catch (e: Exception) {
@@ -46,7 +45,7 @@ object Coroutines {
     @AnyThread
     suspend fun <T, V> V.ioWork(@WorkerThread work: suspend (CoroutineScope.(V) -> T)): T {
         val value = this
-        return withContext(workerDispatcher) {
+        return withContext(Dispatchers.IO) {
             work(value)
         }
     }
@@ -69,14 +68,16 @@ object Coroutines {
      * If you want to iterate over the list then you need to do:
      * list.withLock { code here }
      */
+    @Prerelease
     fun <T> atomicListOf(vararg items: T): AtomicMutableList<T> {
         return AtomicMutableList(items.toMutableList())
     }
 
-    @Deprecated(
+    // Deprecate after next stable
+    /*@Deprecated(
         message = "Use atomicListOf() instead.",
         replaceWith = ReplaceWith("atomicListOf(*items)"),
         level = DeprecationLevel.WARNING,
-    )
+    )*/
     fun <T> threadSafeListOf(vararg items: T): MutableList<T> = atomicListOf(*items)
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index faf498024..8ef391050 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalUuidApi::class)
+
 package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.annotation.JsonIgnore
@@ -11,7 +13,6 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.extractors.Acefile
 import com.lagradost.cloudstream3.extractors.Ahvsh
 import com.lagradost.cloudstream3.extractors.Aico
-import com.lagradost.cloudstream3.extractors.Antarcticadocs
 import com.lagradost.cloudstream3.extractors.Asnwish
 import com.lagradost.cloudstream3.extractors.Auvexiug
 import com.lagradost.cloudstream3.extractors.Awish
@@ -80,7 +81,6 @@ import com.lagradost.cloudstream3.extractors.FileMoonSx
 import com.lagradost.cloudstream3.extractors.FilemoonV2
 import com.lagradost.cloudstream3.extractors.Filesim
 import com.lagradost.cloudstream3.extractors.Firestream
-import com.lagradost.cloudstream3.extractors.FirestreamSite
 import com.lagradost.cloudstream3.extractors.Multimoviesshg
 import com.lagradost.cloudstream3.extractors.FlaswishCom
 import com.lagradost.cloudstream3.extractors.Flyfile
@@ -111,9 +111,7 @@ import com.lagradost.cloudstream3.extractors.HDMomPlayer
 import com.lagradost.cloudstream3.extractors.HDPlayerSystem
 import com.lagradost.cloudstream3.extractors.HDStreamAble
 import com.lagradost.cloudstream3.extractors.Habetar
-import com.lagradost.cloudstream3.extractors.Handfacesnap
 import com.lagradost.cloudstream3.extractors.Haxloppd
-import com.lagradost.cloudstream3.extractors.Hexload
 import com.lagradost.cloudstream3.extractors.Hgcloudto
 import com.lagradost.cloudstream3.extractors.HglinkTo
 import com.lagradost.cloudstream3.extractors.HgplayCDN
@@ -121,7 +119,6 @@ import com.lagradost.cloudstream3.extractors.Hotlinger
 import com.lagradost.cloudstream3.extractors.HubCloud
 import com.lagradost.cloudstream3.extractors.Hxfile
 import com.lagradost.cloudstream3.extractors.HlsWish
-import com.lagradost.cloudstream3.extractors.HubuCloud
 import com.lagradost.cloudstream3.extractors.InternetArchive
 import com.lagradost.cloudstream3.extractors.JWPlayer
 import com.lagradost.cloudstream3.extractors.Jeniusplay
@@ -163,8 +160,6 @@ import com.lagradost.cloudstream3.extractors.Multimovies
 import com.lagradost.cloudstream3.extractors.Mvidoo
 import com.lagradost.cloudstream3.extractors.MyVidPlay
 import com.lagradost.cloudstream3.extractors.Mwish
-import com.lagradost.cloudstream3.extractors.Namefacesnap
-import com.lagradost.cloudstream3.extractors.Nameitweb
 import com.lagradost.cloudstream3.extractors.NathanFromSubject
 import com.lagradost.cloudstream3.extractors.Nekostream
 import com.lagradost.cloudstream3.extractors.Nekowish
@@ -172,7 +167,6 @@ import com.lagradost.cloudstream3.extractors.Neonime7n
 import com.lagradost.cloudstream3.extractors.Neonime8n
 import com.lagradost.cloudstream3.extractors.Obeywish
 import com.lagradost.cloudstream3.extractors.Odnoklassniki
-import com.lagradost.cloudstream3.extractors.Odysseusa
 import com.lagradost.cloudstream3.extractors.OkRuHTTP
 import com.lagradost.cloudstream3.extractors.OkRuHTTPMobile
 import com.lagradost.cloudstream3.extractors.OkRuSSL
@@ -186,7 +180,6 @@ import com.lagradost.cloudstream3.extractors.PlayLtXyz
 import com.lagradost.cloudstream3.extractors.PlayRu
 import com.lagradost.cloudstream3.extractors.PlayerVoxzer
 import com.lagradost.cloudstream3.extractors.Playerwish
-import com.lagradost.cloudstream3.extractors.Playmate
 import com.lagradost.cloudstream3.extractors.Playmogo
 import com.lagradost.cloudstream3.extractors.Rabbitstream
 import com.lagradost.cloudstream3.extractors.RapidVid
@@ -278,8 +271,6 @@ import com.lagradost.cloudstream3.extractors.VidHidePro6
 import com.lagradost.cloudstream3.extractors.VidHideHub
 import com.lagradost.cloudstream3.extractors.Ryderjet
 import com.lagradost.cloudstream3.extractors.Streamcash
-import com.lagradost.cloudstream3.extractors.Thebesthostertv
-import com.lagradost.cloudstream3.extractors.VidChampions
 import com.lagradost.cloudstream3.extractors.VidMoxy
 import com.lagradost.cloudstream3.extractors.VidStack
 import com.lagradost.cloudstream3.extractors.VideoSeyred
@@ -306,10 +297,8 @@ import com.lagradost.cloudstream3.extractors.Vidaraw
 import com.lagradost.cloudstream3.extractors.Vidarax
 import com.lagradost.cloudstream3.extractors.Vidavaca
 import com.lagradost.cloudstream3.extractors.Vide0Net
-import com.lagradost.cloudstream3.extractors.Vidmatrixa
 import com.lagradost.cloudstream3.extractors.Vids
 import com.lagradost.cloudstream3.extractors.Vidsonic
-import com.lagradost.cloudstream3.extractors.Vixeo
 import com.lagradost.cloudstream3.extractors.VkExtractor
 import com.lagradost.cloudstream3.extractors.Voe
 import com.lagradost.cloudstream3.extractors.Voe1
@@ -339,10 +328,8 @@ import io.ktor.http.decodeURLPart
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import kotlin.coroutines.cancellation.CancellationException
+import kotlin.uuid.ExperimentalUuidApi
 import kotlin.uuid.Uuid
 import kotlin.uuid.toJavaUuid
 import kotlin.uuid.toKotlinUuid
@@ -431,7 +418,6 @@ enum class ExtractorLinkType {
     MAGNET;
 
     // See https://www.iana.org/assignments/media-types/media-types.xhtml
-    @JsonIgnore
     fun getMimeType(): String {
         return when (this) {
             VIDEO -> "video/mp4"
@@ -699,27 +685,26 @@ open class DrmExtractorLink private constructor(
  * @property audioTracks List of separate audio tracks that can be used with this video
  * @see newExtractorLink
  * */
-@Serializable
 open class ExtractorLink
 @Deprecated("Use newExtractorLink", level = DeprecationLevel.WARNING)
 constructor(
-    @SerialName("source") open val source: String,
-    @SerialName("name") open val name: String,
-    @SerialName("url") override val url: String,
-    @SerialName("referer") override var referer: String,
-    @SerialName("quality") open var quality: Int,
-    @SerialName("headers") override var headers: Map<String, String> = mapOf(),
+    open val source: String,
+    open val name: String,
+    override val url: String,
+    override var referer: String,
+    open var quality: Int,
+    override var headers: Map<String, String> = mapOf(),
     /** Used for getExtractorVerifierJob() */
-    @SerialName("extractorData") open var extractorData: String? = null,
-    @SerialName("type") open var type: ExtractorLinkType,
+    open var extractorData: String? = null,
+    open var type: ExtractorLinkType,
     /** List of separate audio tracks that can be merged with this video */
-    @SerialName("audioTracks") open var audioTracks: List<AudioFile> = emptyList(),
+    open var audioTracks: List<AudioFile> = emptyList(),
 ) : IDownloadableMinimum {
-    @get:JsonIgnore val isM3u8: Boolean get() = type == ExtractorLinkType.M3U8
-    @get:JsonIgnore val isDash: Boolean get() = type == ExtractorLinkType.DASH
+    val isM3u8: Boolean get() = type == ExtractorLinkType.M3U8
+    val isDash: Boolean get() = type == ExtractorLinkType.DASH
 
     // Cached video size
-    @Transient private var videoSize: Long? = null
+    private var videoSize: Long? = null
 
     /**
      * Get video size in bytes with one head request. Only available for ExtractorLinkType.Video
@@ -1152,7 +1137,6 @@ val extractorApis: AtomicMutableList<ExtractorApi> = atomicListOf(
     Vicloud(),
     Uservideo(),
     Userscloud(),
-    HubuCloud(),
 
     Movhide(),
     StreamhideCom(),
@@ -1195,14 +1179,6 @@ val extractorApis: AtomicMutableList<ExtractorApi> = atomicListOf(
     Vidaratem(),
     VidaaraxCom(),
     VidaaraxNet(),
-    Odysseusa(),
-    Handfacesnap(),
-    Namefacesnap(),
-    Thebesthostertv(),
-    Vidmatrixa(),
-    VidChampions(),
-    Antarcticadocs(),
-    Nameitweb(),
 
     GamoVideo(),
     Gdriveplayerapi(),
@@ -1315,7 +1291,6 @@ val extractorApis: AtomicMutableList<ExtractorApi> = atomicListOf(
     Ds2play(),
     Ds2video(),
     Vidsonic(),
-    Vixeo(),
     InternetArchive(),
     VidStack(),
     GDMirrorbot(),
@@ -1342,10 +1317,7 @@ val extractorApis: AtomicMutableList<ExtractorApi> = atomicListOf(
     ByseQekaho(),
     Flyfile(),
     Firestream(),
-    FirestreamSite(),
     Vids(),
-    Playmate(),
-    Hexload(),
 )
 
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index 3edd0f410..cd5d752b3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -21,10 +21,9 @@ package com.lagradost.cloudstream3.utils
 
 import com.lagradost.cloudstream3.base64DecodeArray
 import io.ktor.http.Url
-import kotlinx.io.Buffer
-import kotlinx.io.IOException
-import kotlinx.io.readByteArray
-import kotlin.uuid.Uuid
+import java.io.IOException
+import java.nio.ByteBuffer
+import java.util.UUID
 
 @Suppress("unused")
 object HlsPlaylistParser {
@@ -187,13 +186,13 @@ object HlsPlaylistParser {
 
     data class SchemeData(
         /**
-         * The [Uuid] of the DRM scheme, or [C.UUID_NIL] if the data is universal (i.e.
+         * The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is universal (i.e.
          * applies to all schemes).
          */
-        val uuid: Uuid,
+        val uuid: UUID,
         /** The URL of the server to which license requests should be made. May be null if unknown. */
         val licenseServerUrl: String? = null,
-        /** The mimeType of [data]. */
+        /** The mimeType of {@link #data}. */
         val mimeType: String,
         /** The initialization data. May be null for scheme support checks only. */
         val data: ByteArray
@@ -455,14 +454,14 @@ object HlsPlaylistParser {
                 // "." or "..", remove the appropriate segments of the path.
                 if (i == segmentStart + 1 && url[segmentStart] == '.') {
                     // Given "abc/def/./ghi", remove "./" to get "abc/def/ghi".
-                    url.deleteRange(segmentStart, nextSegmentStart)
+                    url.delete(segmentStart, nextSegmentStart)
                     limit -= nextSegmentStart - segmentStart
                     i = segmentStart
                 } else if (i == segmentStart + 2 && url[segmentStart] == '.' && url[segmentStart + 1] == '.') {
                     // Given "abc/def/../ghi", remove "def/../" to get "abc/ghi".
                     val prevSegmentStart = url.lastIndexOf("/", segmentStart - 2) + 1
                     val removeFrom = if (prevSegmentStart > offset) prevSegmentStart else offset
-                    url.deleteRange(removeFrom, nextSegmentStart)
+                    url.delete(removeFrom, nextSegmentStart)
                     limit -= nextSegmentStart - removeFrom
                     segmentStart = prevSegmentStart
                     i = prevSegmentStart
@@ -533,31 +532,31 @@ object HlsPlaylistParser {
         }
     }
 
-    private object C {
+    object C {
         /**
-         * [Uuid] for the ClearKey DRM scheme.
+         * UUID for the ClearKey DRM scheme.
          *
          *
          * ClearKey is supported on Android devices running Android 5.0 (API Level 21) and up.
          */
-        val CLEARKEY_UUID = Uuid.fromLongs(-0x1d8e62a7567a4c37L, 0x781AB030AF78D30EL)
+        val CLEARKEY_UUID = UUID(-0x1d8e62a7567a4c37L, 0x781AB030AF78D30EL)
 
         /**
-         * [Uuid] for the Widevine DRM scheme.
+         * UUID for the Widevine DRM scheme.
          *
          *
          * Widevine is supported on Android devices running Android 4.3 (API Level 18) and up.
          */
-        val WIDEVINE_UUID = Uuid.fromLongs(-0x121074568629b532L, -0x5c37d8232ae2de13L)
+        val WIDEVINE_UUID = UUID(-0x121074568629b532L, -0x5c37d8232ae2de13L)
 
         /**
-         * [Uuid] for the PlayReady DRM scheme.
+         * UUID for the PlayReady DRM scheme.
          *
          *
          * PlayReady is supported on all AndroidTV devices. Note that most other Android devices do not
          * provide PlayReady support.
          */
-        val PLAYREADY_UUID = Uuid.fromLongs(-0x65fb0f8667bfbd7aL, -0x546d19a41f77a06bL)
+        val PLAYREADY_UUID = UUID(-0x65fb0f8667bfbd7aL, -0x546d19a41f77a06bL)
 
 
         /** "cenc" scheme type name as defined in ISO/IEC 23001-7:2016.  */
@@ -1067,7 +1066,7 @@ object HlsPlaylistParser {
 
     object PsshAtomUtil {
         fun buildPsshAtom(
-            systemId: Uuid, keyIds: Array<Uuid>?, data: ByteArray?
+            systemId: UUID, keyIds: Array<UUID>?, data: ByteArray?
         ): ByteArray {
             val dataLength = data?.size ?: 0
             var psshBoxLength: Int =
@@ -1075,30 +1074,26 @@ object HlsPlaylistParser {
             if (keyIds != null) {
                 psshBoxLength += 4 /* KID_count */ + (keyIds.size * 16) /* KIDs */
             }
-            val buffer = Buffer()
-            buffer.writeInt(psshBoxLength)
-            buffer.writeInt(Mp4Box.TYPE_pssh)
-            buffer.writeInt(if (keyIds != null) 0x01000000 else 0 /* version=(buildV1Atom ? 1 : 0), flags=0 */)
-            systemId.toLongs { mostSignificantBits, leastSignificantBits ->
-                buffer.writeLong(mostSignificantBits)
-                buffer.writeLong(leastSignificantBits)
-            }
+            val psshBox: ByteBuffer = ByteBuffer.allocate(psshBoxLength)
+            psshBox.putInt(psshBoxLength)
+            psshBox.putInt(Mp4Box.TYPE_pssh)
+            psshBox.putInt(if (keyIds != null) 0x01000000 else 0 /* version=(buildV1Atom ? 1 : 0), flags=0 */)
+            psshBox.putLong(systemId.mostSignificantBits)
+            psshBox.putLong(systemId.leastSignificantBits)
             if (keyIds != null) {
-                buffer.writeInt(keyIds.size)
+                psshBox.putInt(keyIds.size)
                 for (keyId in keyIds) {
-                    keyId.toLongs { mostSignificantBits, leastSignificantBits ->
-                        buffer.writeLong(mostSignificantBits)
-                        buffer.writeLong(leastSignificantBits)
-                    }
+                    psshBox.putLong(keyId.mostSignificantBits)
+                    psshBox.putLong(keyId.leastSignificantBits)
                 }
             }
             if (data != null && data.size != 0) {
-                buffer.writeInt(data.size)
-                buffer.write(data)
+                psshBox.putInt(data.size)
+                psshBox.put(data)
             } else {
-                buffer.writeInt(0)
+                psshBox.putInt(0)
             }
-            return buffer.readByteArray()
+            return psshBox.array()
         }
     }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsInterpreter.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsInterpreter.kt
index a8a6344aa..39d950ed1 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsInterpreter.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsInterpreter.kt
@@ -86,6 +86,7 @@ private const val JS_DEFAULT_MAX_INSTRUCTIONS: Long = 50_000_000L
  * Convert any JS runtime value to its JavaScript string representation.
  * Mirrors what JS `String(value)` would produce.
  */
+@Prerelease
 fun jsValueToString(v: Any?): String = toJsString(v)
 
 /**
@@ -105,6 +106,7 @@ fun jsValueToString(v: Any?): String = toJsString(v)
  * @param scope the [CoroutineScope] this context's cancellation is tied to. Supplied
  *        automatically by [newJsContext] from the caller's own coroutine context.
  */
+@Prerelease
 class JsContext internal constructor(
     var maxExecutionTime: Duration = JS_DEFAULT_MAX_EXECUTION_TIME,
     var maxInstructions: Long = JS_DEFAULT_MAX_INSTRUCTIONS,
@@ -158,6 +160,7 @@ class JsContext internal constructor(
  *       eval("x + 1")
  *   }
  */
+@Prerelease
 suspend fun newJsContext(
     initializer: suspend JsContext.() -> Unit = {},
 ): JsContext {
@@ -185,6 +188,7 @@ suspend fun newJsContext(
  *         Returns [Unit] on evaluation failure, timeout, or when the result is JS undefined.
  *         JS null is represented as Kotlin null. Use [jsValueToString] to convert to a JS string.
  */
+@Prerelease
 @Throws(CancellationException::class)
 suspend fun evalJs(
     js: String,
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt
index 82fb3af23..2f3957630 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt
@@ -28,6 +28,7 @@ import com.lagradost.cloudstream3.Prerelease
 import kotlin.math.round
 
 // Taken from https://github.com/terrakok/FuzzyKot/blob/f794d43/fuzzykot/src/commonMain/kotlin/com/github/terrakok/fuzzykot/Levenshtein.kt
+@Prerelease
 object Levenshtein {
     fun ratio(s1: String, s2: String, processor: (String) -> String = { it }): Int {
         val p1 = processor(s1)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
index 3a4c21d98..d34f5f500 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -121,15 +121,6 @@ object M3u8Helper2 {
         return !url.startsWith("https://") && !url.startsWith("http://")
     }
 
-    /** Resolves a playlist entry against the playlist url, as done for variants in [HlsPlaylistParser] */
-    private fun resolveUrl(playlistUrl: String, url: String): String {
-        return if (isNotCompleteUrl(url)) {
-            HlsPlaylistParser.UrlUtil.resolveToUrl(playlistUrl, url).toString()
-        } else {
-            url
-        }
-    }
-
     @Throws
     suspend fun m3u8Generation(
         m3u8: M3u8Helper.M3u8Stream,
@@ -329,7 +320,11 @@ object M3u8Helper2 {
 
         if (!match.isNullOrEmpty()) {
             encryptionState = true
-            val encryptionUrl = resolveUrl(playlistStream.streamUrl, match[2])
+            var encryptionUrl = match[2]
+
+            if (isNotCompleteUrl(encryptionUrl)) {
+                encryptionUrl = "${getParentLink(playlistStream.streamUrl)}/$encryptionUrl"
+            }
 
             encryptionIv = match[3].encodeToByteArray()
             val encryptionKeyResponse =
@@ -344,7 +339,12 @@ object M3u8Helper2 {
         val relativeUrl = getParentLink(playlistStream.streamUrl)
         val allTsList = TS_EXTENSION_REGEX.findAll(playlistResponse + "\n").map { ts ->
             val time = ts.groupValues[1]
-            val url = resolveUrl(playlistStream.streamUrl, ts.groupValues[3].trim())
+            val value = ts.groupValues[3]
+            val url = if (isNotCompleteUrl(value)) {
+                "$relativeUrl/${value}"
+            } else {
+                value
+            }
             TsLink(url = url, time = time.toDoubleOrNull())
         }.toList()
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
index fc1055dc6..64815f794 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
@@ -5,26 +5,30 @@ import io.ktor.http.decodeURLQueryComponent
 import io.ktor.http.encodeURLParameter
 
 object StringUtils {
+    @Prerelease
     fun String.decodeUrl(): String {
         return this.decodeURLQueryComponent()
     }
 
+    @Prerelease
     fun String.encodeUrl(): String {
         return this.encodeURLParameter()
     }
 
-    @Deprecated(
+    // Deprecate after next stable
+
+    /* @Deprecated(
         message = "Use Ktor 'Url' naming convention instead.",
         replaceWith = ReplaceWith("this.encodeUrl()"),
         level = DeprecationLevel.WARNING,
-    )
+    ) */
     fun String.encodeUri(): String = encodeUrl()
 
-    @Deprecated(
+    /* @Deprecated(
         message = "Use Ktor 'Url' naming convention instead.",
         replaceWith = ReplaceWith("this.decodeUrl()"),
         level = DeprecationLevel.WARNING,
-    )
+    ) */
     fun String.decodeUri(): String = decodeUrl()
 }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
index 7d81412f0..a6362efd0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
@@ -1,5 +1,13 @@
 package com.lagradost.cloudstream3.utils
 
+import java.util.Locale
+
+// If you find a way to use SettingsGeneral getCurrentLocale()
+// instead of this function do it.
+fun getCurrentLocale(): String {
+    return Locale.getDefault().toLanguageTag()
+}
+
 @Suppress(
     "unused",
     "MemberVisibilityCanBePrivate"
@@ -39,10 +47,23 @@ object SubtitleHelper {
         val ISO_639_3: String,      // ISO 639-6 missing as it's intended to differentiate specific dialects and variants
         val openSubtitles: String, // inconsistent codes that do not conform ISO 639
     ) {
-        fun localizedName(localizedTo: String? = null): String =
-            localizedLanguageName(this.IETF_tag, localizedTo ?: getCurrentLocale())
+        fun localizedName(localizedTo: String? = null): String {
+            // Use system locale to localize language name
+            val localeOfLangCode = Locale.forLanguageTag(this.IETF_tag)
+            val localeOfLocalizeTo = Locale.forLanguageTag(localizedTo ?: getCurrentLocale())
+            val sysLocalizedName = localeOfLangCode.getDisplayName(localeOfLocalizeTo)
+
+            val langCodeWithCountry = "${localeOfLangCode.language} (" // ${localeOfLangCode.country})"
+            val failedToLocalize =
+                sysLocalizedName.equals(this.IETF_tag, ignoreCase = true) ||
+                sysLocalizedName.contains(langCodeWithCountry, ignoreCase = true)
+
+            return if (failedToLocalize)
                 // fallback to native language name
-                ?: this.nativeName
+                this.nativeName
+            else
+                sysLocalizedName
+        }
 
         fun nameNextToFlagEmoji(localizedTo: String? = null): String {
             // fallback to [A][A] -> [?] question mak flag
@@ -62,7 +83,18 @@ object SubtitleHelper {
         halfMatch: Boolean? = false
     ): LanguageMetadata? {
         if (languageName.isNullOrBlank() || languageName.length < 2) return null
-        val lowLangName = languageName.lowercase().replace(garbageRegex, "").trim()
+        // Workaround to avoid junk like "English (original audio)" or "Spanish 123"
+        // or "اَلْعَرَبِيَّةُ (Original Audio) 1" or "English (hindi sub)"…
+        // Will still keep "-" to be compatible with language tags such as pr-bt
+        val garbage = Regex(
+            "\\([^)]*(?:dub|sub|original|audio|code)[^)]*\\)|" + // junk words in parenthesis
+                    "[\\u064B-\\u065B]|" + // arabic diacritics
+                    "\\d|" +  // numbers
+                    "[^\\p{L}\\p{Mn}\\p{Mc}\\p{Me} ()-]" // non-letter (from any language)
+        )
+
+
+        val lowLangName = languageName.lowercase().replace(garbage, "").trim()
 
         val index = indexMapLanguageName[lowLangName]
             ?: indexMapNativeName[lowLangName]
@@ -222,22 +254,10 @@ object SubtitleHelper {
     */
     fun isWellFormedTagIETF(langTagIETF: String?): Boolean {
         if (langTagIETF.isNullOrBlank() || langTagIETF.length < 2) return false
-        return langTagIETF.matches(langTagRegex)
-    }
 
-    // Workaround to avoid junk like "English (original audio)" or "Spanish 123"
-    // or "اَلْعَرَبِيَّةُ (Original Audio) 1" or "English (hindi sub)"…
-    // Will still keep "-" to be compatible with language tags such as pr-bt
-    private val garbageRegex = Regex(
-        "\\([^)]*(?:dub|sub|original|audio|code)[^)]*\\)|" + // junk words in parenthesis
-                "[\\u064B-\\u065B]|" + // arabic diacritics
-                "\\d|" +  // numbers
-                "[^\\p{L}\\p{Mn}\\p{Mc}\\p{Me} ()-]" // non-letter (from any language)
-    )
-
-    // Written by Addison Phillips, <Addison at amazon.com>
-    // https://www.langtag.net/philips-regexp.html
-    private val langTagRegex = """
+        // Written by Addison Phillips, <Addison at amazon.com>
+        // https://www.langtag.net/philips-regexp.html
+        val langTagRegex = """
             +(^[xX](\x2d\p{Alnum}{1,8})*$)
             +|(((^\p{Alpha}{2,8}(?=\x2d|$)){1}
             +((\x2d\p{Alpha}{3})(?=\x2d|$)){0,3}
@@ -247,10 +267,9 @@ object SubtitleHelper {
             +((\x2d([a-wyzA-WYZ](?=\x2d))(\x2d(\p{Alnum}{2,8})+)*))*
             +(\x2d[xX](\x2d\p{Alnum}{1,8})*)?)$
             """.trimMargin("+").toRegex()
-    // language tags (en-US, es-419, pt-BR, zh-hant-TW) that includes country
-    private val countryRegex = Regex("[-_](\\p{Alnum}{2,3})$", RegexOption.IGNORE_CASE)
-    // 2 times a symbol between regional indicator "[A]" and "[Z]"
-    private val unicodeFlagRegex = Regex("[\uD83C\uDDE6-\uD83C\uDDFF]{2}")
+        return langTagIETF.matches(langTagRegex)
+    }
+
     /**
      * Try to get a flag emoji form a language code
      * or two letters country code (ISO 3166-1-alfa-2)
@@ -258,6 +277,11 @@ object SubtitleHelper {
     fun getFlagFromIso(inp: String?): String? {
         if (inp.isNullOrBlank() || inp.length < 2) return null
 
+        // 2 times a symbol between regional indicator "[A]" and "[Z]"
+        val unicodeFlagRegex = Regex("[\uD83C\uDDE6-\uD83C\uDDFF]{2}")
+        // language tags (en-US, es-419, pt-BR, zh-hant-TW) that includes country
+        val countryRegex = Regex("[-_](\\p{Alnum}{2,3})$", RegexOption.IGNORE_CASE)
+
         val country = countryRegex.find(inp)?.groupValues?.get(1)
 
         val flagEmoji =
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.kt
deleted file mode 100644
index 38a254da8..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-/**
- * Returns the current locale as an IETF BCP 47 language tag.
- */
-expect fun getCurrentLocale(): String
-
-/**
- * Returns the display name of [ietfTag] localized into [localizedTo].
- * Returns null if the platform couldn't produce a meaningful name
- * (i.e. it just echoed back the tag or contained a bare language code with parentheses).
- */
-expect fun localizedLanguageName(ietfTag: String, localizedTo: String): String?
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsIntSerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsIntSerializer.kt
deleted file mode 100644
index 12c8f6ed0..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsIntSerializer.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.doubleOrNull
-import kotlinx.serialization.json.intOrNull
-
-/**
- * Replicates Jackson's ACCEPT_FLOAT_AS_INT behaviour for Int fields.
- * A floating-point JSON number is truncated to Int by dropping the
- * fractional part, exactly like Jackson's default truncation behaviour.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = FloatAsIntSerializer::class)
- *       @SerialName("count") val count: Int = 0,
- *   )
- */
-@Prerelease
-object FloatAsIntSerializer : KSerializer<Int> {
-
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("FloatAsInt", PrimitiveKind.INT)
-
-    override fun deserialize(decoder: Decoder): Int {
-        val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeInt()
-        val element = jsonDecoder.decodeJsonElement()
-        if (element !is JsonPrimitive) return 0
-        return element.intOrNull ?: element.doubleOrNull?.toInt() ?: 0
-    }
-
-    override fun serialize(encoder: Encoder, value: Int) = encoder.encodeInt(value)
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsLongSerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsLongSerializer.kt
deleted file mode 100644
index 7fc394107..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/FloatAsLongSerializer.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.doubleOrNull
-import kotlinx.serialization.json.longOrNull
-
-/**
- * Replicates Jackson's ACCEPT_FLOAT_AS_INT behaviour for Long fields.
- * A floating-point JSON number is truncated to Long by dropping the
- * fractional part, exactly like Jackson's default truncation behaviour.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = FloatAsLongSerializer::class)
- *       @SerialName("timestamp") val timestamp: Long = 0L,
- *   )
- */
-@Prerelease
-object FloatAsLongSerializer : KSerializer<Long> {
-
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("FloatAsLong", PrimitiveKind.LONG)
-
-    override fun deserialize(decoder: Decoder): Long {
-        val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeLong()
-        val element = jsonDecoder.decodeJsonElement()
-        if (element !is JsonPrimitive) return 0L
-        return element.longOrNull ?: element.doubleOrNull?.toLong() ?: 0L
-    }
-
-    override fun serialize(encoder: Encoder, value: Long) = encoder.encodeLong(value)
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/JsonTransformSerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/JsonTransformSerializer.kt
deleted file mode 100644
index 6b9c25b59..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/JsonTransformSerializer.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.JsonTransformingSerializer
-
-/**
- * Composable deserialize transformer that applies multiple Jackson-equivalent
- * behaviours to specific fields by key. Pass only the sets you need; all
- * default to empty (no-op).
- *
- * Behaviours (applied in order per field):
- *   singleValueAsListKeys ACCEPT_SINGLE_VALUE_AS_ARRAY
- *   emptyStringAsNullKeys ACCEPT_EMPTY_STRING_AS_NULL_OBJECT
- *   emptyArrayAsNullKeys ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT
- *
- * Usage:
- *
- *   @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
- *   @KeepGeneratedSerializer
- *   @Serializable(with = MyData.Serializer::class)
- *   data class MyData(
- *       @SerialName("title") val title: String? = null,
- *       @SerialName("tags") val tags: List<String>? = null,
- *       @SerialName("meta") val meta: MyMeta? = null,
- *   ) {
- *       object Serializer : JsonTransformSerializer<MyData>(
- *           MyData.generatedSerializer(),
- *           singleValueAsListKeys = setOf("tags"),
- *           emptyStringAsNullKeys = setOf("title", "tags"),
- *           emptyArrayAsNullKeys = setOf("tags", "meta"),
- *       )
- *   }
- */
-@Prerelease
-abstract class JsonTransformSerializer<T : Any>(
-    tSerializer: KSerializer<T>,
-    private val singleValueAsListKeys: Set<String> = emptySet(),
-    private val emptyArrayAsNullKeys: Set<String> = emptySet(),
-    private val emptyStringAsNullKeys: Set<String> = emptySet(),
-) : JsonTransformingSerializer<T>(tSerializer) {
-
-    override fun transformDeserialize(element: JsonElement): JsonElement {
-        if (element !is JsonObject) return element
-        return JsonObject(element.mapValues { (key, value) ->
-            var result = value
-            if (key in singleValueAsListKeys) {
-                result = when (result) {
-                    is JsonArray -> result
-                    JsonNull -> JsonArray(emptyList())
-                    else -> JsonArray(listOf(result))
-                }
-            }
-
-            if (key in emptyStringAsNullKeys) {
-                if (result is JsonPrimitive && result.isString && result.content.isEmpty()) {
-                    result = JsonNull
-                }
-            }
-
-            if (key in emptyArrayAsNullKeys) {
-                if (result is JsonArray && result.isEmpty()) {
-                    result = JsonNull
-                }
-            }
-
-            result
-        })
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt
index 8bc8f1734..82de9f7f7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt
@@ -17,22 +17,24 @@ import kotlinx.serialization.json.JsonTransformingSerializer
  *
  * Usage:
  *
- *   @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+ *   @OptIn(ExperimentalSerializationApi::class)
  *   @KeepGeneratedSerializer
  *   @Serializable(with = MyData.Serializer::class)
  *   data class MyData(
- *       @SerialName("tags") val tags: List<String> = emptyList(),
- *       @SerialName("title") val title: String = "",
- *       @SerialName("meta") val meta: Map<String, String> = emptyMap(),
+ *       val tags: List<String> = emptyList(),
+ *       val title: String = "",
+ *       val meta: Map<String, String> = emptyMap(),
  *   ) {
  *       object Serializer : NonEmptySerializer<MyData>(MyData.generatedSerializer())
  *   }
  */
+@Prerelease
 abstract class NonEmptySerializer<T : Any>(tSerializer: KSerializer<T>) :
     JsonTransformingSerializer<T>(tSerializer) {
 
     override fun transformSerialize(element: JsonElement): JsonElement {
         if (element !is JsonObject) return element
+
         return JsonObject(element.filterValues { value ->
             when (value) {
                 is JsonPrimitive -> value.content.isNotEmpty()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NullableStringSerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NullableStringSerializer.kt
deleted file mode 100644
index 6755304a5..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NullableStringSerializer.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.Prerelease
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.decodeFromJsonElement
-
-/**
- * Convenience serializer for nullable String fields that combines
- * ACCEPT_EMPTY_STRING_AS_NULL_OBJECT with null passthrough.
- * An empty JSON string (`""`) or JSON null is decoded as null.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = NullableStringSerializer::class)
- *       @SerialName("title") val title: String? = null,
- *   )
- */
-@Prerelease
-object NullableStringSerializer : KSerializer<String?> {
-
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("NullableString", PrimitiveKind.STRING)
-
-    override fun deserialize(decoder: Decoder): String? {
-        val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeString()
-        return when (val element = jsonDecoder.decodeJsonElement()) {
-            is JsonPrimitive -> element.content.ifEmpty { null }
-            JsonNull -> null
-            else -> jsonDecoder.json.decodeFromJsonElement(String.serializer(), element)
-        }
-    }
-
-    override fun serialize(encoder: Encoder, value: String?) {
-        @OptIn(ExperimentalSerializationApi::class) // encodeNull is experimental for now
-        if (value == null) encoder.encodeNull() else encoder.encodeString(value)
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt
index 1b6ca9aee..c7f412eaa 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt
@@ -12,12 +12,12 @@ import kotlinx.serialization.json.JsonTransformingSerializer
  *
  * Usage:
  *
- *   @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+ *   @OptIn(ExperimentalSerializationApi::class)
  *   @KeepGeneratedSerializer
  *   @Serializable(with = MyData.Serializer::class)
  *   data class MyData(
- *       @SerialName("fieldA") val fieldA: String = "",
- *       @SerialName("fieldB") val fieldB: String = "",
+ *       val fieldA: String = "",
+ *       val fieldB: String = "",
  *   ) {
  *       object Serializer : WriteOnlySerializer<MyData>(
  *           MyData.generatedSerializer(),
@@ -25,6 +25,7 @@ import kotlinx.serialization.json.JsonTransformingSerializer
  *       )
  *   }
  */
+@Prerelease
 abstract class WriteOnlySerializer<T : Any>(
     tSerializer: KSerializer<T>,
     private val keysToIgnore: Set<String>,
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt
index 422b4cd93..4dc56978e 100644
--- a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt
+++ b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt
@@ -31,26 +31,6 @@ class EpisodeDateTest {
         assertEquals(expected, ep.date)
     }
 
-    @Test
-    fun addDateDefaultFormatParsesExtraTime() {
-        val ep = episode()
-        ep.addDate("2026-05-17 12:30:45")
-        val expected = LocalDate(2026, 5, 17)
-            .atStartOfDayIn(TimeZone.currentSystemDefault())
-            .toEpochMilliseconds()
-        assertEquals(expected, ep.date)
-    }
-
-    @Test
-    fun addDateDefaultFormatParsesExtraJunk() {
-        val ep = episode()
-        ep.addDate("  2026-05-17 random data")
-        val expected = LocalDate(2026, 5, 17)
-            .atStartOfDayIn(TimeZone.currentSystemDefault())
-            .toEpochMilliseconds()
-        assertEquals(expected, ep.date)
-    }
-
     @Test
     fun addDateNullDoesNotSetDate() {
         val ep = episode()
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/SplitUrlParametersTest.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/SplitUrlParametersTest.kt
deleted file mode 100644
index 7e58c70be..000000000
--- a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/SplitUrlParametersTest.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.lagradost.cloudstream3
-
-import io.ktor.http.Url
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class SplitUrlParametersTest {
-
-    @Test
-    fun splitsBasicParameters() {
-        val url = Url("https://example.com/path?foo=bar&baz=qux")
-        val result = splitUrlParameters(url)
-        assertEquals(mapOf("foo" to "bar", "baz" to "qux"), result)
-    }
-
-    @Test
-    fun decodesUrlEncodedKeysAndValues() {
-        val url = Url("https://example.com/path?na%20me=hello%20world&sp%26ec=a%2Bb")
-        val result = splitUrlParameters(url)
-        assertEquals(mapOf("na me" to "hello world", "sp&ec" to "a+b"), result)
-    }
-
-    @Test
-    fun returnsEmptyMapWhenThereAreNoParameters() {
-        val url = Url("https://example.com/path")
-        val result = splitUrlParameters(url)
-        assertTrue(result.isEmpty())
-    }
-
-    @Test
-    fun keepsOnlyFirstValueForRepeatedKeys() {
-        val url = Url("https://example.com/path?a=1&a=2&a=3")
-        val result = splitUrlParameters(url)
-        assertEquals(mapOf("a" to "1"), result)
-    }
-
-    @Test
-    fun handlesParameterWithNoValue() {
-        val url = Url("https://example.com/path?flag&foo=bar")
-        val result = splitUrlParameters(url)
-        assertEquals("bar", result["foo"])
-        assertEquals("", result["flag"])
-    }
-
-    @Test
-    fun stringOverloadSplitsBasicParameters() {
-        val result = splitUrlParameters("https://example.com/path?foo=bar&baz=qux")
-        assertEquals(mapOf("foo" to "bar", "baz" to "qux"), result)
-    }
-
-    @Test
-    fun stringOverloadDecodesUrlEncodedKeysAndValues() {
-        val result = splitUrlParameters("https://example.com/path?na%20me=hello%20world&sp%26ec=a%2Bb")
-        assertEquals(mapOf("na me" to "hello world", "sp&ec" to "a+b"), result)
-    }
-
-    @Test
-    fun stringOverloadReturnsEmptyMapWhenThereAreNoParameters() {
-        val result = splitUrlParameters("https://example.com/path")
-        assertTrue(result.isEmpty())
-    }
-
-    @Test
-    fun stringOverloadKeepsOnlyFirstValueForRepeatedKeys() {
-        val result = splitUrlParameters("https://example.com/path?a=1&a=2&a=3")
-        assertEquals(mapOf("a" to "1"), result)
-    }
-
-    @Test
-    fun stringOverloadHandlesParameterWithNoValue() {
-        val result = splitUrlParameters("https://example.com/path?flag&foo=bar")
-        assertEquals("bar", result["foo"])
-        assertEquals("", result["flag"])
-    }
-}
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExtTest.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExtTest.kt
deleted file mode 100644
index 970fe728d..000000000
--- a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExtTest.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.lagradost.cloudstream3.mvvm
-
-import kotlin.test.Test
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-class ArchComponentExtTest {
-
-    @Test
-    fun getStackTracePrettyStripsFullyQualifiedClassNames() {
-        val throwable = try {
-            throw IllegalStateException("Exception")
-        } catch (t: Throwable) {
-            t
-        }
-
-        val pretty = throwable.getStackTracePretty()
-
-        // Should not contain the fully qualified package/class prefix
-        assertFalse(
-            pretty.contains("com.lagradost.cloudstream3.mvvm.ArchComponentExtTest"),
-            "Expected no fully qualified class names, got:\n$pretty"
-        )
-
-        // Should still reference the source file itself
-        assertTrue(
-            pretty.contains("ArchComponentExtTest.kt"),
-            "Expected pretty stack trace to reference a .kt file, got:\n$pretty"
-        )
-    }
-}
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/Ignore.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/Ignore.kt
deleted file mode 100644
index f815258a3..000000000
--- a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/Ignore.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-@OptIn(ExperimentalMultiplatform::class) // OptionalExpectation is an experimental annotation for now
-@OptionalExpectation
-@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-expect annotation class IgnoreOnWeb()
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/JsInterpreterTest.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/JsInterpreterTest.kt
index 588b8d268..182ea6c95 100644
--- a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/JsInterpreterTest.kt
+++ b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/JsInterpreterTest.kt
@@ -28,10 +28,6 @@ class JsInterpreterTest {
     private fun num(code: String, variable: String? = null): Double = evalJsInternal(code, variable) as? Double ?: Double.NaN
     private fun str(code: String, variable: String? = null): String = jsValueToString(evalJsInternal(code, variable))
 
-    private suspend fun JsContext.bool(code: String): Boolean = eval(code) as? Boolean ?: false
-    private suspend fun JsContext.num(code: String): Double = eval(code) as? Double ?: Double.NaN
-    private suspend fun JsContext.str(code: String): String = jsValueToString(eval(code))
-
     private fun assertApprox(expected: Double, actual: Double, tol: Double = 1e-9) {
         assertTrue(abs(actual - expected) <= tol, "Expected $expected ± $tol but was $actual")
     }
@@ -1388,18 +1384,18 @@ class JsInterpreterTest {
 
     @Test
     fun evaluateMathSimpleAddition() {
-        assertEquals("5", str("eval(2+3)"))
+        assertEquals("5", jsValueToString(evalJsInternal("eval(2+3)")))
     }
 
     @Test
     fun evaluateMathNestedParens() {
-        assertEquals("12", str("eval((2+4)*2)"))
+        assertEquals("12", jsValueToString(evalJsInternal("eval((2+4)*2)")))
     }
 
     @Test
     fun evaluateMathProducesCharCode() {
         val code = "eval(1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1)"
-        assertEquals(65.0, num(code))
+        assertEquals(65.0, (evalJsInternal(code) as? Double) ?: 0.0)
     }
 
     @Test
@@ -1929,12 +1925,12 @@ class JsInterpreterTest {
 
     @Test
     fun emptyStringMinusNegatedEmptyStringIsZero() {
-        assertEquals(0.0, num("\"\" - - \"\""))
+        assertEquals(0.0, evalJsInternal("\"\" - - \"\""))
     }
 
     @Test
     fun emptyStringMinusNumber() {
-        assertEquals(-1.0, num("\"\" - 1"))
+        assertEquals(-1.0, evalJsInternal("\"\" - 1"))
     }
 
     @Test
@@ -1950,7 +1946,7 @@ class JsInterpreterTest {
 
     @Test
     fun postfixIncrementOnNonLvalueFailsGracefully() {
-        assertEquals(2.0, num("true+1"))
+        assertEquals(2.0, evalJsInternal("true+1"))
         // `true++` has no valid assignment target (a SyntaxError in real JS); evalJs falls
         // back to Unit instead of returning a bogus number.
         assertEquals(Unit, evalJsInternal("true++"))
@@ -2033,7 +2029,7 @@ class JsInterpreterTest {
 
     @Test
     fun combinedCoercionOfNaNEmptyStringAndArrayHoleIsZero() {
-        assertEquals(0.0, num("+!!NaN * \"\" - - [,]"))
+        assertEquals(0.0, evalJsInternal("+!!NaN * \"\" - - [,]"))
     }
 
     /** Returns a [CoroutineScope] backed by a plain [Job] with no dispatcher attached. */
@@ -2133,7 +2129,6 @@ class JsInterpreterTest {
     }
 
     @Test
-    @IgnoreOnWeb
     fun suspendEvalJsWithTimeoutCancelsInfiniteLoop() = runTest {
         /**
          * activeScope() provides a real CoroutineScope with a real Job, so withTimeout
@@ -2158,6 +2153,7 @@ class JsInterpreterTest {
                     }
                 }
             }
+
             done.send(Unit)
         }
 
@@ -2169,7 +2165,7 @@ class JsInterpreterTest {
     @Test
     fun newJsContextWithNoInitializerIsUsable() = runTest {
         val ctx = newJsContext()
-        assertEquals(3.0, ctx.num("1+2"))
+        assertEquals(3.0, ctx.eval("1+2") as? Double ?: 0.0)
     }
 
     @Test
@@ -2229,7 +2225,8 @@ class JsInterpreterTest {
     fun jsContextFunctionDeclaredInOneEvalUsableInAnother() = runTest {
         val ctx = newJsContext()
         ctx.eval("function double(n) { return n * 2; }")
-        assertEquals(42.0, ctx.num("double(21)"))
+        val result = ctx.eval("double(21)")
+        assertEquals(42.0, result as? Double ?: 0.0)
     }
 
     @Test
@@ -2237,13 +2234,13 @@ class JsInterpreterTest {
         val ctx = newJsContext()
         ctx.eval("var arr = [1,2,3]")
         ctx.eval("arr.push(4)")
-        assertEquals("1,2,3,4", ctx.str("arr.join(',')"))
+        assertEquals("1,2,3,4", ctx.eval("arr.join(',')") as? String)
     }
 
     @Test
     fun jsContextEvalReturnsLastStatementValue() = runTest {
         val ctx = newJsContext()
-        assertEquals(9.0, ctx.num("var a = 3; a * a"))
+        assertEquals(9.0, ctx.eval("var a = 3; a * a") as? Double ?: 0.0)
     }
 
     @Test
@@ -2255,7 +2252,7 @@ class JsInterpreterTest {
     @Test
     fun jsContextEvalReturnsStringValue() = runTest {
         val ctx = newJsContext()
-        assertEquals("ab", ctx.str("'a' + 'b'"))
+        assertEquals("ab", ctx.eval("'a' + 'b'"))
     }
 
     @Test
@@ -2270,7 +2267,7 @@ class JsInterpreterTest {
     fun separateJsContextsDoNotShareFunctions() = runTest {
         val ctx1 = newJsContext { eval("function f(){ return 1; }") }
         val ctx2 = newJsContext()
-        assertEquals(1.0, ctx1.num("f()"))
+        assertEquals(1.0, ctx1.eval("f()") as? Double ?: 0.0)
         // f was never declared in ctx2, so calling it should not crash and yields Unit.
         assertEquals(Unit, ctx2.eval("typeof f === 'function' ? f() : undefined"))
     }
@@ -2278,7 +2275,8 @@ class JsInterpreterTest {
     @Test
     fun jsContextEvalDefaultBudgetHandlesNormalScript() = runTest {
         val ctx = newJsContext()
-        assertEquals(500500.0, ctx.num("var s=0; for(var i=1;i<=1000;i++){s+=i} s"))
+        val result = ctx.eval("var s=0; for(var i=1;i<=1000;i++){s+=i} s")
+        assertEquals(500500.0, result as? Double ?: 0.0)
     }
 
     @Test
@@ -2314,7 +2312,8 @@ class JsInterpreterTest {
         // Abort this call
         assertEquals(Unit, ctx.eval("while(true){}"))
         // The next call, using the defaults again, runs a normal script fine.
-        assertEquals(2.0, ctx.num("1+1"))
+        val result = ctx.eval("1+1")
+        assertEquals(2.0, result as? Double ?: 0.0)
     }
 
     @Test
@@ -2327,7 +2326,6 @@ class JsInterpreterTest {
     }
 
     @Test
-    @IgnoreOnWeb
     fun jsContextEvalCancelledWhenEnclosingCoroutineCancelledViaWithTimeout() = runTest {
         val done = Channel<Unit>()
         var elapsed = Duration.ZERO
@@ -2343,6 +2341,7 @@ class JsInterpreterTest {
                     }
                 }
             }
+
             done.send(Unit)
         }
 
@@ -2355,14 +2354,13 @@ class JsInterpreterTest {
     fun jsContextEvalNotCancelledWhenWithTimeoutDoesNotExpire() = runTest {
         val ctx = newJsContext()
         val result = withTimeoutOrNull(5.seconds) {
-            ctx.num("var s=0; for(var i=0;i<100;i++){s+=i} s")
+            ctx.eval("var s=0; for(var i=0;i<100;i++){s+=i} s")
         }
 
-        assertEquals(4950.0, result ?: Double.NaN)
+        assertEquals(4950.0, result as? Double ?: 0.0)
     }
 
     @Test
-    @IgnoreOnWeb
     fun jsContextJsTryCatchCannotSwallowEnclosingCancellation() = runTest {
         val done = Channel<Unit>()
         var elapsed = Duration.ZERO
@@ -2394,19 +2392,19 @@ class JsInterpreterTest {
 
     @Test
     fun jsContextInitializerCanReadBackItsOwnEvalResult() = runTest {
-        var capturedDuringInit: Double? = null
+        var capturedDuringInit: Any? = null
         newJsContext {
-            capturedDuringInit = num("2 * 21")
+            capturedDuringInit = eval("2 * 21")
         }
 
-        assertEquals(42.0, capturedDuringInit ?: Double.NaN)
+        assertEquals(42.0, capturedDuringInit as? Double ?: 0.0)
     }
 
     @Test
     fun jsContextSequentialIndependentComputations() = runTest {
         val ctx = newJsContext()
-        assertEquals(4.0, ctx.num("2+2"))
-        assertEquals("hi", ctx.str("'h'+'i'"))
-        assertFalse(ctx.bool("1 > 2"))
+        assertEquals(4.0, ctx.eval("2+2") as? Double ?: 0.0)
+        assertEquals("hi", ctx.eval("'h'+'i'") as? String)
+        assertFalse(ctx.eval("1 > 2") as? Boolean ?: true)
     }
 }
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/serializers/SerializersTest.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/serializers/SerializersTest.kt
deleted file mode 100644
index 89c0fea81..000000000
--- a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/serializers/SerializersTest.kt
+++ /dev/null
@@ -1,602 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertNull
-import kotlin.test.assertTrue
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = NonEmptyData.Serializer::class)
-data class NonEmptyData(
-    @SerialName("title") val title: String = "",
-    @SerialName("tags") val tags: List<String> = emptyList(),
-    @SerialName("meta") val meta: Map<String, String> = emptyMap(),
-    @SerialName("name") val name: String = "hello",
-) {
-    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = WriteOnlyData.Serializer::class)
-data class WriteOnlyData(
-    @SerialName("fieldA") val fieldA: String = "",
-    @SerialName("fieldB") val fieldB: String = "",
-) {
-    object Serializer : WriteOnlySerializer<WriteOnlyData>(
-        WriteOnlyData.generatedSerializer(),
-        setOf("fieldB"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = MultiWriteOnly.Serializer::class)
-data class MultiWriteOnly(
-    @SerialName("fieldA") val fieldA: String = "",
-    @SerialName("fieldB") val fieldB: String = "",
-    @SerialName("fieldC") val fieldC: String = "",
-) {
-    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
-        MultiWriteOnly.generatedSerializer(),
-        setOf("fieldB", "fieldC"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = SingleValueData.Serializer::class)
-data class SingleValueData(
-    @SerialName("tags") val tags: List<String> = emptyList(),
-    @SerialName("nums") val nums: List<Int> = emptyList(),
-) {
-    object Serializer : JsonTransformSerializer<SingleValueData>(
-        SingleValueData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags", "nums"),
-    )
-}
-
-@Serializable
-data class NestedMeta(
-    @SerialName("key") val key: String = "",
-)
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = EmptyArrayData.Serializer::class)
-data class EmptyArrayData(
-    @SerialName("meta") val meta: NestedMeta? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<EmptyArrayData>(
-        EmptyArrayData.generatedSerializer(),
-        emptyArrayAsNullKeys = setOf("meta"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = EmptyStringData.Serializer::class)
-data class EmptyStringData(
-    @SerialName("title") val title: String? = null,
-    @SerialName("episode") val episode: NestedMeta? = null,
-    @SerialName("keep") val keep: String? = "hello",
-) {
-    object Serializer : JsonTransformSerializer<EmptyStringData>(
-        EmptyStringData.generatedSerializer(),
-        emptyStringAsNullKeys = setOf("title", "episode", "keep"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = SingleValueOrNullData.Serializer::class)
-data class SingleValueOrNullData(
-    @SerialName("tags") val tags: List<String>? = null,
-    @SerialName("nums") val nums: List<Int>? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<SingleValueOrNullData>(
-        SingleValueOrNullData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags", "nums"),
-        emptyArrayAsNullKeys = setOf("tags", "nums"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = NullableFieldsData.Serializer::class)
-data class NullableFieldsData(
-    @SerialName("title") val title: String? = null,
-    @SerialName("meta") val meta: NestedMeta? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<NullableFieldsData>(
-        NullableFieldsData.generatedSerializer(),
-        emptyStringAsNullKeys = setOf("title"),
-        emptyArrayAsNullKeys = setOf("meta"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = SingleValueOrEmptyStringData.Serializer::class)
-data class SingleValueOrEmptyStringData(
-    @SerialName("tags") val tags: List<String> = emptyList(),
-    @SerialName("title") val title: String? = null,
-) {
-    object Serializer : JsonTransformSerializer<SingleValueOrEmptyStringData>(
-        SingleValueOrEmptyStringData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags"),
-        emptyStringAsNullKeys = setOf("title"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-@KeepGeneratedSerializer
-@Serializable(with = AllTransformsData.Serializer::class)
-data class AllTransformsData(
-    @SerialName("tags") val tags: List<String>? = null,
-    @SerialName("title") val title: String? = null,
-    @SerialName("meta") val meta: NestedMeta? = null,
-    @SerialName("other") val other: String = "hello",
-) {
-    object Serializer : JsonTransformSerializer<AllTransformsData>(
-        AllTransformsData.generatedSerializer(),
-        singleValueAsListKeys = setOf("tags"),
-        emptyArrayAsNullKeys = setOf("tags", "meta"),
-        emptyStringAsNullKeys = setOf("title", "tags"),
-    )
-}
-
-@Serializable
-data class FloatIntData(
-    @Serializable(with = FloatAsIntSerializer::class)
-    @SerialName("count") val count: Int = 0,
-)
-
-@Serializable
-data class FloatLongData(
-    @Serializable(with = FloatAsLongSerializer::class)
-    @SerialName("timestamp") val timestamp: Long = 0L,
-)
-
-@Serializable
-data class NullableStringData(
-    @Serializable(with = NullableStringSerializer::class)
-    @SerialName("title") val title: String? = null,
-)
-
-class SerializersTest {
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyStrings() {
-        val data = NonEmptyData(title = "", name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("title"))
-        assertTrue(result.contains("name"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyLists() {
-        val data = NonEmptyData(tags = emptyList(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("tags"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyMaps() {
-        val data = NonEmptyData(meta = emptyMap(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerKeepsNonEmptyFields() {
-        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
-        val result = data.toJson()
-        assertTrue(result.contains("title"))
-        assertTrue(result.contains("tags"))
-        assertTrue(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerDoesNotAffectDeserialization() {
-        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
-        val result = parseJson<NonEmptyData>(input)
-        assertEquals("hello", result.title)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals(mapOf("k" to "v"), result.meta)
-        assertEquals("world", result.name)
-    }
-
-    @Test
-    fun writeOnlySerializerOmitsFieldOnSerialize() {
-        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesNormally() {
-        val input = """{"fieldA":"hello","fieldB":"secret"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("secret", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesMissingAsDefault() {
-        val input = """{"fieldA":"hello"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerHandlesMultipleKeys() {
-        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-        assertFalse(result.contains("fieldC"))
-    }
-
-    @Test
-    fun singleValueAsListDecodesArrayNormally() {
-        val input = """{"tags":["a","b"],"nums":[1,2]}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(listOf("a", "b"), result.tags)
-        assertEquals(listOf(1, 2), result.nums)
-    }
-
-    @Test
-    fun singleValueAsListWrapsBareStringInList() {
-        val input = """{"tags":"a","nums":[1]}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(listOf("a"), result.tags)
-    }
-
-    @Test
-    fun singleValueAsListWrapsBareIntInList() {
-        val input = """{"tags":[],"nums":42}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(listOf(42), result.nums)
-    }
-
-    @Test
-    fun singleValueAsListDecodesNullAsEmptyList() {
-        val input = """{"tags":null,"nums":[]}"""
-        val result = parseJson<SingleValueData>(input)
-        assertEquals(emptyList<String>(), result.tags)
-    }
-
-    @Test
-    fun singleValueAsListRoundtripsCorrectly() {
-        val data = SingleValueData(tags = listOf("x", "y"), nums = listOf(1, 2))
-        val encoded = data.toJson()
-        val decoded = parseJson<SingleValueData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun emptyArrayAsNullDecodesEmptyArrayAsNull() {
-        val input = """{"meta":[],"other":"hello"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun emptyArrayAsNullDecodesNullAsNull() {
-        val input = """{"meta":null,"other":"hello"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun emptyArrayAsNullDecodesObjectNormally() {
-        val input = """{"meta":{"key":"value"},"other":"hello"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertEquals(NestedMeta("value"), result.meta)
-    }
-
-    @Test
-    fun emptyArrayAsNullDoesNotAffectOtherFields() {
-        val input = """{"meta":[],"other":"world"}"""
-        val result = parseJson<EmptyArrayData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun emptyArrayAsNullRoundtripsCorrectly() {
-        val data = EmptyArrayData(meta = NestedMeta("test"), other = "hello")
-        val encoded = data.toJson()
-        val decoded = parseJson<EmptyArrayData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun emptyStringAsNullDecodesEmptyStringAsNull() {
-        val input = """{"title":"","episode":null,"keep":"hello"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun emptyStringAsNullDecodesNullAsNull() {
-        val input = """{"title":null,"episode":null,"keep":"hello"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun emptyStringAsNullKeepsNonEmptyString() {
-        val input = """{"title":"hello","episode":null,"keep":"world"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertEquals("hello", result.title)
-    }
-
-    @Test
-    fun emptyStringAsNullDecodesObjectNormally() {
-        val input = """{"title":null,"episode":{"key":"value"},"keep":"hello"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertEquals(NestedMeta("value"), result.episode)
-    }
-
-    @Test
-    fun emptyStringAsNullDoesNotAffectNonEmptyFields() {
-        val input = """{"title":"","episode":null,"keep":"world"}"""
-        val result = parseJson<EmptyStringData>(input)
-        assertEquals("world", result.keep)
-    }
-
-    @Test
-    fun emptyStringAsNullRoundtripsCorrectly() {
-        val data = EmptyStringData(title = "hello", episode = NestedMeta("x"), keep = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<EmptyStringData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun singleValueOrNullWrapsBareValueInList() {
-        val input = """{"tags":"a","nums":1,"other":"hello"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals(listOf(1), result.nums)
-    }
-
-    @Test
-    fun singleValueOrNullTreatsEmptyArrayAsNull() {
-        val input = """{"tags":[],"nums":[],"other":"hello"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertNull(result.tags)
-        assertNull(result.nums)
-    }
-
-    @Test
-    fun singleValueOrNullDecodesArrayNormally() {
-        val input = """{"tags":["a","b"],"nums":[1,2],"other":"hello"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertEquals(listOf("a", "b"), result.tags)
-        assertEquals(listOf(1, 2), result.nums)
-    }
-
-    @Test
-    fun singleValueOrNullDoesNotAffectOtherFields() {
-        val input = """{"tags":[],"nums":[],"other":"world"}"""
-        val result = parseJson<SingleValueOrNullData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun nullableFieldsEmptyStringBecomesNull() {
-        val input = """{"title":"","meta":{"key":"value"},"other":"hello"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertNull(result.title)
-        assertEquals(NestedMeta("value"), result.meta)
-    }
-
-    @Test
-    fun nullableFieldsEmptyArrayBecomesNull() {
-        val input = """{"title":"hello","meta":[],"other":"hello"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertEquals("hello", result.title)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun nullableFieldsBothNullAtOnce() {
-        val input = """{"title":"","meta":[],"other":"hello"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertNull(result.title)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun nullableFieldsDoesNotAffectOtherFields() {
-        val input = """{"title":"","meta":[],"other":"world"}"""
-        val result = parseJson<NullableFieldsData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun nullableFieldsRoundtripsCorrectly() {
-        val data = NullableFieldsData(title = "hello", meta = NestedMeta("x"), other = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<NullableFieldsData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun singleValueOrEmptyStringWrapsBareString() {
-        val input = """{"tags":"a","title":"hello"}"""
-        val result = parseJson<SingleValueOrEmptyStringData>(input)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals("hello", result.title)
-    }
-
-    @Test
-    fun singleValueOrEmptyStringTurnsEmptyTitleToNull() {
-        val input = """{"tags":["a"],"title":""}"""
-        val result = parseJson<SingleValueOrEmptyStringData>(input)
-        assertEquals(listOf("a"), result.tags)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun singleValueOrEmptyStringRoundtripsCorrectly() {
-        val data = SingleValueOrEmptyStringData(tags = listOf("x"), title = "hello")
-        val encoded = data.toJson()
-        val decoded = parseJson<SingleValueOrEmptyStringData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun allTransformsWrapsBareStringInList() {
-        val input = """{"tags":"a","title":"hello","meta":{"key":"value"},"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertEquals(listOf("a"), result.tags)
-    }
-
-    @Test
-    fun allTransformsEmptyArrayTagsBecomesNull() {
-        val input = """{"tags":[],"title":"hello","meta":{"key":"value"},"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.tags)
-    }
-
-    @Test
-    fun allTransformsEmptyMetaBecomesNull() {
-        val input = """{"tags":["a"],"title":"hello","meta":[],"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun allTransformsEmptyTitleBecomesNull() {
-        val input = """{"tags":["a"],"title":"","meta":{"key":"value"},"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun allTransformsAllNullAtOnce() {
-        val input = """{"tags":[],"title":"","meta":[],"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertNull(result.tags)
-        assertNull(result.title)
-        assertNull(result.meta)
-    }
-
-    @Test
-    fun allTransformsDoesNotAffectOtherFields() {
-        val input = """{"tags":[],"title":"","meta":[],"other":"world"}"""
-        val result = parseJson<AllTransformsData>(input)
-        assertEquals("world", result.other)
-    }
-
-    @Test
-    fun allTransformsRoundtripsCorrectly() {
-        val data = AllTransformsData(tags = listOf("a"), title = "hello", meta = NestedMeta("x"), other = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<AllTransformsData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun floatAsIntTruncatesFloat() {
-        val input = """{"count":3.9}"""
-        val result = parseJson<FloatIntData>(input)
-        assertEquals(3, result.count)
-    }
-
-    @Test
-    fun floatAsIntDecodesIntNormally() {
-        val input = """{"count":42}"""
-        val result = parseJson<FloatIntData>(input)
-        assertEquals(42, result.count)
-    }
-
-    @Test
-    fun floatAsIntHandlesNegativeFloat() {
-        val input = """{"count":-2.7}"""
-        val result = parseJson<FloatIntData>(input)
-        assertEquals(-2, result.count)
-    }
-
-    @Test
-    fun floatAsIntRoundtripsCorrectly() {
-        val data = FloatIntData(count = 7)
-        val encoded = data.toJson()
-        val decoded = parseJson<FloatIntData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun floatAsLongTruncatesFloat() {
-        val input = """{"timestamp":1234567890.9}"""
-        val result = parseJson<FloatLongData>(input)
-        assertEquals(1234567890L, result.timestamp)
-    }
-
-    @Test
-    fun floatAsLongDecodesLongNormally() {
-        val input = """{"timestamp":9999999999}"""
-        val result = parseJson<FloatLongData>(input)
-        assertEquals(9999999999L, result.timestamp)
-    }
-
-    @Test
-    fun floatAsLongHandlesNegativeFloat() {
-        val input = """{"timestamp":-100.6}"""
-        val result = parseJson<FloatLongData>(input)
-        assertEquals(-100L, result.timestamp)
-    }
-
-    @Test
-    fun floatAsLongRoundtripsCorrectly() {
-        val data = FloatLongData(timestamp = 1700000000L)
-        val encoded = data.toJson()
-        val decoded = parseJson<FloatLongData>(encoded)
-        assertEquals(data, decoded)
-    }
-
-    @Test
-    fun nullableStringDecodesEmptyStringAsNull() {
-        val input = """{"title":""}"""
-        val result = parseJson<NullableStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun nullableStringDecodesNullAsNull() {
-        val input = """{"title":null}"""
-        val result = parseJson<NullableStringData>(input)
-        assertNull(result.title)
-    }
-
-    @Test
-    fun nullableStringKeepsNonEmptyString() {
-        val input = """{"title":"hello"}"""
-        val result = parseJson<NullableStringData>(input)
-        assertEquals("hello", result.title)
-    }
-
-    @Test
-    fun nullableStringRoundtripsCorrectly() {
-        val data = NullableStringData(title = "world")
-        val encoded = data.toJson()
-        val decoded = parseJson<NullableStringData>(encoded)
-        assertEquals(data, decoded)
-    }
-}
diff --git a/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.jvmCommon.kt b/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.jvmCommon.kt
deleted file mode 100644
index f2ff5e3ac..000000000
--- a/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.jvmCommon.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.lagradost.cloudstream3.mvvm
-
-import java.io.InterruptedIOException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
-import javax.net.ssl.SSLHandshakeException
-import kotlin.reflect.full.NoSuchPropertyException
-
-actual fun <T> platformThrowAbleToResource(throwable: Throwable): Resource<T> {
-    return when (throwable) {
-        is NoSuchMethodException, is NoSuchFieldException, is NoSuchMethodError, is NoSuchFieldError, is NoSuchPropertyException -> {
-            Resource.Failure(
-                false,
-                "App or extension is outdated, update the app or try pre-release.\n${throwable.message}" // todo add exact version?
-            )
-        }
-        is SocketTimeoutException, is InterruptedIOException -> {
-            Resource.Failure(
-                true,
-                "Connection Timeout\nPlease try again later."
-            )
-        }
-        is UnknownHostException -> {
-            Resource.Failure(
-                true,
-                "Cannot connect to server, try again later.\n${throwable.message}"
-            )
-        }
-        is SSLHandshakeException -> {
-            Resource.Failure(
-                true,
-                (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
-            )
-        }
-        else -> safeFail(throwable)
-    }
-}
diff --git a/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvmCommon.kt b/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvmCommon.kt
index 03a5be6c2..2ae886f59 100644
--- a/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvmCommon.kt
+++ b/library/src/jvmCommonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvmCommon.kt
@@ -1,7 +1,3 @@
 package com.lagradost.cloudstream3.utils
 
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-actual val workerDispatcher: CoroutineDispatcher = Dispatchers.IO
 internal actual typealias WorkerThread = androidx.annotation.WorkerThread
diff --git a/library/src/jvmMain/kotlin/com/lagradost/api/ContextHelper.jvm.kt b/library/src/jvmMain/kotlin/com/lagradost/api/ContextHelper.jvm.kt
index 83cae11a5..a30810b89 100644
--- a/library/src/jvmMain/kotlin/com/lagradost/api/ContextHelper.jvm.kt
+++ b/library/src/jvmMain/kotlin/com/lagradost/api/ContextHelper.jvm.kt
@@ -1,4 +1,10 @@
 package com.lagradost.api
 
-actual fun getContext(): Any? = null
-actual fun setContext(context: Any?) = Unit
+import java.lang.ref.WeakReference
+
+actual fun getContext(): Any? {
+    return null
+}
+
+actual fun setContext(context: WeakReference<Any>) {
+}
\ No newline at end of file
diff --git a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.jvm.kt b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.jvm.kt
deleted file mode 100644
index a43358ccb..000000000
--- a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.jvm.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import java.util.Locale
-
-actual fun getCurrentLocale(): String =
-    Locale.getDefault().toLanguageTag()
-
-actual fun localizedLanguageName(ietfTag: String, localizedTo: String): String? {
-    val localeOfLangCode = Locale.forLanguageTag(ietfTag)
-    val localeOfLocalizeTo = Locale.forLanguageTag(localizedTo)
-    val displayName = localeOfLangCode.getDisplayName(localeOfLocalizeTo)
-
-    // Locale.getDisplayName() falls back to the raw tag or "language (country)" form
-    // when it doesn't know how to render the name.
-    val langCodeWithCountry = "${localeOfLangCode.language} ("
-    val failed =
-        displayName.equals(ietfTag, ignoreCase = true) ||
-        displayName.contains(langCodeWithCountry, ignoreCase = true)
-
-    return if (failed) null else displayName
-}
\ No newline at end of file
diff --git a/library/src/jvmTest/kotlin/com/lagradost/cloudstream3/utils/M3u8HelperTest.kt b/library/src/jvmTest/kotlin/com/lagradost/cloudstream3/utils/M3u8HelperTest.kt
deleted file mode 100644
index b58f90d4e..000000000
--- a/library/src/jvmTest/kotlin/com/lagradost/cloudstream3/utils/M3u8HelperTest.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import com.sun.net.httpserver.HttpServer
-import kotlinx.coroutines.runBlocking
-import java.net.InetSocketAddress
-import java.util.Collections
-import kotlin.test.AfterTest
-import kotlin.test.BeforeTest
-import kotlin.test.Test
-import kotlin.test.assertContentEquals
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class M3u8HelperTest {
-    private lateinit var server: HttpServer
-    private lateinit var host: String
-    private val requestedPaths: MutableList<String> = Collections.synchronizedList(mutableListOf())
-    private val segment = ByteArray(256) { (it or 0x80).toByte() }
-
-    @BeforeTest
-    fun setUp() {
-        server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
-        host = "127.0.0.1:${server.address.port}"
-        server.createContext("/") { exchange ->
-            val path = exchange.requestURI.path
-            requestedPaths += path
-            val body = when (path) {
-                "/a/b/index.m3u8" -> playlist(key = null).encodeToByteArray()
-                "/a/b/encrypted.m3u8" -> playlist(key = "/keys/k.bin").encodeToByteArray()
-                "/a/b/seg0.ts", "/root/seg1.ts", "/proto/seg2.ts" -> segment
-                "/keys/k.bin" -> ByteArray(16)
-                else -> null
-            }
-            val bytes = body ?: "404 not found".encodeToByteArray()
-            exchange.sendResponseHeaders(if (body == null) 404 else 200, bytes.size.toLong())
-            exchange.responseBody.use { it.write(bytes) }
-        }
-        server.start()
-    }
-
-    @AfterTest
-    fun tearDown() {
-        server.stop(0)
-    }
-
-    private fun playlist(key: String?): String = buildString {
-        appendLine("#EXTM3U")
-        appendLine("#EXT-X-TARGETDURATION:10")
-        if (key != null) appendLine("#EXT-X-KEY:METHOD=AES-128,URI=\"$key\"")
-        appendLine("#EXTINF:10.0,")
-        appendLine("seg0.ts")
-        appendLine("#EXTINF:10.0,")
-        appendLine("/root/seg1.ts")
-        appendLine("#EXTINF:10.0,")
-        appendLine("//$host/proto/seg2.ts")
-        appendLine("#EXT-X-ENDLIST")
-    }
-
-    @Test
-    fun hslLazyResolvesSegmentUrlsAgainstPlaylistUrl() = runBlocking {
-        val data = M3u8Helper2.hslLazy(
-            M3u8Helper.M3u8Stream("http://$host/a/b/index.m3u8?token=abc"),
-            requireAudio = false,
-        )
-
-        assertEquals(
-            listOf(
-                "http://$host/a/b/seg0.ts",
-                "http://$host/root/seg1.ts",
-                "http://$host/proto/seg2.ts",
-            ),
-            data.allTsLinks.map { it.url },
-        )
-        for (index in 0 until data.size) {
-            assertContentEquals(segment, data.resolveLink(index))
-        }
-    }
-
-    @Test
-    fun hslLazyResolvesKeyUrlAgainstPlaylistUrl() = runBlocking {
-        M3u8Helper2.hslLazy(
-            M3u8Helper.M3u8Stream("http://$host/a/b/encrypted.m3u8"),
-            requireAudio = false,
-        )
-
-        assertTrue("/keys/k.bin" in requestedPaths, "requested: $requestedPaths")
-    }
-}
diff --git a/library/src/webMain/kotlin/com/lagradost/api/ContextHelper.web.kt b/library/src/webMain/kotlin/com/lagradost/api/ContextHelper.web.kt
deleted file mode 100644
index 83cae11a5..000000000
--- a/library/src/webMain/kotlin/com/lagradost/api/ContextHelper.web.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.lagradost.api
-
-actual fun getContext(): Any? = null
-actual fun setContext(context: Any?) = Unit
diff --git a/library/src/webMain/kotlin/com/lagradost/api/Log.kt b/library/src/webMain/kotlin/com/lagradost/api/Log.kt
deleted file mode 100644
index be185f0ca..000000000
--- a/library/src/webMain/kotlin/com/lagradost/api/Log.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lagradost.api
-
-actual object Log {
-    actual fun d(tag: String, message: String) {
-        // There is no console.debug in Kotlin/JS (Yet)
-        // We will switch this when it is added.
-        console.log("[$tag] $message")
-    }
-
-    actual fun i(tag: String, message: String) {
-        console.info("[$tag] $message")
-    }
-
-    actual fun w(tag: String, message: String) {
-        console.warn("[$tag] $message")
-    }
-
-    actual fun e(tag: String, message: String) {
-        console.error("[$tag] $message")
-    }
-}
diff --git a/library/src/webMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.web.kt b/library/src/webMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.web.kt
deleted file mode 100644
index 07463bd56..000000000
--- a/library/src/webMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.web.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-
-/**
- * Web/JS target shim.
- *
- * NewPipeExtractor is JVM-only, so the full extraction logic used on
- * Android/desktop can't run here. This stub keeps the multiplatform
- * source set compiling; it performs no extraction and simply reports
- * that no links were found on this target.
- *
- * If/when a JS-compatible YouTube extraction path exists, replace the
- * body of getUrl() with that implementation.
- */
-actual open class YoutubeExtractor actual constructor() : ExtractorApi() {
-
-    actual override val mainUrl = "https://www.youtube.com"
-    actual override val name = "YouTube"
-    actual override val requiresReferer = false
-
-    actual override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        // No-op on web target: NewPipeExtractor is unavailable here.
-    }
-}
diff --git a/library/src/webMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.web.kt b/library/src/webMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.web.kt
deleted file mode 100644
index f108bf7fb..000000000
--- a/library/src/webMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.web.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.lagradost.cloudstream3.mvvm
-
-actual fun <T> platformThrowAbleToResource(throwable: Throwable): Resource<T> {
-    val message = throwable.message.orEmpty()
-    return when {
-        message.contains("timeout", ignoreCase = true) -> {
-            Resource.Failure(
-                true,
-                "Connection Timeout\nPlease try again later."
-            )
-        }
-
-        message.contains("NetworkError", ignoreCase = true) ||
-        message.contains("Failed to fetch", ignoreCase = true) ||
-        message.contains("ERR_NAME_NOT_RESOLVED", ignoreCase = true) -> {
-            Resource.Failure(
-                true,
-                "Cannot connect to server, try again later.\n${throwable.message}"
-            )
-        }
-
-        message.contains("SSL", ignoreCase = true) ||
-        message.contains("certificate", ignoreCase = true) -> {
-            Resource.Failure(
-                true,
-                (throwable.message ?: "SSL error") + "\nTry a VPN or DNS."
-            )
-        }
-
-        else -> safeFail(throwable)
-    }
-}
diff --git a/library/src/webMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.web.kt b/library/src/webMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.web.kt
deleted file mode 100644
index 3ea59f6cc..000000000
--- a/library/src/webMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.web.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import androidx.annotation.AnyThread
-import androidx.annotation.MainThread
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-actual val workerDispatcher: CoroutineDispatcher = Dispatchers.Default
-internal actual annotation class WorkerThread()
-
-@AnyThread
-actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
-    work.invoke()
-}
diff --git a/library/src/webMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.web.kt b/library/src/webMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.web.kt
deleted file mode 100644
index 33e293f31..000000000
--- a/library/src/webMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.web.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-@OptIn(ExperimentalWasmJsInterop::class)
-external class IntlDisplayNames(locale: String, options: JsAny) : JsAny {
-    fun of(code: String): String?
-}
-
-@OptIn(ExperimentalWasmJsInterop::class)
-private fun navigatorLanguage(): String =
-    js("navigator.language")
-
-actual fun getCurrentLocale(): String =
-    try { navigatorLanguage() } catch (_: Throwable) { "en" }
-
-@OptIn(ExperimentalWasmJsInterop::class)
-private fun buildOptions(): JsAny =
-    js("({ type: 'language' })")
-
-@OptIn(ExperimentalWasmJsInterop::class)
-private fun makeDisplayNames(locale: String, options: JsAny): IntlDisplayNames =
-    js("new Intl.DisplayNames([locale], options)")
-
-@OptIn(ExperimentalWasmJsInterop::class)
-actual fun localizedLanguageName(ietfTag: String, localizedTo: String): String? =
-    try {
-        val dn = makeDisplayNames(localizedTo, buildOptions())
-        val name = dn.of(ietfTag)
-        if (name.isNullOrBlank() || name.equals(ietfTag, ignoreCase = true)) null else name
-    } catch (_: Throwable) {
-        null
-    }
diff --git a/library/src/webTest/kotlin/com/lagradost/cloudstream3/utils/Ignore.web.kt b/library/src/webTest/kotlin/com/lagradost/cloudstream3/utils/Ignore.web.kt
deleted file mode 100644
index 0381a1944..000000000
--- a/library/src/webTest/kotlin/com/lagradost/cloudstream3/utils/Ignore.web.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import kotlin.test.Ignore
-
-actual typealias IgnoreOnWeb = Ignore
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dd92448b0..73bf5a195 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,4 +18,4 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "CloudStream"
-include(":app", ":shared", ":library", ":docs", ":desktopApp")
+include(":app", ":library", ":docs")
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
deleted file mode 100644
index 6bca3488e..000000000
--- a/shared/build.gradle.kts
+++ /dev/null
@@ -1,66 +0,0 @@
-plugins {
-    alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.android.lint)
-    alias(libs.plugins.android.multiplatform.library)
-    alias(libs.plugins.compose.multiplatform)
-    alias(libs.plugins.compose.compiler)
-}
-
-kotlin {
-    android {
-        // Must be unique
-        namespace = "com.lagradost.cloudstream4"
-        compileSdk = libs.versions.compileSdk.get().toInt()
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        androidResources {
-            enable = true
-        }
-    }
-
-    jvm()
-
-    compilerOptions {
-        freeCompilerArgs.add("-Xexpect-actual-classes")
-    }
-
-    sourceSets {
-        all {
-            languageSettings {
-                optIn("com.lagradost.cloudstream3.InternalAPI")
-                optIn("com.lagradost.cloudstream3.Prerelease")
-            }
-        }
-
-        commonMain.dependencies {
-            implementation(libs.coil.network.ktor3)
-            implementation(libs.bundles.compose)
-            implementation(libs.kotlinx.collections.immutable)
-            implementation(project(":library"))
-        }
-
-        androidMain.dependencies {
-            implementation(libs.activity.compose)
-            implementation(libs.preference.ktx)
-            implementation(libs.ktor.client.android)
-        }
-
-        appleMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-
-        jvmMain.dependencies {
-            implementation(libs.ktor.client.java)
-        }
-    }
-}
-
-dependencies {
-    androidRuntimeClasspath(libs.compose.ui.tooling)
-}
-
-compose.resources {
-    publicResClass = true
-    packageOfResClass = "com.lagradost.cloudstream4.generated.resources"
-    generateResClass = auto
-}
\ No newline at end of file
diff --git a/shared/readme.md b/shared/readme.md
deleted file mode 100644
index 084244cf3..000000000
--- a/shared/readme.md
+++ /dev/null
@@ -1,112 +0,0 @@
-## Motivation
-
-This readme is documentation for humans to understand ***why***, and ***not how*** the core architecture
-for CloudStream will be designed going forward. 
-
-## Design decisions
-
-The following design decisions has been tried in the sister project QuickNovel with great success, and a 
-seamless porting process. For inspiration and code in a similar codebase, take a look at QuickNovel.  
-
-### File structure
-
-The `shared` directory is supposed to be for shared compose UI between platforms, and can act as a glue for business logic. 
-This is separate from the `library` that includes the primitives for a headless, cross-platform plugin system.
-Note that we do not want a shared screen layout, because each platform has its own design language and quirks.
-Instead, the ViewModels should be entirely detached from the rendering process, and each UI component should be shared 
-between every platform. This ensures ViewModels cant cheat with dirty escape hatches, a leaky api or 
-with UI elements that hijack business logic. 
-
-**Include**:
-*Viewmodels*, *UI components* and *Theming*
-
-**Avoid**:
-*Entire Screens*, *Plugin APIs* and *Android Layout XML*
-
-Please also note that while it would be nice with an e.g. cross-platform downloader or video player.
-It is simply infeasible and undesirable to write such a system. Therefore, each platform should have
-a seperate implemenation of platform specific behavior that closly interop with native systems.
-
-### MVI
-
-MVI (Model View Intent) is the core structure for building cross-platform UI we will use.
-The reason for this decision is that current MVVM architecture created a lot of boilerplate,
-and is very unwieldy when working with compose. We will instead use a single immutable UI state, using
-kotlin immutable collections, as that creates thread-safe and performant UI. Additionally, because the viewmodel
-is shared between platforms, the Viewmodel must be provided with an implementation specific 
-database/preference/downloaded by using dependency injection and composition. 
-
-**Use**: 
-*PersistentList*, *val*, *dependency injection* and *composition*
-
-**Avoid**: 
-*List*, *var*, *globals* and *inheritance*
-
-Please note that this process aims to replace the current UI in a backwards compatible way. Only
-the navigation graph should change to point to the new fragments. Then we can roll back if some 
-critical issue is found with the compose rewrite, as well as compare functionality without a checkout. 
-
-### Resources and assets
-
-**Images**: For this project the accepted image format is `XML Drawable resources` instead of 
-`ImageVector` or `.svg`. This is primarily due to make the review, cross-platform, and edit 
-processing easier. ImageVector is undesirable because file must be reviewed to not contain malicious 
-code, and does not have a built-in preview. SVG files on the other hand are currently not natively 
-supported on Android. 
-
-**Translation**: CloudStream already has a huge translation, however to make the porting process easier,
-we should limit any copy-paste from the android project until everything is converted to compose.
-This is in part because weblate is not set up target the cross-platform compose yet. 
-
-**Styling/Themes**: In compose there is no `styles.xml`/`colors.xml`/`dimens.xml`. Therefore,
-styling is done entierly in code, but should use the exact same colors to avoid a styling mismatch 
-when porting.
-
-**UI/UX**: The intended experience when using CloudStream should be the same, but the UI should be
-refreshed to a more Material 3 style, such as rounded corners and a greater focus on light theme 
-support. However, no glassmorphic, blurred or gradient UI is accepted.  
-
-### Settings and Mihon
-
-The settings system has been entirely forked from Tachiyomi, now Mihon project. This is because
-Mihon has one of the best FOSS codebases for Android, and has a great declarative preference system 
-unmatched by any other tested Compose settings system. Unfortunately, this is not provided as a 
-library and is therefore instead forked by importing the exact files used. 
-
-### Why compose?
-
-During the lifetime of CloudStream, the app has been redesigned and rewritten several times. 
-
-**C# Downloader → Xamarin Native → Xamarin Cross platform → Android Native XML → ViewBinding → Compose Multiplatform**
-
-We have experimented with different UI technologies such as **Blazor**, **Electron**, **PWA**, 
-**WPF**, **UWP**, **Windows Forms**, and **CLI/Console** for CloudStream. 
-We have also investigated projectes written in **Flutter** and **React Native**. 
-
-However, none of these frameworks provided a good developer experience, that was also performant and
-cross-platform. Compose was the only real option, but did not exist until after we started on 
-CloudStream 3. Android Native XML was simply the least bad option when building an Android app.
-
-### CloudStream 4?
-
-The current android app is named CloudStream 3, and this Compose rewrite will be named 
-CloudStream 4. However, the android app will be upgraded, not replaced with Compose. It aims to be a 
-seamless and gradual rollout of updates for everyone using the Android app. Therefore, CloudStream 4 
-is used to refer to the new compose UI, features, and cross-platform support.
-
-## AI Usage
-
-Due to the prevalence and popularity of LLMs, CloudStream 3 has been rewritten entirely 4+ times by 
-independent actors using Compose to target desktop with different LLM models. These have not been merged, due to the 
-absolute mess of the AI generated codebase, both in code quality and performance. 
-
-Therefore, I (LagradOst) will not accept or allow any pull requests concering the Compose rewrite
-before I put the core structures are in place. The compose rewrite is supposed to be a refactor and 
-quality improvement for everyone involved, to solve the massive tech debt we already have. XML and 
-old plans forced bad design decissions, which we can improve greatly upon. However, in no part do I 
-want AI to lay the groundwork for something this important.
-
-The idea is to provide a solid staring point so it is easy for first time contributors and LLMs to
-understand and work with the code, not ship a product as fast as possible. This is not a project 
-with only one person involved. A messy AI generated codebase makes reviews and contributions very hard 
-for everyone involved. 
diff --git a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.android.kt b/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.android.kt
deleted file mode 100644
index 04ba9dd36..000000000
--- a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.android.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.lagradost.cloudstream4
-
-import android.content.Context
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import com.mihon.common.preference.AndroidPreferenceStore
-
-
-@Composable
-actual fun rememberAppSettings() : AppSettings {
-    val context = LocalContext.current
-    val value = remember(context) { AppSettings(context) }
-    return value
-}
-
-fun AppSettings(context: Context) : AppSettings {
-    return AppSettings(preferences = AndroidPreferenceStore(context))
-}
diff --git a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/compose/ComposeFragment.kt b/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/compose/ComposeFragment.kt
deleted file mode 100644
index 9a91e3e16..000000000
--- a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/compose/ComposeFragment.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.cloudstream4.theme.CloudStreamTheme
-import com.lagradost.cloudstream4.theme.perfToColor
-import com.lagradost.cloudstream4.theme.perfToMode
-import com.mihon.presentation.LocalBackPress
-import com.mihon.presentation.settings.collectAsState
-
-/** Backwards compatible fragment for compose, before we switch entirely to compose navigation */
-fun Screen.createComposeView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-): View = ComposeView(inflater.context).apply {
-    setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-
-    setContent {
-        val settings = rememberAppSettings()
-        val mode by settings.ui.theme.collectAsState()
-        val primaryColor by settings.ui.primaryColor.collectAsState()
-        val layout by settings.ui.layout.collectAsState()
-        val layoutFlag = DeviceLayout.layoutToFlag(LocalContext.current, layout)
-
-        CloudStreamTheme(
-            mode = perfToMode(mode),
-            primaryColor = perfToColor(primaryColor),
-        ) {
-            val backDispatcher = checkNotNull(LocalOnBackPressedDispatcherOwner.current) {
-                "No OnBackPressedDispatcherOwner was provided via LocalOnBackPressedDispatcherOwner"
-            }.onBackPressedDispatcher
-
-            CompositionLocalProvider(
-                LocalBackPress provides backDispatcher::onBackPressed,
-                DeviceLayout.LocalLayout provides layoutFlag
-            ) {
-                this@createComposeView.Content()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/compose/Layout.kt b/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/compose/Layout.kt
deleted file mode 100644
index 96838ae5e..000000000
--- a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/compose/Layout.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import android.app.UiModeManager
-import android.content.Context
-import android.content.res.Configuration
-import android.os.Build
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.ProvidableCompositionLocal
-import androidx.compose.runtime.staticCompositionLocalOf
-import com.lagradost.cloudstream4.compose.DeviceLayout.Companion.LocalLayout
-
-@JvmInline
-@Immutable
-value class DeviceLayout(private val value: Int) {
-    infix fun or(other: DeviceLayout) =
-        DeviceLayout(value or other.value)
-
-    internal infix fun and(other: DeviceLayout) = (value and other.value) != 0
-
-    companion object {
-        val LocalLayout: ProvidableCompositionLocal<DeviceLayout> = staticCompositionLocalOf { DeviceLayout(-1) }
-        fun isAutoTv(context: Context): Boolean {
-            val uiModeManager = context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager?
-            // AFT = Fire TV
-            val model = Build.MODEL.lowercase()
-            return uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION || Build.MODEL.contains(
-                "AFT"
-            ) || model.contains("firestick") || model.contains("fire tv") || model.contains("chromecast")
-        }
-        internal fun layoutToFlag(context : Context, from : Int): DeviceLayout {
-            return when(from) {
-                -1 -> if (isAutoTv(context)) TV else PHONE
-                0 -> PHONE
-                1 -> TV
-                2 -> EMULATOR
-                else -> PHONE
-            }
-        }
-    }
-}
-
-val PHONE = DeviceLayout(0b00001)
-val TV = DeviceLayout(0b00010)
-val EMULATOR = DeviceLayout(0b00100)
-
-@Composable
-fun isLayout(flags: DeviceLayout) : Boolean = LocalLayout.current and flags
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/theme/ColorPreference.kt b/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/theme/ColorPreference.kt
deleted file mode 100644
index 17d715372..000000000
--- a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/theme/ColorPreference.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import android.content.Context
-import android.os.Build
-import androidx.preference.PreferenceManager
-
-/** TODO: This should be replaced with a better system */
-
-fun perfToMode(perf: String?) =
-    when (perf) {
-        "System" -> CloudStreamThemeMode.FollowSystem
-        "Black" -> CloudStreamThemeMode.Dark
-        "Light" -> CloudStreamThemeMode.Light
-        "Amoled" -> CloudStreamThemeMode.Amoled
-        "AmoledLight" -> CloudStreamThemeMode.AmoledLight
-        "Dracula" -> CloudStreamThemeMode.Dracula
-        "Lavender" -> CloudStreamThemeMode.Lavender
-        "SilentBlue" -> CloudStreamThemeMode.SilentBlue
-        "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            CloudStreamThemeMode.Dynamic
-        } else {
-            CloudStreamThemeMode.Dark
-        }
-
-        else -> CloudStreamThemeMode.Dark
-    }
-
-fun perfToColor(perf : String?) = when (perf) {
-    "Normal" -> CloudStreamPrimaryColor.NORMAL
-    "Blue" -> CloudStreamPrimaryColor.BLUE
-    "Purple" -> CloudStreamPrimaryColor.PURPLE
-    "Green" -> CloudStreamPrimaryColor.GREEN
-    "GreenApple" -> CloudStreamPrimaryColor.GREEN_APPLE
-    "Red" -> CloudStreamPrimaryColor.RED
-    "Banana" -> CloudStreamPrimaryColor.BANANA
-    "Party" -> CloudStreamPrimaryColor.PARTY
-    "Pink" -> CloudStreamPrimaryColor.PINK
-    "CarnationPink" -> CloudStreamPrimaryColor.CARNATION_PINK
-    "Maroon" -> CloudStreamPrimaryColor.MAROON
-    "DarkGreen" -> CloudStreamPrimaryColor.DARK_GREEN
-    "NavyBlue" -> CloudStreamPrimaryColor.NAVY_BLUE
-    "Grey" -> CloudStreamPrimaryColor.GREY
-    "White" -> CloudStreamPrimaryColor.WHITE
-    "Brown" -> CloudStreamPrimaryColor.BROWN
-    "Orange" -> CloudStreamPrimaryColor.ORANGE
-    "DandelionYellow" -> CloudStreamPrimaryColor.DANDELION_YELLOW
-    "CoolBlue" -> CloudStreamPrimaryColor.COOL_BLUE
-    "Lavender" -> CloudStreamPrimaryColor.LAVENDER
-    "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-        CloudStreamPrimaryColor.DYNAMIC
-    } else {
-        CloudStreamPrimaryColor.NORMAL
-    }
-
-    "Monet2" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-        CloudStreamPrimaryColor.DYNAMIC_TWO
-    } else {
-        CloudStreamPrimaryColor.NORMAL
-    }
-
-    else -> CloudStreamPrimaryColor.NORMAL
-}
-
-fun Context.loadThemeMode(): CloudStreamThemeMode {
-    val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-    return perfToMode(prefs.getString("theme_key", "AmoledLight"))
-}
-
-fun Context.loadPrimaryColor(): CloudStreamPrimaryColor {
-    val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-    return perfToColor(prefs.getString("primary_color_key", "Normal"))
-}
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.android.kt b/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.android.kt
deleted file mode 100644
index 73b188c25..000000000
--- a/shared/src/androidMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.android.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
-
-internal actual object DeviceTheme {
-    @Composable
-    @ReadOnlyComposable
-    @RequiresApi(Build.VERSION_CODES.S)
-    private fun buildMonetScheme(): CloudStreamColorScheme {
-        return if (true) { // isSystemInDarkTheme() disabled until everything is Compose, as otherwise you get bugs
-            CloudStreamColorScheme(
-                background = colorResource(android.R.color.system_neutral1_900),
-                surfaceVariant = colorResource(android.R.color.system_neutral1_800),
-                surface = colorResource(android.R.color.system_neutral1_800),
-                surfaceContainer = colorResource(android.R.color.system_neutral1_800),
-                onBackground = colorResource(android.R.color.system_neutral1_100),
-                onSurfaceVariant = colorResource(android.R.color.system_neutral2_400),
-                icon = colorResource(android.R.color.system_neutral1_100),
-                primary = colorResource(android.R.color.system_accent1_200),
-                ongoing = CloudStreamPalette.Ongoing,
-                isLight = false,
-            )
-        } else {
-            CloudStreamColorScheme(
-                background = colorResource(android.R.color.system_neutral1_10),
-                surfaceVariant = colorResource(android.R.color.system_neutral1_100),
-                surface = colorResource(android.R.color.system_neutral1_100),
-                surfaceContainer = colorResource(android.R.color.system_neutral1_100),
-                onBackground = colorResource(android.R.color.system_neutral1_900),
-                onSurfaceVariant = colorResource(android.R.color.system_neutral2_600),
-                icon = colorResource(android.R.color.system_neutral1_900),
-                primary = colorResource(android.R.color.system_accent1_600),
-                ongoing = CloudStreamPalette.Ongoing,
-                isLight = true,
-            )
-        }
-    }
-
-    @Composable
-    @ReadOnlyComposable
-    actual fun resolveDynamicTheme(): CloudStreamColorScheme {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            buildMonetScheme()
-        } else {
-            darkScheme()
-        }
-    }
-
-    @Composable
-    @ReadOnlyComposable
-    actual fun resolveDynamicPrimaryColor(): Color {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            colorResource(android.R.color.system_accent1_200)
-        } else {
-            CloudStreamPrimaryColor.NORMAL.color
-        }
-    }
-
-    @Composable
-    @ReadOnlyComposable
-    actual fun resolveDynamicSecondaryColor(): Color {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            colorResource(android.R.color.system_accent2_200)
-        } else {
-            CloudStreamPrimaryColor.NORMAL.color
-        }
-    }
-}
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/mihon/common/preference/AndroidPreference.kt b/shared/src/androidMain/kotlin/com/mihon/common/preference/AndroidPreference.kt
deleted file mode 100644
index b766dd4b3..000000000
--- a/shared/src/androidMain/kotlin/com/mihon/common/preference/AndroidPreference.kt
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.mihon.common.preference
-
-import android.content.SharedPreferences
-import android.content.SharedPreferences.Editor
-import androidx.core.content.edit
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.conflate
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.stateIn
-
-sealed class AndroidPreference<T>(
-    private val preferences: SharedPreferences,
-    private val keyFlow: Flow<String?>,
-    private val key: String,
-    private val defaultValue: T,
-) : PreferenceData<T> {
-
-    abstract fun read(preferences: SharedPreferences, key: String, defaultValue: T): T
-
-    abstract fun write(key: String, value: T): Editor.() -> Unit
-
-    override fun key(): String {
-        return key
-    }
-
-    override fun get(): T {
-        return try {
-            read(preferences, key, defaultValue)
-        } catch (e: ClassCastException) {
-            //logcat { "Invalid value for $key; deleting" }
-            delete()
-            defaultValue
-        }
-    }
-
-    override fun set(value: T) {
-        preferences.edit(action = write(key, value))
-    }
-
-    override fun isSet(): Boolean {
-        return preferences.contains(key)
-    }
-
-    override fun delete() {
-        preferences.edit {
-            remove(key)
-        }
-    }
-
-    override fun defaultValue(): T {
-        return defaultValue
-    }
-
-    override fun changes(): Flow<T> {
-        return keyFlow
-            .filter { it == key || it == null }
-            .onStart { emit("ignition") }
-            .map { get() }
-            .conflate()
-    }
-
-    override fun stateIn(scope: CoroutineScope): StateFlow<T> {
-        return changes().stateIn(scope, SharingStarted.Eagerly, get())
-    }
-
-    class StringPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: String,
-    ) : AndroidPreference<String>(preferences, keyFlow, key, defaultValue) {
-        override fun read(
-            preferences: SharedPreferences,
-            key: String,
-            defaultValue: String,
-        ): String {
-            return preferences.getString(key, defaultValue) ?: defaultValue
-        }
-
-        override fun write(key: String, value: String): Editor.() -> Unit = {
-            putString(key, value)
-        }
-    }
-
-    class LongPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: Long,
-    ) : AndroidPreference<Long>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Long): Long {
-            return preferences.getLong(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Long): Editor.() -> Unit = {
-            putLong(key, value)
-        }
-    }
-
-    class IntPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: Int,
-    ) : AndroidPreference<Int>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Int): Int {
-            return preferences.getInt(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Int): Editor.() -> Unit = {
-            putInt(key, value)
-        }
-    }
-
-    class FloatPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: Float,
-    ) : AndroidPreference<Float>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Float): Float {
-            return preferences.getFloat(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Float): Editor.() -> Unit = {
-            putFloat(key, value)
-        }
-    }
-
-    class BooleanPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: Boolean,
-    ) : AndroidPreference<Boolean>(preferences, keyFlow, key, defaultValue) {
-        override fun read(
-            preferences: SharedPreferences,
-            key: String,
-            defaultValue: Boolean,
-        ): Boolean {
-            return preferences.getBoolean(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Boolean): Editor.() -> Unit = {
-            putBoolean(key, value)
-        }
-    }
-
-    class StringSetPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: Set<String>,
-    ) : AndroidPreference<Set<String>>(preferences, keyFlow, key, defaultValue) {
-        override fun read(
-            preferences: SharedPreferences,
-            key: String,
-            defaultValue: Set<String>,
-        ): Set<String> {
-            return preferences.getStringSet(key, defaultValue) ?: defaultValue
-        }
-
-        override fun write(key: String, value: Set<String>): Editor.() -> Unit = {
-            putStringSet(key, value)
-        }
-    }
-
-    class ObjectAsString<T>(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: T,
-        private val serializer: (T) -> String,
-        private val deserializer: (String) -> T,
-    ) : AndroidPreference<T>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: T): T {
-            return try {
-                preferences.getString(key, null)?.let(deserializer) ?: defaultValue
-            } catch (e: Exception) {
-                defaultValue
-            }
-        }
-
-        override fun write(key: String, value: T): Editor.() -> Unit = {
-            putString(key, serializer(value))
-        }
-    }
-
-    class ObjectAsInt<T>(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: T,
-        private val serializer: (T) -> Int,
-        private val deserializer: (Int) -> T,
-    ) : AndroidPreference<T>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: T): T {
-            return try {
-                if (preferences.contains(key)) preferences.getInt(key, 0).let(deserializer) else defaultValue
-            } catch (e: Exception) {
-                defaultValue
-            }
-        }
-
-        override fun write(key: String, value: T): Editor.() -> Unit = {
-            putInt(key, serializer(value))
-        }
-    }
-
-    class ObjectSetAsStringSet<T>(
-        preferences: SharedPreferences,
-        keyFlow: Flow<String?>,
-        key: String,
-        defaultValue: Set<T>,
-        private val serializer: (T) -> String,
-        private val deserializer: (String) -> T?,
-    ) : AndroidPreference<Set<T>>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Set<T>): Set<T> {
-            return try {
-                preferences.getStringSet(key, null)?.mapNotNull(deserializer)?.toSet() ?: defaultValue
-            } catch (_: Exception) {
-                defaultValue
-            }
-        }
-
-        override fun write(key: String, value: Set<T>): Editor.() -> Unit = {
-            putStringSet(key, value.map(serializer).toSet())
-        }
-    }
-}
diff --git a/shared/src/androidMain/kotlin/com/mihon/common/preference/AndroidPreferenceStore.kt b/shared/src/androidMain/kotlin/com/mihon/common/preference/AndroidPreferenceStore.kt
deleted file mode 100644
index 192bc77ed..000000000
--- a/shared/src/androidMain/kotlin/com/mihon/common/preference/AndroidPreferenceStore.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.mihon.common.preference
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-
-class AndroidPreferenceStore(private val sharedPreferences: SharedPreferences) : PreferenceStore {
-    constructor(context: Context) : this(PreferenceManager.getDefaultSharedPreferences(context))
-
-    private val keyFlow = sharedPreferences.keyFlow
-
-    override fun getString(key: String, defaultValue: String): PreferenceData<String> {
-        return AndroidPreference.StringPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getLong(key: String, defaultValue: Long): PreferenceData<Long> {
-        return AndroidPreference.LongPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getInt(key: String, defaultValue: Int): PreferenceData<Int> {
-        return AndroidPreference.IntPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getFloat(key: String, defaultValue: Float): PreferenceData<Float> {
-        return AndroidPreference.FloatPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getBoolean(key: String, defaultValue: Boolean): PreferenceData<Boolean> {
-        return AndroidPreference.BooleanPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getStringSet(key: String, defaultValue: Set<String>): PreferenceData<Set<String>> {
-        return AndroidPreference.StringSetPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun <T> getObjectFromString(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> String,
-        deserializer: (String) -> T,
-    ): PreferenceData<T> {
-        return AndroidPreference.ObjectAsString(
-            preferences = sharedPreferences,
-            keyFlow = keyFlow,
-            key = key,
-            defaultValue = defaultValue,
-            serializer = serializer,
-            deserializer = deserializer,
-        )
-    }
-
-    override fun <T> getObjectFromInt(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> Int,
-        deserializer: (Int) -> T,
-    ): PreferenceData<T> {
-        return AndroidPreference.ObjectAsInt(
-            preferences = sharedPreferences,
-            keyFlow = keyFlow,
-            key = key,
-            defaultValue = defaultValue,
-            serializer = serializer,
-            deserializer = deserializer,
-        )
-    }
-
-    override fun <T> getObjectSetFromStringSet(
-        key: String,
-        defaultValue: Set<T>,
-        serializer: (T) -> String,
-        deserializer: (String) -> T?,
-    ): PreferenceData<Set<T>> {
-        return AndroidPreference.ObjectSetAsStringSet(
-            preferences = sharedPreferences,
-            keyFlow = keyFlow,
-            key = key,
-            defaultValue = defaultValue,
-            serializer = serializer,
-            deserializer = deserializer,
-        )
-    }
-
-    override fun getAll(): Map<String, *> {
-        return sharedPreferences.all ?: emptyMap<String, Any>()
-    }
-}
-
-private val SharedPreferences.keyFlow
-    get() = callbackFlow {
-        val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key: String? ->
-            trySend(
-                key,
-            )
-        }
-        registerOnSharedPreferenceChangeListener(listener)
-        awaitClose {
-            unregisterOnSharedPreferenceChangeListener(listener)
-        }
-    }
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/mihon/common/preference/DataPreference.kt b/shared/src/androidMain/kotlin/com/mihon/common/preference/DataPreference.kt
deleted file mode 100644
index dcf4eedfa..000000000
--- a/shared/src/androidMain/kotlin/com/mihon/common/preference/DataPreference.kt
+++ /dev/null
@@ -1,238 +0,0 @@
-package com.mihon.common.preference
-
-import android.content.SharedPreferences
-import android.content.SharedPreferences.Editor
-import androidx.core.content.edit
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.conflate
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.stateIn
-
-
-sealed class DataPreference<T>(
-    private val preferences: SharedPreferences,
-    private val keyFlow: MutableSharedFlow<String?>,
-    private val key: String,
-    private val defaultValue: T,
-) : PreferenceData<T> {
-
-    abstract fun read(preferences: SharedPreferences, key: String, defaultValue: T): T
-
-    abstract fun write(key: String, value: T): Editor.() -> Unit
-
-    override fun key(): String {
-        return key
-    }
-
-    override fun get(): T {
-        return try {
-            read(preferences, key, defaultValue)
-        } catch (e: ClassCastException) {
-            //logcat { "Invalid value for $key; deleting" }
-            delete()
-            defaultValue
-        }
-    }
-
-    override fun set(value: T) {
-        preferences.edit(action = write(key, value))
-        keyFlow.tryEmit(key)
-    }
-
-    override fun isSet(): Boolean {
-        return preferences.contains(key)
-    }
-
-    override fun delete() {
-        preferences.edit {
-            remove(key)
-        }
-    }
-
-    override fun defaultValue(): T {
-        return defaultValue
-    }
-
-    override fun changes(): Flow<T> {
-        return keyFlow
-            .filter { it == key || it == null }
-            .onStart { emit("ignition") }
-            .map { get() }
-            .conflate()
-    }
-
-    override fun stateIn(scope: CoroutineScope): StateFlow<T> {
-        return changes().stateIn(scope, SharingStarted.Eagerly, get())
-    }
-
-    class StringPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: String,
-    ) : DataPreference<String>(preferences, keyFlow, key, defaultValue) {
-        override fun read(
-            preferences: SharedPreferences,
-            key: String,
-            defaultValue: String,
-        ): String {
-            return preferences.getString(key, defaultValue) ?: defaultValue
-        }
-
-        override fun write(key: String, value: String): Editor.() -> Unit = {
-            putString(key, value)
-        }
-    }
-
-    class LongPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: Long,
-    ) : DataPreference<Long>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Long): Long {
-            return preferences.getLong(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Long): Editor.() -> Unit = {
-            putLong(key, value)
-        }
-    }
-
-    class IntPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: Int,
-    ) : DataPreference<Int>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Int): Int {
-            return preferences.getInt(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Int): Editor.() -> Unit = {
-            putInt(key, value)
-        }
-    }
-
-    class FloatPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: Float,
-    ) : DataPreference<Float>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Float): Float {
-            return preferences.getFloat(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Float): Editor.() -> Unit = {
-            putFloat(key, value)
-        }
-    }
-
-    class BooleanPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: Boolean,
-    ) : DataPreference<Boolean>(preferences, keyFlow, key, defaultValue) {
-        override fun read(
-            preferences: SharedPreferences,
-            key: String,
-            defaultValue: Boolean,
-        ): Boolean {
-            return preferences.getBoolean(key, defaultValue)
-        }
-
-        override fun write(key: String, value: Boolean): Editor.() -> Unit = {
-            putBoolean(key, value)
-        }
-    }
-
-    class StringSetPrimitive(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: Set<String>,
-    ) : DataPreference<Set<String>>(preferences, keyFlow, key, defaultValue) {
-        override fun read(
-            preferences: SharedPreferences,
-            key: String,
-            defaultValue: Set<String>,
-        ): Set<String> {
-            return preferences.getStringSet(key, defaultValue) ?: defaultValue
-        }
-
-        override fun write(key: String, value: Set<String>): Editor.() -> Unit = {
-            putStringSet(key, value)
-        }
-    }
-
-    class ObjectAsString<T>(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: T,
-        private val serializer: (T) -> String,
-        private val deserializer: (String) -> T,
-    ) : DataPreference<T>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: T): T {
-            return try {
-                preferences.getString(key, null)?.let(deserializer) ?: defaultValue
-            } catch (e: Exception) {
-                defaultValue
-            }
-        }
-
-        override fun write(key: String, value: T): Editor.() -> Unit = {
-            putString(key, serializer(value))
-        }
-    }
-
-    class ObjectAsInt<T>(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: T,
-        private val serializer: (T) -> Int,
-        private val deserializer: (Int) -> T,
-    ) : DataPreference<T>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: T): T {
-            return try {
-                if (preferences.contains(key)) preferences.getInt(key, 0).let(deserializer) else defaultValue
-            } catch (e: Exception) {
-                defaultValue
-            }
-        }
-
-        override fun write(key: String, value: T): Editor.() -> Unit = {
-            putInt(key, serializer(value))
-        }
-    }
-
-    class ObjectSetAsStringSet<T>(
-        preferences: SharedPreferences,
-        keyFlow: MutableSharedFlow<String?>,
-        key: String,
-        defaultValue: Set<T>,
-        private val serializer: (T) -> String,
-        private val deserializer: (String) -> T?,
-    ) : DataPreference<Set<T>>(preferences, keyFlow, key, defaultValue) {
-        override fun read(preferences: SharedPreferences, key: String, defaultValue: Set<T>): Set<T> {
-            return try {
-                preferences.getStringSet(key, null)?.mapNotNull(deserializer)?.toSet() ?: defaultValue
-            } catch (_: Exception) {
-                defaultValue
-            }
-        }
-
-        override fun write(key: String, value: Set<T>): Editor.() -> Unit = {
-            putStringSet(key, value.map(serializer).toSet())
-        }
-    }
-}
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/mihon/common/preference/DataPreferenceStore.kt b/shared/src/androidMain/kotlin/com/mihon/common/preference/DataPreferenceStore.kt
deleted file mode 100644
index 4f197768d..000000000
--- a/shared/src/androidMain/kotlin/com/mihon/common/preference/DataPreferenceStore.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.mihon.common.preference
-
-import android.content.Context
-import android.content.SharedPreferences
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJsonLiteral
-import kotlinx.coroutines.flow.MutableSharedFlow
-
-/**
- * Same as AndroidPreferenceStore for DataStore but with some optimization to only see changes when values are
- * changed by this store. This is done to avoid having a global key listener where we might pollute
- * the setKey from other places.
- * */
-class DataPreferenceStore(private val sharedPreferences: SharedPreferences) : PreferenceStore {
-    constructor(context: Context) : this(
-        context.getSharedPreferences(
-            "rebuild_preference",
-            Context.MODE_PRIVATE
-        )
-    )
-
-    companion object {
-        private val keyFlow: MutableSharedFlow<String?> =
-            MutableSharedFlow(extraBufferCapacity = 16)
-    }
-
-    override fun getString(key: String, defaultValue: String): PreferenceData<String> {
-        return DataPreference.StringPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getLong(key: String, defaultValue: Long): PreferenceData<Long> {
-        return DataPreference.LongPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getInt(key: String, defaultValue: Int): PreferenceData<Int> {
-        return DataPreference.IntPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getFloat(key: String, defaultValue: Float): PreferenceData<Float> {
-        return DataPreference.FloatPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getBoolean(key: String, defaultValue: Boolean): PreferenceData<Boolean> {
-        return DataPreference.BooleanPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    override fun getStringSet(key: String, defaultValue: Set<String>): PreferenceData<Set<String>> {
-        return DataPreference.StringSetPrimitive(sharedPreferences, keyFlow, key, defaultValue)
-    }
-
-    inline fun <reified T : Any> getJson(key: String, defaultValue: T): PreferenceData<T> =
-        getObjectFromString(key, defaultValue, serializer = { obj ->
-            obj.toJsonLiteral()
-        }, deserializer = { json ->
-            parseJson<T>(json)
-        })
-
-    override fun <T> getObjectFromString(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> String,
-        deserializer: (String) -> T,
-    ): PreferenceData<T> {
-        return DataPreference.ObjectAsString(
-            preferences = sharedPreferences,
-            keyFlow = keyFlow,
-            key = key,
-            defaultValue = defaultValue,
-            serializer = serializer,
-            deserializer = deserializer,
-        )
-    }
-
-    override fun <T> getObjectFromInt(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> Int,
-        deserializer: (Int) -> T,
-    ): PreferenceData<T> {
-        return DataPreference.ObjectAsInt(
-            preferences = sharedPreferences,
-            keyFlow = keyFlow,
-            key = key,
-            defaultValue = defaultValue,
-            serializer = serializer,
-            deserializer = deserializer,
-        )
-    }
-
-    override fun <T> getObjectSetFromStringSet(
-        key: String,
-        defaultValue: Set<T>,
-        serializer: (T) -> String,
-        deserializer: (String) -> T?,
-    ): PreferenceData<Set<T>> {
-        return DataPreference.ObjectSetAsStringSet(
-            preferences = sharedPreferences,
-            keyFlow = keyFlow,
-            key = key,
-            defaultValue = defaultValue,
-            serializer = serializer,
-            deserializer = deserializer,
-        )
-    }
-
-    override fun getAll(): Map<String, *> {
-        return sharedPreferences.all ?: emptyMap<String, Any>()
-    }
-}
diff --git a/shared/src/androidMain/kotlin/com/mihon/common/preference/StatePreferenceStore.kt b/shared/src/androidMain/kotlin/com/mihon/common/preference/StatePreferenceStore.kt
deleted file mode 100644
index f6346427a..000000000
--- a/shared/src/androidMain/kotlin/com/mihon/common/preference/StatePreferenceStore.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mihon.common.preference
-
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.snapshotFlow
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlin.reflect.KProperty1
-
-/** Adds a store to modify a specific state field by field */
-data class StatePreferenceData<T, V>(
-    val state: MutableState<T>,
-    val get: (T) -> V,
-    val set: T.(V) -> T,
-) : PreferenceData<V> {
-    override fun key(): String = ""
-
-    override fun get(): V {
-        return get(state.value)
-    }
-
-    override fun set(value: V) {
-        state.value = set(state.value, value)
-    }
-
-    override fun isSet(): Boolean {
-        throw NotImplementedError()
-    }
-
-    override fun delete() {
-        throw NotImplementedError()
-    }
-
-    override fun defaultValue(): V {
-        throw NotImplementedError()
-    }
-
-    override fun changes(): Flow<V> =
-        snapshotFlow { state.value }.map { s -> get(s) }.distinctUntilChanged()
-
-    override fun stateIn(scope: CoroutineScope): StateFlow<V> {
-        return changes().stateIn(scope, SharingStarted.Eagerly, get())
-    }
-}
-
-data class StatePreferenceStore<T>(val state: MutableState<T>) {
-    fun <V> field(
-        property: KProperty1<T, V>,
-        update: T.(V) -> T,
-    ): PreferenceData<V> {
-        return StatePreferenceData(state, property::get, update)
-    }
-
-    fun <V> field(
-        get: T.() -> V,
-        set: T.(V) -> T,
-    ): PreferenceData<V> {
-        return StatePreferenceData(state, get, set)
-    }
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/composeResources/drawable/arrow_back.xml b/shared/src/commonMain/composeResources/drawable/arrow_back.xml
deleted file mode 100644
index 196b4c087..000000000
--- a/shared/src/commonMain/composeResources/drawable/arrow_back.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M313,520L509,716Q521,728 520.5,744Q520,760 508,772Q496,783 480,783.5Q464,784 452,772L188,508Q182,502 179.5,495Q177,488 177,480Q177,472 179.5,465Q182,458 188,452L452,188Q463,177 479.5,177Q496,177 508,188Q520,200 520,216.5Q520,233 508,245L313,440L760,440Q777,440 788.5,451.5Q800,463 800,480Q800,497 788.5,508.5Q777,520 760,520L313,520Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/arrow_downward.xml b/shared/src/commonMain/composeResources/drawable/arrow_downward.xml
deleted file mode 100644
index 061a6db1b..000000000
--- a/shared/src/commonMain/composeResources/drawable/arrow_downward.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M440,647L440,200Q440,183 451.5,171.5Q463,160 480,160Q497,160 508.5,171.5Q520,183 520,200L520,647L716,451Q728,439 744,439.5Q760,440 772,452Q783,464 783.5,480Q784,496 772,508L508,772Q502,778 495,780.5Q488,783 480,783Q472,783 465,780.5Q458,778 452,772L188,508Q177,497 177,480.5Q177,464 188,452Q200,440 216.5,440Q233,440 245,452L440,647Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/arrow_upward.xml b/shared/src/commonMain/composeResources/drawable/arrow_upward.xml
deleted file mode 100644
index fbf89a796..000000000
--- a/shared/src/commonMain/composeResources/drawable/arrow_upward.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M440,313L244,509Q232,521 216,520.5Q200,520 188,508Q177,496 176.5,480Q176,464 188,452L452,188Q458,182 465,179.5Q472,177 480,177Q488,177 495,179.5Q502,182 508,188L772,452Q783,463 783,479.5Q783,496 772,508Q760,520 743.5,520Q727,520 715,508L520,313L520,760Q520,777 508.5,788.5Q497,800 480,800Q463,800 451.5,788.5Q440,777 440,760L440,313Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/cancel.xml b/shared/src/commonMain/composeResources/drawable/cancel.xml
deleted file mode 100644
index 570986990..000000000
--- a/shared/src/commonMain/composeResources/drawable/cancel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M480,536L596,652Q607,663 624,663Q641,663 652,652Q663,641 663,624Q663,607 652,596L536,480L652,364Q663,353 663,336Q663,319 652,308Q641,297 624,297Q607,297 596,308L480,424L364,308Q353,297 336,297Q319,297 308,308Q297,319 297,336Q297,353 308,364L424,480L308,596Q297,607 297,624Q297,641 308,652Q319,663 336,663Q353,663 364,652L480,536ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/check.xml b/shared/src/commonMain/composeResources/drawable/check.xml
deleted file mode 100644
index 6976b0df2..000000000
--- a/shared/src/commonMain/composeResources/drawable/check.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/close.xml b/shared/src/commonMain/composeResources/drawable/close.xml
deleted file mode 100644
index 14beedf9b..000000000
--- a/shared/src/commonMain/composeResources/drawable/close.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M480,536L284,732Q273,743 256,743Q239,743 228,732Q217,721 217,704Q217,687 228,676L424,480L228,284Q217,273 217,256Q217,239 228,228Q239,217 256,217Q273,217 284,228L480,424L676,228Q687,217 704,217Q721,217 732,228Q743,239 743,256Q743,273 732,284L536,480L732,676Q743,687 743,704Q743,721 732,732Q721,743 704,743Q687,743 676,732L480,536Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/default_icon.png b/shared/src/commonMain/composeResources/drawable/default_icon.png
deleted file mode 100644
index 394459001..000000000
Binary files a/shared/src/commonMain/composeResources/drawable/default_icon.png and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/drawable/error.xml b/shared/src/commonMain/composeResources/drawable/error.xml
deleted file mode 100644
index b77c10cfa..000000000
--- a/shared/src/commonMain/composeResources/drawable/error.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5ZM508.5,508.5Q520,497 520,480L520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320L440,480Q440,497 451.5,508.5Q463,520 480,520Q497,520 508.5,508.5ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/info.xml b/shared/src/commonMain/composeResources/drawable/info.xml
deleted file mode 100644
index 32d30b88a..000000000
--- a/shared/src/commonMain/composeResources/drawable/info.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5ZM508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360Q497,360 508.5,348.5ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/drawable/preview.xml b/shared/src/commonMain/composeResources/drawable/preview.xml
deleted file mode 100644
index d56fbde6e..000000000
--- a/shared/src/commonMain/composeResources/drawable/preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#fff"
-      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,280L200,280L200,760Q200,760 200,760Q200,760 200,760ZM333.5,635.5Q269,591 240,520Q269,449 333.5,404.5Q398,360 480,360Q562,360 626.5,404.5Q691,449 720,520Q691,591 626.5,635.5Q562,680 480,680Q398,680 333.5,635.5ZM582,593.5Q628,567 654,520Q628,473 582,446.5Q536,420 480,420Q424,420 378,446.5Q332,473 306,520Q332,567 378,593.5Q424,620 480,620Q536,620 582,593.5ZM480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520ZM522.5,562.5Q540,545 540,520Q540,495 522.5,477.5Q505,460 480,460Q455,460 437.5,477.5Q420,495 420,520Q420,545 437.5,562.5Q455,580 480,580Q505,580 522.5,562.5Z"/>
-</vector>
diff --git a/shared/src/commonMain/composeResources/font/productsans_black.ttf b/shared/src/commonMain/composeResources/font/productsans_black.ttf
deleted file mode 100644
index 5864e2690..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_black.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_blackitalic.ttf b/shared/src/commonMain/composeResources/font/productsans_blackitalic.ttf
deleted file mode 100644
index 869037b78..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_blackitalic.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_bold.ttf b/shared/src/commonMain/composeResources/font/productsans_bold.ttf
deleted file mode 100644
index 96619df92..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_bold.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_bolditalic.ttf b/shared/src/commonMain/composeResources/font/productsans_bolditalic.ttf
deleted file mode 100644
index bdd22b046..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_bolditalic.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_italic.ttf b/shared/src/commonMain/composeResources/font/productsans_italic.ttf
deleted file mode 100644
index 5b44037be..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_italic.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_light.ttf b/shared/src/commonMain/composeResources/font/productsans_light.ttf
deleted file mode 100644
index 33de1c39f..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_light.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_lightitalic.ttf b/shared/src/commonMain/composeResources/font/productsans_lightitalic.ttf
deleted file mode 100644
index 00c76b8ec..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_lightitalic.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_medium.ttf b/shared/src/commonMain/composeResources/font/productsans_medium.ttf
deleted file mode 100644
index fd818d6f5..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_medium.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_mediumitalic.ttf b/shared/src/commonMain/composeResources/font/productsans_mediumitalic.ttf
deleted file mode 100644
index ec70cd384..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_mediumitalic.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_regular.ttf b/shared/src/commonMain/composeResources/font/productsans_regular.ttf
deleted file mode 100644
index e2c69c3fb..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_regular.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_thin.ttf b/shared/src/commonMain/composeResources/font/productsans_thin.ttf
deleted file mode 100644
index 5e046b532..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_thin.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/font/productsans_thinitalic.ttf b/shared/src/commonMain/composeResources/font/productsans_thinitalic.ttf
deleted file mode 100644
index 7b0495518..000000000
Binary files a/shared/src/commonMain/composeResources/font/productsans_thinitalic.ttf and /dev/null differ
diff --git a/shared/src/commonMain/composeResources/values/strings.xml b/shared/src/commonMain/composeResources/values/strings.xml
deleted file mode 100644
index e5eca5dd2..000000000
--- a/shared/src/commonMain/composeResources/values/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-    <string name="app_name">CloudStream</string>
-    <string name="none">None</string>
-    <string name="no_results_found">No results found</string>
-    <string name="ok">Ok</string>
-    <string name="cancel">Cancel</string>
-    <string name="transparency">Transparency</string>
-    <string name="luminance">Luminance</string>
-    <string name="color">Color</string>
-    <string name="color_wheel">Color Wheel</string>
-    <string name="action_bar_up_description">Navigate up</string>
-    <string name="lorem_title">Lorem ipsum</string>
-    <string name="lorem_content">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
-</resources>
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.kt
deleted file mode 100644
index 168b82590..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.kt
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.lagradost.cloudstream4
-
-import androidx.compose.runtime.Composable
-import com.lagradost.cloudstream3.AllLanguagesName
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.SearchQuality
-import com.lagradost.cloudstream3.TvType
-import com.mihon.common.preference.PreferenceStore
-import com.mihon.common.preference.getEnumSet
-
-@Composable
-expect fun rememberAppSettings(): AppSettings
-
-/**
- * App settings for every setting we have, that way we can just inject AppSettings into a viewmodel,
- * or similar.
- *
- * We use an internal constructor to force the user to construct it using the plantform specific
- * initalizer
- * */
-class AppSettings internal constructor(
-    preferences: PreferenceStore,
-    // Todo add database key-value interface here, possibly using the same PreferenceStore interface
-) {
-    val general = GeneralPreferences(preferences)
-    val player = PlayerPreferences(preferences)
-    val provider = ProviderPreferences(preferences)
-    val ui = UIPreferences(preferences)
-    val security = SecurityPreferences(preferences)
-    val updates = UpdatePreferences(preferences)
-    val backup = BackupPreferences(preferences)
-    val plugins = PluginPreferences(preferences)
-}
-
-class PluginPreferences(preferences: PreferenceStore) {
-    val autoUpdate = preferences.getBoolean("auto_update_plugins", true)
-    val autoDownload = preferences.getInt("auto_download_plugins_key2", 0)
-}
-
-class BackupPreferences(preferences: PreferenceStore) {
-    val frequency = preferences.getInt("automatic_backup_key", 0)
-    val path = preferences.getString("backup_path_key")
-    val visualPath = preferences.getString("backup_dir_key")
-}
-class UpdatePreferences(preferences: PreferenceStore) {
-    val apkInstaller = preferences.getInt("apk_installer_key",1)
-    val showAppUpdates = preferences.getBoolean("auto_update", true)
-    // Node id for this update
-    val skipUpdate = preferences.getString("skip_update_key", "")
-}
-
-class SecurityPreferences(preferences: PreferenceStore) {
-    val biometrics = preferences.getBoolean(
-        "biometric_key", false
-    )
-    val skipAccountSelection = preferences.getBoolean(
-        "skip_startup_account_select_key", false
-    )
-}
-
-class UIPreferences(preferences: PreferenceStore) {
-    val primaryColor = preferences.getString(
-        "primary_color_key", "Normal"
-    )
-    val theme = preferences.getString(
-        "app_theme_key", "AmoledLight"
-    )
-    val layout = preferences.getInt(
-        "app_layout_key", -1
-    )
-    val bottomTitle = preferences.getBoolean(
-        "bottom_title_key", true
-    )
-    val advancedSearch = preferences.getBoolean(
-        "advanced_search", true
-    )
-    val searchSuggestions = preferences.getBoolean(
-        "search_suggestions_enabled", true
-    )
-    val kitsuPostersEnabled = preferences.getBoolean(
-        "show_kitsu_posters_key", true
-    )
-    val trailersEnabled = preferences.getBoolean(
-        "show_trailers_key", true
-    )
-    val castEnabled = preferences.getBoolean(
-        "show_cast_in_details_key", true
-    )
-    val fillersEnabled = preferences.getBoolean(
-        "show_fillers_key", false
-    )
-    val showMetadataOverlay = preferences.getBoolean(
-        "show_player_metadata_key", true
-    )
-    val overscanDp = preferences.getInt(
-        "overscan_key", 0
-    )
-    val posterSize = preferences.getInt(
-        "poster_size_key", 0
-    )
-    val posterShowHd = preferences.getBoolean(
-        "show_hd_key", true
-    )
-    val posterShowDub = preferences.getBoolean(
-        "show_dub_key", true
-    )
-    val posterShowSub = preferences.getBoolean(
-        "show_sub_key", true
-    )
-    val posterShowRating = preferences.getBoolean(
-        "show_rating_key", true
-    )
-    val posterShowTitle = preferences.getBoolean(
-        "show_title_key", true
-    )
-    val posterShowEpisode = preferences.getBoolean(
-        "show_episode_text_key", true
-    )
-    val showClock = preferences.getBoolean(
-        "tv_layout_clock_key", false
-    )
-
-    val randomButtonEnabled = preferences.getBoolean(
-        "random_button_key", false
-    )
-
-    val confirmExit = preferences.getInt(
-        "confirm_exit_key", -1
-    )
-
-    /** This had to be refactored to use enumSet because the old system is prone to bugs */
-    val filterQuality = preferences.getEnumSet<SearchQuality>(
-        "pref_filter_search_quality_key2", emptySet()
-    )
-}
-
-class ProviderPreferences(preferences: PreferenceStore) {
-    companion object {
-        private val defaultPreferredMedia =
-            TvType.entries.filter { it != TvType.NSFW }.map { it.ordinal.toString() }.toSet()
-        private val defaultDub = DubStatus.entries.map { it.name }.toSet()
-    }
-
-    val preferredMedia = preferences.getStringSet(
-        "prefer_media_type_key_2", defaultPreferredMedia
-    )
-
-    val extensionLanguages = preferences.getStringSet(
-        "provider_lang_key", setOf(AllLanguagesName)
-    )
-
-    val displayDubSub = preferences.getStringSet(
-        "display_sub_key", defaultDub
-    )
-}
-
-class PlayerPreferences(preferences: PreferenceStore) {
-    val episodeSync = preferences.getBoolean("episode_sync_enabled_key", true)
-    val defaultPlayer = preferences.getString("player_default_key", "")
-    val limitPlayerTitle = preferences.getInt("prefer_limit_title_key", 0)
-    val hidePlayerControlNames = preferences.getBoolean("hide_player_control_names_key", false)
-    val showName = preferences.getBoolean("show_name", true)
-    val showResolution = preferences.getBoolean("show_resolution", true)
-    val showMediaInfo = preferences.getBoolean("show_media_info", false)
-    val pipEnabled = preferences.getBoolean("pip_enabled_key", true)
-    val resizeEnabled = preferences.getBoolean("player_resize_enabled_key", true)
-    val speedEnabled = preferences.getBoolean("playback_speed_enabled_key", false)
-    val tiktokEnabled = preferences.getBoolean("speedup_key", false)
-    val autoPlayEnabled = preferences.getBoolean("autoplay_next_key", true)
-    val startPaused = preferences.getBoolean("start_paused_key", false)
-    val skipOpEnabled = preferences.getBoolean("enable_skip_op_from_database", true)
-    val autoRotateEnabled = preferences.getBoolean("auto_rotate_video_key", true)
-    val rotateButtonEnabled = preferences.getBoolean("rotate_video_key", false)
-    val previewBarEnabled = preferences.getBoolean("preview_seekbar_key", true)
-    val softwareDecoding = preferences.getInt("software_decoding_key2", -1)
-    val extraBrightnessEnabled = preferences.getBoolean("extra_brightness_key", false)
-    val swipeHorizontalEnabled = preferences.getBoolean("swipe_enabled_key", true)
-    val swipeVerticalEnabled = preferences.getBoolean("swipe_vertical_enabled_key", true)
-    val doubleTapToSeekEnabled = preferences.getBoolean("double_tap_enabled_key", false)
-    val doubleTapToPauseEnabled = preferences.getBoolean("double_tap_pause_enabled_key", false)
-    val doubleTapTime = preferences.getInt("double_tap_seek_time_key2", 10)
-    val bufferDiskMB = preferences.getInt("video_buffer_disk_key", 0)
-    val bufferRamMB = preferences.getInt("video_buffer_size_key", 0)
-    val bufferTimeSec = preferences.getInt("video_buffer_length_key", 0)
-    val tvSeekOnTime = preferences.getInt("android_tv_interface_on_seek_key", 10)
-    val tvSeekOffTime = preferences.getInt("android_tv_interface_off_seek_key", 10)
-}
-
-class GeneralPreferences(preferences: PreferenceStore) {
-    val locale = preferences.getString("app_locale", "")
-    val bananas = preferences.getInt("benene_count", 0)
-    val parallelDownloads = preferences.getInt("download_parallel_key", 3)
-    val concurrentConnections = preferences.getInt("download_concurrent_key", 3)
-    val batterOptimization = preferences.getBoolean("battery_optimisation_key", false)
-
-    /** Please note that it used R.array.dns_pref before, this was a bug and caused this setting to be language sensitive **/
-    val dns = preferences.getInt("dns_key", 0)
-
-    /** Very weird setKey based usage, just having this setting might not do it */
-    val jsdelivrProxy = preferences.getBoolean("jsdelivr_proxy_key", false)
-
-    /** This should honesty be refactored to a single setting */
-    val downloadPath = preferences.getString("download_path_key", "")
-    val downloadPathVisual = preferences.getString("download_path_key_visual", "")
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/ColorDialog.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/ColorDialog.kt
deleted file mode 100644
index c1abc206d..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/ColorDialog.kt
+++ /dev/null
@@ -1,375 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.DialogProperties
-import com.lagradost.cloudstream4.compose.colorpicker.DoubleColorPicker
-import com.lagradost.cloudstream4.compose.colorpicker.HsvColor
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.cancel
-import com.lagradost.cloudstream4.generated.resources.color
-import com.lagradost.cloudstream4.generated.resources.color_wheel
-import com.lagradost.cloudstream4.generated.resources.luminance
-import com.lagradost.cloudstream4.generated.resources.ok
-import com.lagradost.cloudstream4.generated.resources.transparency
-import com.mihon.material.Slider
-import com.mihon.material.padding
-import org.jetbrains.compose.resources.stringResource
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-
-
-internal val colors = arrayOf(
-    Color(0xFFF44336), // RED 500
-    Color(0xFFE91E63), // PINK 500
-    Color(0xFFFF2C93), // LIGHT PINK 500
-    Color(0xFF9C27B0), // PURPLE 500
-    Color(0xFF673AB7), // DEEP PURPLE 500
-    Color(0xFF3F51B5), // INDIGO 500
-    Color(0xFF2196F3), // BLUE 500
-    Color(0xFF03A9F4), // LIGHT BLUE 500
-    Color(0xFF00BCD4), // CYAN 500
-    Color(0xFF009688), // TEAL 500
-    Color(0xFF4CAF50), // GREEN 500
-    Color(0xFF8BC34A), // LIGHT GREEN 500
-    Color(0xFFCDDC39), // LIME 500
-    Color(0xFFFFEB3B), // YELLOW 500
-    Color(0xFFFFC107), // AMBER 500
-    Color(0xFFFF9800), // ORANGE 500
-    Color(0xFF795548), // BROWN 500
-    Color(0xFF607D8B), // BLUE GREY 500
-    Color(0xFF9E9E9E), // GREY 500
-)
-internal val colors2 = arrayOf(
-    Color(0xFF795548), // BROWN 500
-    Color(0xFF607D8B), // BLUE GREY 500
-    Color(0xFF9E9E9E), // GREY 500
-)
-
-@Composable
-fun ColorDialog(
-    title: String,
-    color: Color,
-    dismiss: () -> Unit,
-    confirm: (Color) -> Unit,
-) {
-    var alpha by remember { mutableFloatStateOf(color.alpha) }
-    var selectedColor by remember { mutableStateOf(HsvColor(color)) }
-    val renderedColor = selectedColor.toColor().copy(alpha = alpha)
-    var colorWheel by remember { mutableStateOf(false) }
-
-    AlertDialog(
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-        containerColor = MaterialTheme.colorScheme.background,
-        onDismissRequest = dismiss,
-        title = {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                ColorCircle(
-                    color = renderedColor,
-                )
-                Spacer(modifier = Modifier.size(MaterialTheme.padding.medium))
-                Text(text = title)
-            }
-        },
-        text = {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .verticalScroll(rememberScrollState())
-            ) {
-                Text(
-                    text = stringResource(Res.string.color),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    modifier = Modifier.padding(MaterialTheme.padding.extraSmall),
-                    style = MaterialTheme.typography.titleMedium
-                )
-                if (colorWheel) {
-                    Row(
-                        horizontalArrangement = Arrangement.Center,
-                        modifier = Modifier.padding(10.dp)
-                    ) {
-                        Spacer(modifier = Modifier.weight(1.0f))
-                        DoubleColorPicker(
-                            color = { selectedColor },
-                            onColorChange = { selectedColor = it },
-                            modifier = Modifier.size(200.dp),
-                            ringStrokeWidth = 20.dp,
-                        )
-                        Spacer(modifier = Modifier.weight(1.0f))
-                    }
-                } else {
-                    FlowRow {
-                        ColorCircle(
-                            color = Color.White.copy(alpha = alpha),
-                        ) {
-                            selectedColor = HsvColor(Color.White)
-                        }
-
-                        val hsl = floatArrayOf(0.0f, 1.0f, 0.5f)
-                        (0..18).forEach { hue ->
-                            hsl[0] = hue.toFloat() * 18f
-                            val color = hslToColor(hsl)
-                            ColorCircle(
-                                color = color.copy(alpha = alpha),
-                            ) {
-                                selectedColor = HsvColor(color)
-                            }
-                        }
-                        colors2.forEach { color ->
-                            ColorCircle(
-                                color = color.copy(alpha = alpha),
-                            ) {
-                                selectedColor = HsvColor(color)
-                            }
-                        }
-                    }
-                    Text(
-                        text = stringResource(Res.string.luminance),
-                        color = MaterialTheme.colorScheme.onBackground,
-                        modifier = Modifier.padding(MaterialTheme.padding.extraSmall),
-                        style = MaterialTheme.typography.titleMedium
-                    )
-
-                    // https://github.com/mhssn95/compose-color-picker/blob/main/colorPicker/src/main/java/io/mhssn/colorpicker/ext/drawExt.kt
-                    Row(modifier = Modifier.horizontalScroll(rememberScrollState())) {
-                        val hsl = floatArrayOf(0.0f, 0.0f, 0.0f)
-                        (0..10).forEach { luminance ->
-                            rbgToHSL(
-                                selectedColor.red,
-                                selectedColor.green,
-                                selectedColor.blue,
-                                hsl
-                            )
-                            hsl[2] = luminance.toFloat() * 0.1f
-                            val color = hslToColor(hsl)
-                            ColorCircle(
-                                color = color.copy(alpha = alpha),
-                            ) {
-                                selectedColor = HsvColor(color)
-                            }
-                        }
-                    }
-                }
-
-                Text(
-                    text = stringResource(Res.string.transparency),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    modifier = Modifier.padding(MaterialTheme.padding.extraSmall),
-                    style = MaterialTheme.typography.titleMedium
-                )
-                val haptic = LocalHapticFeedback.current
-                Slider(
-                    modifier = Modifier.focusOutline().padding(MaterialTheme.padding.extraSmall),
-                    value = (alpha * 10.0f).toInt(),
-                    onValueChange = f@{ newValue ->
-                        alpha = newValue.toFloat() * 0.1f
-                        haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
-                    },
-                    valueRange = 0..10,
-                )
-            }
-        },
-        confirmButton = {
-            WhiteButton(
-                text = stringResource(Res.string.ok),
-                onClick = { confirm(renderedColor) })
-        },
-        dismissButton = {
-            BlackButton(text = stringResource(Res.string.color_wheel), onClick = {
-                colorWheel = !colorWheel
-            })
-
-            BlackButton(text = stringResource(Res.string.cancel), onClick = dismiss)
-        })
-}
-
-@Composable
-fun ColorCircle(
-    color: Color,
-    modifier: Modifier = Modifier,
-    size: Dp = 50.dp,
-    clickable: (() -> Unit)? = null
-) {
-    Canvas(
-        modifier = modifier
-            .focusOutline(shape = CircleShape)
-            .padding(MaterialTheme.padding.extraSmall)
-            .size(size)
-            .border(
-                1.dp,
-                if (color.alpha > 0.5f) MaterialTheme.colorScheme.onBackground else color.copy(
-                    alpha = 1.0f
-                ),
-                CircleShape
-            )
-            .circle()
-            .clickable(enabled = clickable != null) {
-                clickable?.invoke()
-            }
-    ) {
-        drawTransparentBackground(10)
-        drawRect(color)
-    }
-}
-
-internal fun DrawScope.drawTransparentBackground(verticalBoxesSize: Int = 10) {
-    val boxSize = size.height / verticalBoxesSize
-    repeat((size.width / boxSize).roundToInt() + 1) { x ->
-        repeat(verticalBoxesSize) { y ->
-            drawRect(
-                if ((y + x) % 2 == 0) {
-                    Color.LightGray
-                } else {
-                    Color.White
-                }, topLeft = Offset(x * boxSize, y * boxSize), size = Size(boxSize, boxSize)
-            )
-        }
-    }
-}
-
-/**
- * Convert RGB components to HSL (hue-saturation-lightness).
- *
- *  * outHsl[0] is Hue [0, 360)
- *  * outHsl[1] is Saturation [0, 1]
- *  * outHsl[2] is Lightness [0, 1]
- *
- *
- * @param rf red component value [0, 1]
- * @param gf green component value [0, 1]
- * @param bf blue component value [0, 1]
- * @param outHsl 3-element array which holds the resulting HSL components
- */
-fun rbgToHSL(
-    rf: Float,
-    gf: Float,
-    bf: Float,
-    outHsl: FloatArray
-) {
-    val max = max(rf, max(gf, bf))
-    val min = min(rf, min(gf, bf))
-    val deltaMaxMin = max - min
-
-    var h: Float
-    val s: Float
-    val l = (max + min) / 2f
-
-    if (max == min) {
-        // Monochromatic
-        s = 0f
-        h = s
-    } else {
-        if (max == rf) {
-            h = ((gf - bf) / deltaMaxMin) % 6f
-        } else if (max == gf) {
-            h = ((bf - rf) / deltaMaxMin) + 2f
-        } else {
-            h = ((rf - gf) / deltaMaxMin) + 4f
-        }
-
-        s = deltaMaxMin / (1f - abs(2f * l - 1f))
-    }
-
-    h = (h * 60f) % 360f
-    if (h < 0) {
-        h += 360f
-    }
-
-    outHsl[0] = h.coerceIn(0f, 360f)
-    outHsl[1] = s.coerceIn(0f, 1f)
-    outHsl[2] = l.coerceIn(0f, 1f)
-}
-
-fun hslToColor(hsl: FloatArray): Color {
-    val h = hsl[0]
-    val s = hsl[1]
-    val l = hsl[2]
-
-    val c = (1f - abs(2 * l - 1f)) * s
-    val m = l - 0.5f * c
-    val x = c * (1f - abs((h / 60f % 2f) - 1f))
-
-    val hueSegment = h.toInt() / 60
-
-    var r = 0
-    var g = 0
-    var b = 0
-
-    when (hueSegment) {
-        0 -> {
-            r = (255 * (c + m)).roundToInt()
-            g = (255 * (x + m)).roundToInt()
-            b = (255 * m).roundToInt()
-        }
-
-        1 -> {
-            r = (255 * (x + m)).roundToInt()
-            g = (255 * (c + m)).roundToInt()
-            b = (255 * m).roundToInt()
-        }
-
-        2 -> {
-            r = (255 * m).roundToInt()
-            g = (255 * (c + m)).roundToInt()
-            b = (255 * (x + m)).roundToInt()
-        }
-
-        3 -> {
-            r = (255 * m).roundToInt()
-            g = (255 * (x + m)).roundToInt()
-            b = (255 * (c + m)).roundToInt()
-        }
-
-        4 -> {
-            r = (255 * (x + m)).roundToInt()
-            g = (255 * m).roundToInt()
-            b = (255 * (c + m)).roundToInt()
-        }
-
-        5, 6 -> {
-            r = (255 * (c + m)).roundToInt()
-            g = (255 * m).roundToInt()
-            b = (255 * (x + m)).roundToInt()
-        }
-    }
-
-    r = r.coerceIn(0, 255)
-    g = g.coerceIn(0, 255)
-    b = b.coerceIn(0, 255)
-
-    return Color(r, g, b)
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Colors.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Colors.kt
deleted file mode 100644
index 6a363909f..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Colors.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import androidx.compose.material3.ButtonColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-
-object Colors {
-    internal val blackButton
-        @Composable @ReadOnlyComposable get() = ButtonColors(
-            containerColor = MaterialTheme.colorScheme.surfaceVariant,
-            contentColor = MaterialTheme.colorScheme.onBackground,
-            disabledContainerColor = MaterialTheme.colorScheme.surface.copy(alpha = 0.9f),
-            disabledContentColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
-        )
-
-    internal val whiteButton
-        @Composable @ReadOnlyComposable get() = ButtonColors(
-            containerColor = MaterialTheme.colorScheme.onBackground,
-            contentColor = MaterialTheme.colorScheme.surfaceVariant,
-            disabledContainerColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
-            disabledContentColor = MaterialTheme.colorScheme.surface.copy(alpha = 0.9f)
-        )
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Dialog.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Dialog.kt
deleted file mode 100644
index 05948e457..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Dialog.kt
+++ /dev/null
@@ -1,480 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.AlertDialogDefaults
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonColors
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.toMutableStateList
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component1
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component2
-import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.DialogProperties
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.check
-import com.mihon.material.padding
-import org.jetbrains.compose.resources.painterResource
-
-@Composable
-fun ActionDialog(
-    title: String,
-    text: String,
-    icon: Painter? = null,
-
-    confirmText: String,
-    dismissText: String,
-
-    dismiss: () -> Unit,
-    confirm: () -> Unit
-) {
-    AlertDialog(
-        containerColor = MaterialTheme.colorScheme.background,
-        onDismissRequest = dismiss,
-        title = {
-            if (icon == null) {
-                Text(text = title)
-            } else {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Icon(painter = icon, modifier = Modifier.size(36.dp), contentDescription = null)
-                    Spacer(modifier = Modifier.size(MaterialTheme.padding.medium))
-                    Text(text = title)
-                }
-            }
-        },
-        text = { Text(text = text) },
-        confirmButton = {
-            WhiteButton(text = confirmText, onClick = confirm)
-        },
-        dismissButton = {
-            BlackButton(text = dismissText, onClick = dismiss)
-        }
-    )
-}
-
-@Composable
-fun WhiteButton(
-    text: String,
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-) {
-    BaseButton(
-        text = text,
-        onClick = onClick,
-        buttonColors = Colors.whiteButton,
-        modifier = modifier
-    )
-}
-
-@Composable
-fun BlackButton(
-    text: String,
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-) {
-    BaseButton(
-        text = text,
-        onClick = onClick,
-        buttonColors = Colors.blackButton,
-        modifier = modifier
-    )
-}
-
-@Composable
-fun BaseButton(
-    text: String, onClick: () -> Unit, buttonColors: ButtonColors,
-    modifier: Modifier = Modifier,
-) {
-    var hasFocus by remember { mutableStateOf(false) }
-    val canHaveFocus = LocalFocusOutlineDefault.current
-    Button(
-        onClick = onClick,
-        colors = buttonColors,
-        modifier = modifier.onFocusChanged { newFocus ->
-            hasFocus = canHaveFocus && newFocus.hasFocus
-        },
-        border = if (hasFocus) BorderStroke(1.dp, MaterialTheme.colorScheme.onBackground) else null
-    ) {
-        AnimatedVisibility(hasFocus) {
-            Icon(
-                painter = painterResource(Res.drawable.check),
-                modifier = Modifier.padding(end = 5.dp),
-                contentDescription = null
-            )
-        }
-        Text(text = text)
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SingleSelectDialog(
-    modifier: Modifier = Modifier,
-    shape: Shape = AlertDialogDefaults.shape,
-    containerColor: Color = MaterialTheme.colorScheme.background,
-    iconContentColor: Color = AlertDialogDefaults.iconContentColor,
-    tonalElevation: Dp = AlertDialogDefaults.TonalElevation,
-    icon: @Composable (() -> Unit)? = null,
-    title: String? = null,
-    properties: DialogProperties = DialogProperties(),
-    /* visual */
-    entries: List<String>,
-    /* Selected keys used in entries */
-    selectedIndex: Int,
-    confirmText: String? = null,
-    dismissText: String? = null,
-    dismiss: () -> Unit,
-    confirm: (Int) -> Unit
-) {
-    SingleSelectDialog(
-        modifier = modifier,
-        shape = shape,
-        containerColor = containerColor,
-        iconContentColor = iconContentColor,
-        tonalElevation = tonalElevation,
-        icon = icon,
-        title = title,
-        properties = properties,
-        entries = entries.mapIndexed { index, string -> index to string }.associate { it },
-        selectedKey = selectedIndex,
-        confirmText = confirmText,
-        dismissText = dismissText,
-        dismiss = dismiss,
-        confirm = confirm,
-    )
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun <T> SingleSelectDialog(
-    modifier: Modifier = Modifier,
-    shape: Shape = AlertDialogDefaults.shape,
-    containerColor: Color = MaterialTheme.colorScheme.background,
-    iconContentColor: Color = AlertDialogDefaults.iconContentColor,
-    tonalElevation: Dp = AlertDialogDefaults.TonalElevation,
-    icon: @Composable (() -> Unit)? = null,
-    title: String? = null,
-    properties: DialogProperties = DialogProperties(),
-    /* key - visual */
-    entries: Map<out T, String>,
-    /* Selected keys used in entries */
-    selectedKey: T,
-    confirmText: String? = null,
-    dismissText: String? = null,
-    dismiss: () -> Unit,
-    confirm: (T) -> Unit,
-    iconProvider: (@Composable (key: T, value: String) -> Unit)? = null
-) {
-    var selected by remember { mutableStateOf(selectedKey) }
-    val selectedPainter = painterResource(Res.drawable.check)
-    val (dismissFocus, confirmFocus) = remember { FocusRequester.createRefs() }
-
-    AlertDialog(
-        properties = properties,
-        tonalElevation = tonalElevation,
-        modifier = modifier,
-        icon = icon,
-        shape = shape,
-        iconContentColor = iconContentColor,
-        containerColor = containerColor,
-        onDismissRequest = dismiss,
-        title = title?.let { { Text(text = it) } },
-        text = {
-            LazyColumn {
-                entries.forEach { (key, value) ->
-                    item(key = key) {
-                        val isSelected = selected == key
-                        SingleSelectionItem(
-                            isSelected = isSelected,
-                            key = key,
-                            text = value,
-                            iconProvider = iconProvider,
-                            selectedPainter = selectedPainter,
-                            modifier = Modifier.focusProperties {
-                                start = dismissFocus
-                                end = confirmFocus
-                            }) {
-                            if (confirmText == null) {
-                                confirm(key)
-                            } else {
-                                selected = key
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            if (confirmText != null) {
-                WhiteButton(
-                    text = confirmText,
-                    onClick = { confirm(selected) },
-                    modifier = Modifier.focusRequester(confirmFocus)
-                )
-            }
-        },
-        dismissButton = {
-            if (dismissText != null) {
-                BlackButton(
-                    text = dismissText,
-                    onClick = dismiss,
-                    modifier = Modifier.focusRequester(dismissFocus)
-                )
-            }
-        }
-    )
-}
-
-/*
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun <T> SinglePairSelectDialog(
-    modifier: Modifier = Modifier,
-    shape: Shape = AlertDialogDefaults.shape,
-    containerColor: Color = colors.background,
-    iconContentColor: Color = AlertDialogDefaults.iconContentColor,
-    tonalElevation: Dp = AlertDialogDefaults.TonalElevation,
-    icon: @Composable (() -> Unit)? = null,
-    title: String? = null,
-    properties: DialogProperties = DialogProperties(),
-    /* key - visual */
-    entries: Map<Pair<T, T>, String>,
-    /* Selected keys used in entries */
-    selectedKey: T,
-    confirmText: String? = null,
-    dismissText: String? = null,
-    dismiss: () -> Unit,
-    confirm: (T) -> Unit,
-    iconProvider: (@Composable (key: T, value: String) -> Unit)? = null
-) {
-    val selected = remember { mutableStateOf(selectedKey) }
-
-    AlertDialog(
-        properties = properties,
-        tonalElevation = tonalElevation,
-        modifier = modifier,
-        icon = icon,
-        shape = shape,
-        iconContentColor = iconContentColor,
-        containerColor = containerColor,
-        onDismissRequest = dismiss,
-        title = title?.let { { Text(text = it) } },
-        text = {
-            LazyColumn {
-                entries.forEach { (keyPair, value) ->
-                    item(key = keyPair) {
-                        val (a, b) = keyPair
-                        val isSelected = selected.value == a || selected.value == b
-
-                        val painter = if (a == b)  {
-                            R.drawable.ic_baseline_check_24_listview
-                        } else if(selected.value == a) {
-                            R.drawable.ic_baseline_arrow_downward_24
-                        } else {
-                            R.drawable.ic_baseline_arrow_upward_24
-                        }
-
-                        val nextKey = if (selected.value != a) a else b
-                        SingleSelectionItem(
-                            isSelected = isSelected,
-                            key = nextKey,
-                            text = value,
-                            iconProvider = iconProvider,
-                            selectIcon = painter
-                        ) {
-                            if (confirmText == null) {
-                                confirm(nextKey)
-                            } else {
-                                selected.value = nextKey
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            if (confirmText != null) {
-                Button(
-                    onClick = {
-                        confirm(selected.value)
-                    },
-                    colors = Colors.whiteButton
-                ) { Text(text = confirmText) }
-            }
-        },
-        dismissButton = {
-            if (dismissText != null) {
-                Button(
-                    onClick = dismiss, colors = Colors.blackButton
-                ) { Text(text = dismissText) }
-            }
-        }
-    )
-}*/
-
-@Composable
-fun <T> SingleSelectionItem(
-    isSelected: Boolean,
-    key: T,
-    text: String,
-    modifier: Modifier = Modifier,
-    iconProvider: (@Composable (key: T, value: String) -> Unit)? = null,
-    selectedPainter: Painter,
-    onClick: () -> Unit,
-) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .rounded()
-            .clickable(
-                onClick = onClick,
-            ),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        if (isSelected) {
-            Icon(
-                painter = selectedPainter,
-                contentDescription = null,
-                modifier = Modifier.size(24.dp),
-                tint = MaterialTheme.colorScheme.onBackground
-            )
-            iconProvider?.invoke(key, text)
-            Text(
-                text = text,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onBackground,
-                modifier = Modifier.padding(15.dp)
-            )
-        } else {
-            Spacer(modifier = Modifier.size(24.dp))
-            iconProvider?.invoke(key, text)
-            Text(
-                text = text,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.padding(15.dp)
-            )
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun <T> MultiSelectDialog(
-    modifier: Modifier = Modifier,
-    shape: Shape = AlertDialogDefaults.shape,
-    containerColor: Color = MaterialTheme.colorScheme.background,
-    iconContentColor: Color = AlertDialogDefaults.iconContentColor,
-    tonalElevation: Dp = AlertDialogDefaults.TonalElevation,
-    icon: @Composable (() -> Unit)? = null,
-    title: String? = null,
-    properties: DialogProperties = DialogProperties(),
-    /* key - visual */
-    entries: Map<out T, String>,
-    /* Selected keys used in entries */
-    selectedKeys: Set<T>,
-    confirmText: String? = null,
-    dismissText: String? = null,
-    dismiss: () -> Unit,
-    confirm: (Set<T>) -> Unit,
-    iconProvider: (@Composable (key: T, value: String) -> Unit)? = null
-) {
-    val selected = remember {
-        entries.keys
-            .filter { selectedKeys.contains(it) }
-            .toMutableStateList()
-    }
-
-    val selectedPainter = painterResource(Res.drawable.check)
-    val (dismissFocus, confirmFocus) = remember { FocusRequester.createRefs() }
-
-    AlertDialog(
-        properties = properties,
-        tonalElevation = tonalElevation,
-        modifier = modifier,
-        icon = icon,
-        shape = shape,
-        iconContentColor = iconContentColor,
-        containerColor = containerColor,
-        onDismissRequest = {
-            if (confirmText == null) {
-                confirm(selected.toSet())
-            } else {
-                dismiss()
-            }
-        },
-        title = title?.let { { Text(text = it) } },
-        text = {
-            LazyColumn {
-                entries.forEach { (key, value) ->
-                    item(key = key) {
-                        val isSelected = selected.contains(key)
-                        SingleSelectionItem(
-                            isSelected = isSelected,
-                            key = key,
-                            text = value,
-                            iconProvider = iconProvider,
-                            selectedPainter = selectedPainter,
-                            modifier = Modifier.focusProperties {
-                                start = dismissFocus
-                                end = confirmFocus
-                            }
-                        ) {
-                            if (isSelected) {
-                                selected.remove(key)
-                            } else {
-                                selected.add(key)
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            if (confirmText != null) {
-                WhiteButton(
-                    onClick = {
-                        confirm(selected.toSet())
-                    },
-                    text = confirmText,
-                    modifier = Modifier.focusRequester(confirmFocus)
-                )
-            }
-        },
-        dismissButton = {
-            if (dismissText != null) {
-                BlackButton(
-                    onClick = dismiss,
-                    text = dismissText,
-                    modifier = Modifier.focusRequester(dismissFocus)
-                )
-            }
-        }
-    )
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Modifiers.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Modifiers.kt
deleted file mode 100644
index 140c89b76..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Modifiers.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ProvidableCompositionLocal
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-
-/*
-@Composable
-fun Modifier.ripple(
-    interactionSource: MutableInteractionSource,
-    bounded: Boolean = true,
-): Modifier = indication(
-    interactionSource = interactionSource,
-    indication = ripple(bounded = bounded, color = MaterialTheme.colorScheme.onBackground),
-)*/
-
-// no dimens.xml allowed in compose :/
-fun RoundedShape() = RoundedCornerShape(10.dp)
-
-@Composable
-fun Modifier.rounded(): Modifier =
-    clip(RoundedShape())
-
-
-@Composable
-fun Modifier.circle(): Modifier =
-    clip(CircleShape)
-
-@Composable
-fun Modifier.circleBorder(size: Dp): Modifier =
-    this.size(size)
-        .border(
-            2.dp,
-            MaterialTheme.colorScheme.onBackground.copy(alpha = 0.2f),
-            CircleShape
-        )
-        .circle()
-
-
-/**
- * If we should have outlines on items when focused by default, this should be false for desktop
- * as we do not use a dpad for that
- * */
-val LocalFocusOutlineDefault: ProvidableCompositionLocal<Boolean> =
-    staticCompositionLocalOf { true }
-
-@Composable
-fun Modifier.focusOutline(
-    enabled: Boolean = LocalFocusOutlineDefault.current,
-    shape: Shape = RoundedShape()
-): Modifier {
-    if (!enabled) return this
-
-    var hasFocus by remember { mutableStateOf(false) }
-
-    return this.onFocusChanged { newFocus ->
-        hasFocus = newFocus.isFocused
-    }.whiteOutline(hasFocus = hasFocus, shape = shape)
-}
-
-@Composable
-fun Modifier.whiteOutline(hasFocus: Boolean, shape: Shape = RoundedShape()): Modifier {
-    return if (hasFocus) {
-        this.border(
-            width = 1.dp,
-            color = MaterialTheme.colorScheme.onBackground,
-            shape = shape
-        )
-    } else {
-        this
-    }
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Screen.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Screen.kt
deleted file mode 100644
index a99b623e8..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Screen.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.lagradost.cloudstream4.compose
-import androidx.compose.runtime.Composable
-
-// https://github.com/adrielcafe/voyager
-interface Screen {
-    @Composable
-    fun Content()
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Viewmodel.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Viewmodel.kt
deleted file mode 100644
index 1320fcf8e..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/Viewmodel.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.lagradost.cloudstream4.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.compose.LocalLifecycleOwner
-import androidx.lifecycle.repeatOnLifecycle
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import kotlin.time.Duration.Companion.milliseconds
-
-/**
- * Use with the DefaultStateContainer
- *
- * `X : ViewModel(), StateContainer<XState> by DefaultStateContainer(XState)`
- */
-interface StateContainer<State> {
-    val state: StateFlow<State>
-    fun updateState(reducer: State.() -> State)
-}
-
-/**
- * Use with the DefaultEffectContainer
- *
- * `X : ViewModel(), EffectContainer<XEffect> by DefaultEffectContainer()`
- */
-interface EffectContainer<Effect> {
-    val effect: Flow<Effect>
-    suspend fun postEffect(builder: () -> Effect)
-}
-
-/**
- * Use an interface on the viewmodel directly
- *
- * `X : ViewModel(), ActionHandler<XAction>`
- */
-interface ActionHandler<Action> {
-    fun onAction(action: Action)
-}
-
-/**
- * The default implementation of a state container to allow by delegate.
- *
- * All state should be updated with updateState + copy to allow atomic operations
- * */
-class DefaultStateContainer<State>(initialState: State) : StateContainer<State> {
-    private val _state = MutableStateFlow(initialState)
-    override val state: StateFlow<State> = _state.asStateFlow()
-
-    /** Do not do expensive operations in updateState, as this can get rerun twice or more if we have concurrent writers */
-    override fun updateState(reducer: State.() -> State) {
-        _state.update(reducer)
-    }
-}
-
-/**
- * The default implementation of an effect container to allow by delegate
- * */
-class DefaultEffectContainer<Effect> : EffectContainer<Effect> {
-    private val _effect = Channel<Effect>() // To ensure events are sent
-    override val effect: Flow<Effect> = _effect.receiveAsFlow()
-
-    override suspend fun postEffect(builder: () -> Effect) {
-        _effect.send(builder())
-    }
-}
-
-/**
- * Observe the viewmodel EffectContainer in the UI on the Main thread for e.g. toasts
- * */
-@Composable
-fun <T> ObserveEffect(flow: Flow<T>, onEvent: (T) -> Unit) {
-    val lifecycleOwner = LocalLifecycleOwner.current
-    LaunchedEffect(flow, lifecycleOwner.lifecycle) {
-        lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-            withContext(Dispatchers.Main.immediate) { // To ensure events are sent
-                flow.collect(onEvent)
-            }
-        }
-    }
-}
-
-/** Single active job, replacing the old job by cancellation if launched again */
-data class SingleActiveQuery(
-    val dispatcher: CoroutineDispatcher,
-    private var job: Job? = null,
-    private val mutex: Mutex = Mutex(),
-) {
-    suspend fun cancel() {
-        mutex.withLock {
-            job?.cancel()
-            job?.join()
-            job = null
-        }
-    }
-
-    suspend fun launch(block: suspend CoroutineScope.() -> Unit) {
-        val currentScope = CoroutineScope(currentCoroutineContext())
-        val obj: suspend CoroutineScope.() -> Unit = {
-            try {
-                withContext(dispatcher) {
-                    block()
-                }
-            } catch (_: Throwable) {
-                //logError(t)
-            }
-        }
-        mutex.withLock {
-            job?.cancel()
-            job?.join()
-            job = currentScope.launch(block = obj)
-        }
-    }
-}
-
-/** Debounce Query to handle e.g. user search without spamming the endpoint */
-data class DebounceQuery(
-    private val pipe: MutableSharedFlow<String> = MutableSharedFlow(
-        extraBufferCapacity = 64,
-        replay = 64
-    )
-) {
-    @OptIn(FlowPreview::class)
-    suspend fun launch(collector: FlowCollector<String>) {
-        pipe.debounce(200L.milliseconds).distinctUntilChanged()
-            .flowOn(Dispatchers.Default)
-            .collect(collector)
-    }
-
-    suspend fun emit(query: String) {
-        this.pipe.emit(query)
-    }
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/CircularColorPicker.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/CircularColorPicker.kt
deleted file mode 100644
index bdae7c0aa..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/CircularColorPicker.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.lagradost.cloudstream4.compose.colorpicker
-
-import androidx.compose.foundation.gestures.*
-import androidx.compose.foundation.interaction.DragInteraction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithCache
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.center
-import androidx.compose.ui.unit.toOffset
-import kotlinx.coroutines.launch
-import kotlin.math.*
-
-/**
- * Circular color picker that allows the user to select a hue by dragging a thumb around the circle.
- * The color is represented in HSV color space with a fixed value.
- *
- * @param color The current color
- * @param onColorChange Callback that is called when the color changes
- * @param modifier The modifier to be applied to the color picker
- * @param interactionSource The interaction source for the color picker
- * @param onColorChangeFinished Callback that is called when the user finishes changing the color
- * @param thumb Composable that is used to draw the thumb
- *
- * @see RingColorPicker
- * @see SquareColorPicker
- */
-@Composable
-fun CircularColorPicker(
-    color: () -> HsvColor,
-    onColorChange: (HsvColor) -> Unit,
-    modifier: Modifier = Modifier,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    onColorChangeFinished: () -> Unit = {},
-    thumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(color().toColor(), interactionSource)
-    }
-) {
-    CircularColorPicker(
-        hue = { color().hue },
-        saturation = { color().saturation },
-        value = { color().value },
-        onColorChange = { h, s -> onColorChange(color().copy(hue = h, saturation = s)) },
-        modifier = modifier,
-        interactionSource = interactionSource,
-        onColorChangeFinished = onColorChangeFinished,
-        thumb = thumb
-    )
-}
-
-/**
- * Circular color picker that allows the user to select a hue by dragging a thumb around the circle.
- * The color is represented in HSV color space with a fixed value.
- *
- * @param hue The hue of the color
- * @param saturation The saturation of the color
- * @param value The value of the color
- * @param onColorChange Callback that is called when the color changes
- * @param modifier The modifier to be applied to the color picker
- * @param interactionSource The interaction source for the color picker
- * @param onColorChangeFinished Callback that is called when the user finishes changing the color
- * @param thumb Composable that is used to draw the thumb
- *
- * @see RingColorPicker
- * @see SquareColorPicker
- */
-@Composable
-fun CircularColorPicker(
-    hue: () -> Float,
-    saturation: () -> Float,
-    modifier: Modifier = Modifier,
-    value: () -> Float = { 1f },
-    onColorChange: (hue: Float, saturation: Float) -> Unit,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    onColorChangeFinished: () -> Unit = {},
-    thumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(Color.hsv(hue(), saturation(), value()), interactionSource)
-    }
-) {
-    val scope = rememberCoroutineScope()
-    var radius by remember { mutableFloatStateOf(0f) }
-
-    val currentOnColorChange by rememberUpdatedState(onColorChange)
-    val currentOnColorChangeFinished by rememberUpdatedState(onColorChangeFinished)
-
-    Box(
-        modifier = modifier
-            .size(ColorPickerDefaults.ComponentSize)
-            .onSizeChanged {
-                radius = it.width / 2f
-            }
-            .pointerInput(Unit) {
-                awaitEachGesture {
-                    val down = awaitFirstDown()
-                    val downPosition = down.position
-                    val center = size.center.toOffset()
-
-                    // Check if initial touch is within the circle
-                    if ((downPosition - center).getDistanceSquared() > radius * radius) return@awaitEachGesture
-
-                    // Handle initial tap
-                    updateColorFromPosition(downPosition, center, radius, currentOnColorChange)
-
-                    // Start drag interaction
-                    val interaction = DragInteraction.Start()
-                    scope.launch {
-                        interactionSource.emit(interaction)
-                    }
-
-                    var change = awaitTouchSlopOrCancellation(down.id) { change, _ ->
-                        change.consume()
-                        val adjustedPosition = clampPositionToRadius(change.position, center, radius)
-                        updateColorFromPosition(adjustedPosition, center, radius, currentOnColorChange)
-                    }
-
-                    // Continue dragging
-                    while (change != null && change.pressed) {
-                        change.consume()
-                        val adjustedPosition = clampPositionToRadius(change.position, center, radius)
-                        updateColorFromPosition(adjustedPosition, center, radius, currentOnColorChange)
-                        change = awaitDragOrCancellation(change.id)
-                    }
-
-                    scope.launch {
-                        interactionSource.emit(DragInteraction.Stop(interaction))
-                    }
-
-                    currentOnColorChangeFinished()
-                }
-            }
-            .drawWithCache {
-                val v = value()
-                val hueBrush = Brush.sweepGradient(
-                    colors = List(7) { i ->
-                        Color.hsv(
-                            hue = i * 60f,
-                            saturation = 1f,
-                            value = v
-                        )
-                    }
-                )
-                val saturationBrush = Brush.radialGradient(
-                    listOf(Color.hsv(0f, 0f, v), Color.Transparent)
-                )
-
-                onDrawBehind {
-                    drawCircle(hueBrush)
-                    drawCircle(saturationBrush)
-                }
-            }
-    ) {
-        Box(
-            modifier = Modifier.offset {
-                val angle = hue() * DEG_TO_RAD
-                val distance = saturation() * radius
-
-                IntOffset(
-                    x = (radius + distance * cos(angle)).roundToInt(),
-                    y = (radius + distance * sin(angle)).roundToInt()
-                )
-            }
-        ) {
-            thumb()
-        }
-    }
-}
-
-/**
- * Get the color for a given position in the circular color picker.
- *
- * @return A pair of hue and saturation values, or null if the position is outside the circle.
- */
-private inline fun updateColorFromPosition(
-    position: Offset,
-    center: Offset,
-    radius: Float,
-    onResult: (hue: Float, saturation: Float) -> Unit
-) {
-    val offset = position - center
-
-    val degrees = atan2(offset.y, offset.x) * RAD_TO_DEG
-    val centerAngle = (degrees + 360) % 360
-    val distance = offset.getDistance()
-    val saturation = (distance / radius).coerceIn(0f, 1f)
-
-    onResult(centerAngle, saturation)
-}
-
-/**
- * Clamp the position to the radius of the color picker circle.
- *
- * @return The clamped position that lies within the circle of the given radius.
- */
-private fun clampPositionToRadius(position: Offset, center: Offset, radius: Float): Offset {
-    val offset = position - center
-
-    // If the position is already within the radius, return it as is
-    if (offset.getDistanceSquared() <= radius * radius) return position
-
-    // Otherwise, clamp the position to the edge of the circle
-    val scale = radius / offset.getDistance()
-    return center + (offset * scale)
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/ColorPickerDefaults.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/ColorPickerDefaults.kt
deleted file mode 100644
index 9cc25a0aa..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/ColorPickerDefaults.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.lagradost.cloudstream4.compose.colorpicker
-
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsDraggedAsState
-import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import kotlin.math.PI
-
-internal const val DEG_TO_RAD = (PI / 180).toFloat()
-internal const val RAD_TO_DEG = (180 / PI).toFloat()
-
-internal val ThumbRadiusPressed = 14.dp
-internal val ThumbRadius = 10.dp
-
-object ColorPickerDefaults {
-    /**
-     * The default size applied to color pickers. Note that you can override it by applying
-     * Modifier.size directly on a picker component.
-     */
-    val ComponentSize: Dp = 128.dp
-
-    /**
-     * Default implementation of the thumb component for the color pickers.
-     *
-     * @param color The color of the thumb
-     * @param interactionSource The interaction source for the thumb
-     * @param modifier The modifier for the thumb
-     */
-    @Composable
-    fun Thumb(color: Color, interactionSource: MutableInteractionSource, modifier: Modifier = Modifier) {
-        val isPressed by interactionSource.collectIsPressedAsState()
-        val isDragged by interactionSource.collectIsDraggedAsState()
-        val radius by animateDpAsState(
-            targetValue = if (isPressed || isDragged) ThumbRadiusPressed else ThumbRadius
-        )
-
-        Canvas(modifier = modifier) {
-            drawCircle(color, radius = radius.toPx())
-
-            // Draw the border
-            drawCircle(
-                color = color.contrastingColor,
-                radius = radius.toPx(),
-                alpha = 0.5f,
-                style = Stroke(1.dp.toPx())
-            )
-        }
-    }
-}
-
-internal val Color.contrastingColor: Color
-    get() = if (this.isDark()) Color.White else Color.Black
-
-internal fun Color.isDark(): Boolean {
-    return 0.2126 * this.red + 0.7152 * this.green + 0.0722 * this.blue < .5f
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/DoubleColorPicker.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/DoubleColorPicker.kt
deleted file mode 100644
index e5b07d7b1..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/DoubleColorPicker.kt
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.lagradost.cloudstream4.compose.colorpicker
-
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.gestures.awaitDragOrCancellation
-import androidx.compose.foundation.gestures.awaitEachGesture
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.awaitTouchSlopOrCancellation
-import androidx.compose.foundation.interaction.DragInteraction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.launch
-import kotlin.math.atan2
-import kotlin.math.cos
-import kotlin.math.roundToInt
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-@Composable
-fun DoubleColorPicker(
-    color: () -> HsvColor,
-    onColorChange: (color: HsvColor) -> Unit,
-    modifier: Modifier = Modifier,
-    ringStrokeWidth: Dp = 16.dp,
-    innerPadding: Dp = 50.dp,
-    ringInteractionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    ringThumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(Color.hsv(color().hue, 1f, 1f), ringInteractionSource)
-    },
-    innerInteractionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    innerThumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(color().toColor(), innerInteractionSource)
-    },
-) {
-    Box(modifier) {
-        RingColorPicker(
-            interactionSource = ringInteractionSource,
-            thumb = ringThumb,
-            ringStrokeWidth = ringStrokeWidth,
-            color = color,
-            onColorChange = onColorChange,
-            modifier = Modifier.fillMaxSize()
-        )
-        Box(Modifier.fillMaxSize().padding(innerPadding)) {
-            CircularSquareColorPicker(
-                interactionSource = innerInteractionSource,
-                thumb = innerThumb,
-                color = color,
-                onColorChange = onColorChange,
-                modifier = Modifier.fillMaxSize()
-            )
-        }
-    }
-}
-
-/**
- * The standard circle color picker that allows the user to select a color by dragging a thumb around the color space.
- *
- * The color is represented in HSV color space with a fixed hue. The saturation and value can be controlled by
- * dragging the thumb.
- *
- * @param color The current color
- * @param onColorChange Callback that is called when the color changes
- * @param modifier The modifier to be applied to the color picker
- * @param interactionSource The interaction source for the color picker
- * @param thumb Composable that is used to draw the thumb
- * @param shape The shape of the color picker, note that the corner radius should be kept small,
- * to prevent the thumb from visually appearing outside the color picker
- * @param onColorChangeFinished Callback that is called when the user finishes changing the color
- *
- * @see CircularColorPicker
- * @see RingColorPicker
- */
-@Composable
-fun CircularSquareColorPicker(
-    color: () -> HsvColor,
-    onColorChange: (color: HsvColor) -> Unit,
-    modifier: Modifier = Modifier,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    thumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(color().toColor(), interactionSource)
-    },
-    onColorChangeFinished: () -> Unit = {}
-) {
-    val scope = rememberCoroutineScope()
-    var size by remember { mutableStateOf(IntSize.Zero) }
-
-    val currentColor by rememberUpdatedState(color)
-    val currentOnColorChange by rememberUpdatedState(onColorChange)
-    val currentOnColorChangeFinished by rememberUpdatedState(onColorChangeFinished)
-
-    Box {
-        Canvas(
-            modifier = modifier
-                .size(ColorPickerDefaults.ComponentSize)
-                .onSizeChanged { size = it }
-                .clip(CircleShape)
-                .pointerInput(Unit) {
-                    awaitEachGesture {
-                        val down = awaitFirstDown()
-
-                        hsvColorForPosition(down.position, size).let { (s, v) ->
-                            currentOnColorChange(currentColor().copy(saturation = s, value = v))
-                        }
-
-                        // Start drag interaction
-                        val interaction = DragInteraction.Start()
-                        scope.launch {
-                            interactionSource.emit(interaction)
-                        }
-
-                        var change = awaitTouchSlopOrCancellation(down.id) { change, _ ->
-                            change.consume()
-                            hsvColorForPosition(change.position, size).let { (s, v) ->
-                                currentOnColorChange(currentColor().copy(saturation = s, value = v))
-                            }
-                        }
-
-                        // Continue dragging
-                        while (change != null && change.pressed) {
-                            change.consume()
-                            hsvColorForPosition(change.position, size).let { (s, v) ->
-                                currentOnColorChange(currentColor().copy(saturation = s, value = v))
-                            }
-                            change = awaitDragOrCancellation(change.id)
-                        }
-
-                        scope.launch {
-                            interactionSource.emit(DragInteraction.Stop(interaction))
-                        }
-
-                        currentOnColorChangeFinished()
-                    }
-                }
-                .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
-        ) {
-            val saturationBrush = Brush.verticalGradient(listOf(Color.Transparent, Color.Black))
-            val hueBrush = Brush.horizontalGradient(
-                listOf(
-                    Color.Transparent,
-                    Color.hsv(currentColor().hue, 1f, 1f)
-                )
-            )
-
-            drawRect(Color.White)
-            drawRect(hueBrush)
-            drawRect(saturationBrush)
-        }
-
-        Box(
-            modifier = Modifier.offset {
-                val x = -1.0 + currentColor().saturation * 2.0
-                val y = 1.0 - currentColor().value * 2.0
-
-                // https://squircular.blogspot.com/2015/09/mapping-circle-to-square.html
-                val u = x * sqrt(1 - y * y * 0.5)
-                val v = y * sqrt(1 - x * x * 0.5)
-
-                IntOffset(
-                    x = (u * size.width * 0.5 + size.width * 0.5).roundToInt(),//(currentColor().saturation * size.width).roundToInt(),
-                    y = (v * size.height * 0.5 + size.height * 0.5).roundToInt(), //(size.height - currentColor().value * size.height).roundToInt()
-                )
-            }
-        ) {
-            thumb()
-        }
-    }
-}
-
-private fun hsvColorForPosition(position: Offset, size: IntSize): Pair<Float, Float> {
-    val clampedX = position.x / size.width
-    val clampedY = position.y / size.height
-
-    val x = -1.0 + clampedX * 2.0
-    val y = 1.0 - clampedY * 2.0
-
-    // coerce here to prevent drag from feeling like a square
-    val radius = sqrt(x * x + y * y).coerceIn(0.0, 1.0)
-    val angle = atan2(y, x)
-
-    val u = cos(angle) * radius
-    val v = sin(angle) * radius
-
-    val u2 = u * u
-    val v2 = v * v
-    val sqrt22 = 2.0 * sqrt(2.0)
-
-    // https://squircular.blogspot.com/2015/09/mapping-circle-to-square.html
-    val xOut = 0.5 * sqrt(2 + sqrt22 * u + u2 - v2) - 0.5 * sqrt(2 - sqrt22 * u + u2 - v2)
-    val yOut = 0.5 * sqrt(2 + sqrt22 * v - u2 + v2) - 0.5 * sqrt(2 - sqrt22 * v - u2 + v2)
-
-    return (xOut * 0.5 + 0.5).toFloat() to (yOut * 0.5 + 0.5).toFloat()
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/HsvColor.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/HsvColor.kt
deleted file mode 100644
index 0fcbbda99..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/HsvColor.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.lagradost.cloudstream4.compose.colorpicker
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.colorspace.ColorSpaces
-import androidx.compose.ui.graphics.toArgb
-import kotlin.jvm.JvmInline
-import kotlin.math.max
-
-/**
- * Represents a color in the HSV (Hue, Saturation, Value) color space.
- *
- * This class provides properties to access the hue, saturation, and value of the color,
- * as well as methods to convert to and from RGB color space.
- */
-@Immutable
-@JvmInline
-value class HsvColor private constructor(val packedValue: ULong) {
-    /**
-     * The hue of the color, in degrees (0-360).
-     */
-    @Stable
-    val hue: Float
-        get() = (packedValue shr 40 and 0xFFFFu).toFloat() / 100f
-
-    /**
-     * The saturation of the color (0-1).
-     */
-    @Stable
-    val saturation: Float
-        get() = (packedValue shr 20 and 0xFFFFFu).toFloat() / 1000000f
-
-    /**
-     * The value (brightness) of the color (0-1).
-     */
-    @Stable
-    val value: Float
-        get() = (packedValue and 0xFFFFFu).toFloat() / 1000000f
-
-    /**
-     * The red component of the color (0-1).
-     */
-    @Stable
-    val red: Float
-        get() = hsvToRgbComponent(5, hue, saturation, value)
-
-    /**
-     * The green component of the color (0-1).
-     */
-    @Stable
-    val green: Float
-        get() = hsvToRgbComponent(3, hue, saturation, value)
-
-    /**
-     * The blue component of the color (0-1).
-     */
-    @Stable
-    val blue: Float
-        get() = hsvToRgbComponent(1, hue, saturation, value)
-
-    /**
-     * Creates an HsvColor from the given hue, saturation, and value.
-     */
-    constructor(hue: Float, saturation: Float, value: Float) : this(
-        ((hue * 100).toULong() and 0xFFFFu shl 40) or
-                ((saturation * 1000000).toULong() and 0xFFFFFu shl 20) or
-                ((value * 1000000).toULong() and 0xFFFFFu)
-    )
-
-    /**
-     * Converts the HSV color to a Color object.
-     *
-     * **Note**: HSV to RGB conversion is a lossy process, so the resulting color may not be exactly the same as the original HSV color.
-     * When red, green and blue are equal, hue will be 0 and saturation will be 0.
-     */
-    fun toColor(): Color = Color.hsv(hue, saturation, value)
-
-    @Stable
-    operator fun component1(): Float = hue
-
-    @Stable
-    operator fun component2(): Float = saturation
-
-    @Stable
-    operator fun component3(): Float = value
-
-    /**
-     * Copies the existing color, changing only the provided values.
-     */
-    @Stable
-    fun copy(
-        hue: Float = this.hue,
-        saturation: Float = this.saturation,
-        value: Float = this.value
-    ): HsvColor {
-        return HsvColor(hue, saturation, value)
-    }
-
-    /**
-     * Returns a string representation of the color in HSV format.
-     */
-    @Stable
-    override fun toString(): String {
-        return "HsvColor(hue=$hue, saturation=$saturation, value=$value)"
-    }
-
-    companion object {
-        val Saver: Saver<HsvColor, Long> = Saver(
-            save = { it.packedValue.toLong() },
-            restore = { HsvColor(it.toULong()) }
-        )
-
-        private fun hsvToRgbComponent(n: Int, h: Float, s: Float, v: Float): Float {
-            val k = (n.toFloat() + h / 60f) % 6f
-            return v - (v * s * max(0f, minOf(k, 4 - k, 1f)))
-        }
-    }
-}
-
-/**
- * Creates a new [HsvColor] instance from a [Color].
- *
- * @param color The Color to create an HsvColor from.
- * @return A non-null instance of [HsvColor]
- */
-@Stable
-fun HsvColor(color: Color): HsvColor = HsvColor(color.toArgb())
-
-/**
- * Creates a new [Color] instance from an ARGB color int.
- *
- * @param color The ARGB color int to create a Color from.
- * @return A non-null instance of [HsvColor]
- */
-@Stable
-fun HsvColor(color: Int): HsvColor = HsvColor(color.toLong())
-
-/**
- * Creates a new [Color] instance from an ARGB color long.
- * The resulting color is in the [sRGB][ColorSpaces.Srgb]
- * color space.
- *
- * @param color The ARGB color long to create a Color from.
- * @return A non-null instance of [HsvColor]
- */
-@Stable
-fun HsvColor(color: Long): HsvColor {
-    val r = ((color shr 16) and 0xFF).toFloat() / 255f
-    val g = ((color shr 8) and 0xFF).toFloat() / 255f
-    val b = (color and 0xFF).toFloat() / 255f
-
-    val max = maxOf(r, g, b)
-    val min = minOf(r, g, b)
-    val delta = max - min
-
-    val hue = when {
-        delta == 0f -> 0f
-        max == r -> ((g - b) / delta) % 6
-        max == g -> ((b - r) / delta) + 2
-        max == b -> ((r - g) / delta) + 4
-        else -> 0f
-    } * 60f
-
-    val positiveHue = if (hue < 0f) hue + 360f else hue
-    val saturation = if (max == 0f) 0f else 1 - min / max
-
-    return HsvColor(positiveHue, saturation, max)
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/LICENSE b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/LICENSE
deleted file mode 100644
index 33e326d05..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 zt64
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/README.md b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/README.md
deleted file mode 100644
index a57df0ca2..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Taken from https://github.com/zt64/compose-pipette/tree/main
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/RingColorPicker.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/RingColorPicker.kt
deleted file mode 100644
index 602bd3ace..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/RingColorPicker.kt
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.lagradost.cloudstream4.compose.colorpicker
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.*
-import androidx.compose.foundation.interaction.DragInteraction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.progressSemantics
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithCache
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.*
-import kotlinx.coroutines.launch
-import kotlin.math.*
-
-/**
- * A ring color picker that allows the user to select a hue by rotating a handle around the ring. The ring is
- * a continuous gradient of colors from red to red.
- *
- * To be able to also control the saturation, use the [CircularColorPicker] composable.
- *
- * @param color The current color
- * @param onColorChange Callback that is called when the color changes
- * @param modifier The modifier to be applied to the color picker
- * @param interactionSource The interaction source for the color picker
- * @param ringStrokeWidth The width of the ring
- * @param thumb The composable that is used to draw the thumb
- * @param onColorChangeFinished Callback that is called when the user finishes changing the color
- *
- * @see CircularColorPicker
- * @see SquareColorPicker
- */
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun RingColorPicker(
-    color: () -> HsvColor,
-    onColorChange: (HsvColor) -> Unit,
-    modifier: Modifier = Modifier,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    ringStrokeWidth: Dp = 16.dp,
-    thumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(Color.hsv(color().hue, 1f, 1f), interactionSource)
-    },
-    onColorChangeFinished: () -> Unit = {}
-) {
-    RingColorPicker(
-        hue = { color().hue },
-        onHueChange = { hue -> onColorChange(color().copy(hue = hue)) },
-        modifier = modifier,
-        interactionSource = interactionSource,
-        ringStrokeWidth = ringStrokeWidth,
-        thumb = thumb,
-        onColorChangeFinished = onColorChangeFinished
-    )
-}
-
-/**
- * A ring color picker that allows the user to select a hue by rotating a handle around the ring. The ring is
- * a continuous gradient of colors from red to red.
- *
- * To be able to also control the saturation, use the [CircularColorPicker] composable.
- *
- * @param hue The hue of the color
- * @param saturation The saturation of the color
- * @param value The value of the color
- * @param onHueChange Callback that is called when the hue changes
- * @param modifier The modifier to be applied to the color picker
- * @param interactionSource The interaction source for the color picker
- * @param ringStrokeWidth The width of the ring
- * @param thumb The composable that is used to draw the thumb
- * @param onColorChangeFinished Callback that is called when the user finishes changing the color
- *
- * @see CircularColorPicker
- * @see SquareColorPicker
- */
-@Composable
-fun RingColorPicker(
-    hue: () -> Float,
-    modifier: Modifier = Modifier,
-    saturation: () -> Float = { 1f },
-    value: () -> Float = { 1f },
-    onHueChange: (Float) -> Unit,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    ringStrokeWidth: Dp = 16.dp,
-    thumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(Color.hsv(hue(), saturation(), value()), interactionSource)
-    },
-    onColorChangeFinished: () -> Unit = {}
-) {
-    val scope = rememberCoroutineScope()
-    var radius by remember { mutableFloatStateOf(0f) }
-    var center by remember { mutableStateOf(Offset.Zero) }
-    val strokeWidth = with(LocalDensity.current) { ringStrokeWidth.toPx() }
-
-    val currentOnHueChange by rememberUpdatedState(onHueChange)
-    val currentOnColorChangeFinished by rememberUpdatedState(onColorChangeFinished)
-
-    Box(
-        modifier = modifier
-            .size(ColorPickerDefaults.ComponentSize)
-            .onSizeChanged {
-                radius = (it.width - strokeWidth) / 2f
-                center = Offset(it.width / 2f, it.height / 2f)
-            }
-            .pointerInput(Unit) {
-                awaitEachGesture {
-                    val down = awaitFirstDown()
-                    val downPosition = down.position
-                    val center = size.center.toOffset()
-
-                    val distanceSquared = (downPosition - center).getDistanceSquared()
-                    val halfStroke = strokeWidth / 2f
-                    val innerRadiusSquared = (radius - halfStroke) * (radius - halfStroke)
-                    val outerRadiusSquared = (radius + halfStroke) * (radius + halfStroke)
-
-                    if (distanceSquared !in innerRadiusSquared..outerRadiusSquared) return@awaitEachGesture
-
-                    // Handle initial tap
-                    currentOnHueChange(hueForPosition(downPosition, center))
-
-                    val interaction = DragInteraction.Start()
-                    scope.launch {
-                        interactionSource.emit(interaction)
-                    }
-
-                    var change = awaitTouchSlopOrCancellation(down.id) { change, _ ->
-                        change.consume()
-                        currentOnHueChange(hueForPosition(change.position, center))
-                    }
-
-                    while (change != null && change.pressed) {
-                        change.consume()
-                        currentOnHueChange(hueForPosition(change.position, center))
-                        change = awaitDragOrCancellation(change.id)
-                    }
-
-                    scope.launch {
-                        interactionSource.emit(DragInteraction.Stop(interaction))
-                    }
-
-                    currentOnColorChangeFinished()
-                }
-            }
-            .drawWithCache {
-                val brush = Brush.sweepGradient(
-                    List(7) {
-                        Color.hsv(
-                            hue = (it * 60).toFloat(),
-                            saturation = saturation(),
-                            value = value()
-                        )
-                    }
-                )
-
-                onDrawBehind {
-                    drawCircle(
-                        brush = brush,
-                        radius = size.minDimension / 2 - strokeWidth / 2f,
-                        style = Stroke(strokeWidth)
-                    )
-                }
-            }
-            .progressSemantics(
-                value = hue(),
-                valueRange = 0f..360f,
-                steps = 360
-            )
-    ) {
-        Box(
-            modifier = Modifier.offset {
-                val rad = hue() * DEG_TO_RAD
-                val x = center.x + radius * cos(rad)
-                val y = center.y + radius * sin(rad)
-
-                IntOffset(x.roundToInt(), y.roundToInt())
-            }
-        ) {
-            thumb()
-        }
-    }
-}
-
-private fun hueForPosition(position: Offset, center: Offset): Float {
-    val (dx, dy) = position - center
-    val theta = atan2(dy, dx)
-    var angle = theta * RAD_TO_DEG
-
-    if (angle < 0) angle += 360f
-
-    return angle
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/SquareColorPicker.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/SquareColorPicker.kt
deleted file mode 100644
index f409d4201..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/compose/colorpicker/SquareColorPicker.kt
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.lagradost.cloudstream4.compose.colorpicker
-
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.gestures.awaitDragOrCancellation
-import androidx.compose.foundation.gestures.awaitEachGesture
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.awaitTouchSlopOrCancellation
-import androidx.compose.foundation.interaction.DragInteraction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.IntSize
-import kotlinx.coroutines.launch
-import kotlin.math.roundToInt
-
-/**
- * The standard square color picker that allows the user to select a color by dragging a thumb around the color space.
- *
- * The color is represented in HSV color space with a fixed hue. The saturation and value can be controlled by
- * dragging the thumb.
- *
- * @param color The current color
- * @param onColorChange Callback that is called when the color changes
- * @param modifier The modifier to be applied to the color picker
- * @param interactionSource The interaction source for the color picker
- * @param thumb Composable that is used to draw the thumb
- * @param shape The shape of the color picker, note that the corner radius should be kept small,
- * to prevent the thumb from visually appearing outside the color picker
- * @param onColorChangeFinished Callback that is called when the user finishes changing the color
- *
- * @see CircularColorPicker
- * @see RingColorPicker
- */
-@Composable
-fun SquareColorPicker(
-    color: () -> HsvColor,
-    onColorChange: (color: HsvColor) -> Unit,
-    modifier: Modifier = Modifier,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    thumb: @Composable () -> Unit = {
-        ColorPickerDefaults.Thumb(color().toColor(), interactionSource)
-    },
-    shape: Shape = RectangleShape,
-    onColorChangeFinished: () -> Unit = {}
-) {
-    val scope = rememberCoroutineScope()
-    var size by remember { mutableStateOf(IntSize.Zero) }
-
-    val currentColor by rememberUpdatedState(color)
-    val currentOnColorChange by rememberUpdatedState(onColorChange)
-    val currentOnColorChangeFinished by rememberUpdatedState(onColorChangeFinished)
-
-    Box {
-        Canvas(
-            modifier = modifier
-                .size(ColorPickerDefaults.ComponentSize)
-                .onSizeChanged { size = it }
-                .pointerInput(Unit) {
-                    awaitEachGesture {
-                        val down = awaitFirstDown()
-
-                        hsvColorForPosition(down.position, size).let { (s, v) ->
-                            currentOnColorChange(currentColor().copy(saturation = s, value = v))
-                        }
-
-                        // Start drag interaction
-                        val interaction = DragInteraction.Start()
-                        scope.launch {
-                            interactionSource.emit(interaction)
-                        }
-
-                        var change = awaitTouchSlopOrCancellation(down.id) { change, _ ->
-                            change.consume()
-                            hsvColorForPosition(change.position, size).let { (s, v) ->
-                                currentOnColorChange(currentColor().copy(saturation = s, value = v))
-                            }
-                        }
-
-                        // Continue dragging
-                        while (change != null && change.pressed) {
-                            change.consume()
-                            hsvColorForPosition(change.position, size).let { (s, v) ->
-                                currentOnColorChange(currentColor().copy(saturation = s, value = v))
-                            }
-                            change = awaitDragOrCancellation(change.id)
-                        }
-
-                        scope.launch {
-                            interactionSource.emit(DragInteraction.Stop(interaction))
-                        }
-
-                        currentOnColorChangeFinished()
-                    }
-                }
-                .clip(shape)
-                .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
-        ) {
-            val saturationBrush = Brush.verticalGradient(listOf(Color.Transparent, Color.Black))
-            val hueBrush = Brush.horizontalGradient(
-                listOf(
-                    Color.Transparent,
-                    Color.hsv(currentColor().hue, 1f, 1f)
-                )
-            )
-
-            drawRect(Color.White)
-            drawRect(hueBrush)
-            drawRect(saturationBrush)
-        }
-
-        Box(
-            modifier = Modifier.offset {
-                IntOffset(
-                    x = (currentColor().saturation * size.width).roundToInt(),
-                    y = (size.height - currentColor().value * size.height).roundToInt()
-                )
-            }
-        ) {
-            thumb()
-        }
-    }
-}
-
-private fun hsvColorForPosition(position: Offset, size: IntSize): Pair<Float, Float> {
-    val clampedX = position.x.coerceIn(0f, size.width.toFloat())
-    val clampedY = position.y.coerceIn(0f, size.height.toFloat())
-
-    val saturation = clampedX / size.width
-    val value = 1f - (clampedY / size.height)
-
-    return Pair(saturation, value)
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.kt
deleted file mode 100644
index 72da2f789..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.graphics.Color
-
-internal expect object DeviceTheme {
-    @Composable
-    @ReadOnlyComposable
-    fun resolveDynamicTheme(): CloudStreamColorScheme
-    @Composable
-    @ReadOnlyComposable
-    fun resolveDynamicPrimaryColor(): Color
-    @Composable
-    @ReadOnlyComposable
-    fun resolveDynamicSecondaryColor(): Color
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Font.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Font.kt
deleted file mode 100644
index c81519e6d..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Font.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.em
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.productsans_black
-import com.lagradost.cloudstream4.generated.resources.productsans_blackitalic
-import com.lagradost.cloudstream4.generated.resources.productsans_bold
-import com.lagradost.cloudstream4.generated.resources.productsans_bolditalic
-import com.lagradost.cloudstream4.generated.resources.productsans_italic
-import com.lagradost.cloudstream4.generated.resources.productsans_light
-import com.lagradost.cloudstream4.generated.resources.productsans_lightitalic
-import com.lagradost.cloudstream4.generated.resources.productsans_medium
-import com.lagradost.cloudstream4.generated.resources.productsans_mediumitalic
-import com.lagradost.cloudstream4.generated.resources.productsans_regular
-import com.lagradost.cloudstream4.generated.resources.productsans_thin
-import com.lagradost.cloudstream4.generated.resources.productsans_thinitalic
-import org.jetbrains.compose.resources.Font
-
-object AppFont {
-    val googleSans @Composable get() = FontFamily(
-        Font(Res.font.productsans_thin, weight = FontWeight.W100, style = FontStyle.Normal),
-        Font(Res.font.productsans_thinitalic, weight = FontWeight.W100, style = FontStyle.Italic),
-
-        Font(Res.font.productsans_light, weight = FontWeight.W300, style = FontStyle.Normal),
-        Font(Res.font.productsans_lightitalic, weight = FontWeight.W300, style = FontStyle.Italic),
-
-        Font(Res.font.productsans_regular, weight = FontWeight.W400, style = FontStyle.Normal),
-        Font(Res.font.productsans_italic, weight = FontWeight.W400, style = FontStyle.Italic),
-
-        Font(Res.font.productsans_medium, weight = FontWeight.W500, style = FontStyle.Normal),
-        Font(Res.font.productsans_mediumitalic, weight = FontWeight.W500, style = FontStyle.Italic),
-
-        Font(Res.font.productsans_bold, weight = FontWeight.W700, style = FontStyle.Normal),
-        Font(Res.font.productsans_bolditalic, weight = FontWeight.W700, style = FontStyle.Italic),
-
-        Font(Res.font.productsans_black, weight = FontWeight.W900, style = FontStyle.Normal),
-        Font(Res.font.productsans_blackitalic, weight = FontWeight.W900, style = FontStyle.Italic))
-
-    private val defaultTypography = androidx.compose.material3.Typography()
-    val typography @Composable get() =
-        googleSans.let { fontFamily ->
-            val lineHeight = 1.3.em
-            Typography(
-                displayLarge = defaultTypography.displayLarge.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                displayMedium = defaultTypography.displayMedium.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                displaySmall = defaultTypography.displaySmall.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-
-                headlineLarge = defaultTypography.headlineLarge.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                headlineMedium = defaultTypography.headlineMedium.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                headlineSmall = defaultTypography.headlineSmall.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-
-                titleLarge = defaultTypography.titleLarge.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                titleMedium = defaultTypography.titleMedium.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                titleSmall = defaultTypography.titleSmall.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-
-                bodyLarge = defaultTypography.bodyLarge.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                bodyMedium = defaultTypography.bodyMedium.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                bodySmall = defaultTypography.bodySmall.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-
-                labelLarge = defaultTypography.labelLarge.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                labelMedium = defaultTypography.labelMedium.copy(fontFamily = fontFamily, lineHeight = lineHeight),
-                labelSmall = defaultTypography.labelSmall.copy(fontFamily = fontFamily, lineHeight = lineHeight)
-            )
-        }
-}
-
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Palette.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Palette.kt
deleted file mode 100644
index c6332808f..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Palette.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import androidx.compose.ui.graphics.Color
-
-enum class CloudStreamPrimaryColor(val color: Color) {
-    NORMAL(Color(0xFF3D50FA)),
-    BLUE(Color(0xFF5664B7)),
-    PURPLE(Color(0xFF6200EA)),
-    GREEN(Color(0xFF00BFA5)),
-    GREEN_APPLE(Color(0xFF48E484)),
-    RED(Color(0xFFD50000)),
-    BANANA(Color(0xFFE4D448)),
-    PARTY(Color(0xFFEA596E)),
-    PINK(Color(0xFFFF1493)),
-    CARNATION_PINK(Color(0xFFBD5DA5)),
-    MAROON(Color(0xFF451010)),
-    DARK_GREEN(Color(0xFF004500)),
-    NAVY_BLUE(Color(0xFF000080)),
-    GREY(Color(0xFF515151)),
-    WHITE(Color(0xFFFFFFFF)),
-    BROWN(Color(0xFF622C00)),
-    ORANGE(Color(0xFFCE8500)),
-    DANDELION_YELLOW(Color(0xFFF5BB00)),
-    COOL_BLUE(Color(0xFF408CAC)),
-    LAVENDER(Color(0xFF6F55AF)),
-    DYNAMIC(Color(0xFF3D50FA)),
-    DYNAMIC_TWO(Color(0xFF3D50FA)),
-}
-
-
-internal object CloudStreamPalette {
-    // Default dark (AppTheme / Black)
-    val Primary = Color(0xFF3D50FA)
-    val PrimaryDark = Color(0xFF3700B3)
-    val Ongoing = Color(0xFFF53B66)
-
-    val DarkPrimaryGrayBg = Color(0xFF2B2C30)
-    val DarkBlackBg = Color(0xFF111111)
-    val DarkIconGrayBg = Color(0xFF1C1C20)
-    val DarkBoxItemBg = Color(0xFF161616)
-    val DarkText = Color(0xFFE9EAEE)
-    val DarkGrayText = Color(0xFF9BA0A4)
-    val DarkIcon = Color(0xFF9BA0A6)
-
-    // Amoled
-    val AmoledBlack = Color(0xFF000000)
-    val AmoledNearBlack = Color(0xFF121212)
-
-    // Light
-    val LightPrimaryGrayBg = Color(0xFFF1F1F1)
-    val LightBlackBg = Color(0xFFFFFFFF)
-    val LightIconGrayBg = Color(0xFFEEEEEE)
-    val LightBoxItemBg = Color(0xFFEEEEEE)
-    val LightText = Color(0xFF202125)
-    val LightGrayText = Color(0xFF5F6267)
-    val LightIcon = Color(0xFF5F6267)
-
-    // Dracula
-    val DraculaPrimaryGrayBg = Color(0xFF414450)
-    val DraculaBlackBg = Color(0xFF282A36)
-    val DraculaIconGrayBg = Color(0xFF44475A)
-    val DraculaBoxItemBg = Color(0xFF373844)
-    val DraculaText = Color(0xFFF8F8F2)
-    val DraculaGrayText = Color(0xFF6272A4)
-    val DraculaIcon = Color(0xFF6272A4)
-
-    // Lavender Dreams
-    val LavenderPrimaryGrayBg = Color(0xFFF7EEFC)
-    val LavenderBlackBg = Color(0xFFFDF0FB)
-    val LavenderIconGrayBg = Color(0xFFB794F6)
-    val LavenderBoxItemBg = Color(0xFFF8F5FF)
-    val LavenderText = Color(0xFF2D1B47)
-    val LavenderGrayText = Color(0xFF9AB3FF)
-    val LavenderIcon = Color(0xFF7C3AED)
-
-    // Silent Blue
-    val SilentBluePrimaryGrayBg = Color(0xFF282F49)
-    val SilentBlueBlackBg = Color(0xFF151A30)
-    val SilentBlueIconGrayBg = Color(0xFF3A446A)
-    val SilentBlueBoxItemBg = Color(0xFF3A446A)
-    val SilentBlueText = Color(0xFFE0E1F3)
-    val SilentBlueGrayText = Color(0xFF7B83B0)
-    val SilentBlueIcon = Color(0xFF7B83B0)
-}
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Scheme.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Scheme.kt
deleted file mode 100644
index d51c75d08..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Scheme.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.Color
-
-/**
- * Maps to the XML custom attrs declared in attrs.xml:
- * TODO: Remove this comment when we migrate fully
- *  and attrs.xml will no longer be used at all.
- *
- * | XML ?attr                | Here               |
- * |--------------------------|--------------------|
- * | primaryBlackBackground   | [background]       |
- * | primaryGrayBackground    | [surfaceVariant]   |
- * | iconGrayBackground       | [surface]          |
- * | boxItemBackground        | [surfaceContainer] |
- * | textColor                | [onBackground]     |
- * | grayTextColor            | [onSurfaceVariant] |
- * | iconColor                | [icon]             |
- * | colorPrimary             | [primary]          |
- * | colorOngoing             | [ongoing]          |
- *
- * All fields are [MutableState] so Compose recomposes automatically
- * if the scheme is swapped at runtime (e.g. user changes theme without restart).
- */
-@Stable
-class CloudStreamColorScheme(
-    background: Color,
-    surfaceVariant: Color,
-    surface: Color,
-    surfaceContainer: Color,
-    onBackground: Color,
-    onSurfaceVariant: Color,
-    icon: Color,
-    primary: Color,
-    ongoing: Color,
-    isLight: Boolean,
-) {
-    /** primaryBlackBackground */
-    var background by mutableStateOf(background)
-
-    /** primaryGrayBackground */
-    var surfaceVariant by mutableStateOf(surfaceVariant)
-
-    /** iconGrayBackground */
-    var surface by mutableStateOf(surface)
-
-    /** boxItemBackground */
-    var surfaceContainer by mutableStateOf(surfaceContainer)
-
-    /** textColor */
-    var onBackground by mutableStateOf(onBackground)
-
-    /** grayTextColor */
-    var onSurfaceVariant by mutableStateOf(onSurfaceVariant)
-
-    /** iconColor */
-    var icon by mutableStateOf(icon)
-
-    /** colorPrimary */
-    var primary by mutableStateOf(primary)
-
-    /** colorOngoing */
-    var ongoing by mutableStateOf(ongoing)
-    var isLight by mutableStateOf(isLight)
-
-    fun copy(
-        background: Color = this.background,
-        surfaceVariant: Color = this.surfaceVariant,
-        surface: Color = this.surface,
-        surfaceContainer: Color = this.surfaceContainer,
-        onBackground: Color = this.onBackground,
-        onSurfaceVariant: Color = this.onSurfaceVariant,
-        icon: Color = this.icon,
-        primary: Color = this.primary,
-        ongoing: Color = this.ongoing,
-        isLight: Boolean = this.isLight,
-    ) = CloudStreamColorScheme(
-        background, surfaceVariant, surface, surfaceContainer,
-        onBackground, onSurfaceVariant, icon, primary, ongoing, isLight,
-    )
-}
-
-internal fun darkScheme() = CloudStreamColorScheme(
-    background = CloudStreamPalette.DarkBlackBg,
-    surfaceVariant = CloudStreamPalette.DarkPrimaryGrayBg,
-    surface = CloudStreamPalette.DarkIconGrayBg,
-    surfaceContainer = CloudStreamPalette.DarkBoxItemBg,
-    onBackground = CloudStreamPalette.DarkText,
-    onSurfaceVariant = CloudStreamPalette.DarkGrayText,
-    icon = CloudStreamPalette.DarkIcon,
-    primary = CloudStreamPalette.Primary,
-    ongoing = CloudStreamPalette.Ongoing,
-    isLight = false,
-)
-
-
-internal fun amoledScheme() = darkScheme().copy(
-    background = CloudStreamPalette.AmoledBlack,
-    surface = CloudStreamPalette.AmoledBlack,
-    surfaceVariant = CloudStreamPalette.AmoledBlack,
-    surfaceContainer = CloudStreamPalette.AmoledBlack,
-)
-
-internal fun amoledLightScheme() = amoledScheme().copy(
-    surfaceVariant = CloudStreamPalette.AmoledNearBlack,
-)
-
-internal fun lightScheme() = CloudStreamColorScheme(
-    background = CloudStreamPalette.LightBlackBg,
-    surfaceVariant = CloudStreamPalette.LightPrimaryGrayBg,
-    surface = CloudStreamPalette.LightIconGrayBg,
-    surfaceContainer = CloudStreamPalette.LightBoxItemBg,
-    onBackground = CloudStreamPalette.LightText,
-    onSurfaceVariant = CloudStreamPalette.LightGrayText,
-    icon = CloudStreamPalette.LightIcon,
-    primary = CloudStreamPalette.Primary,
-    ongoing = CloudStreamPalette.Ongoing,
-    isLight = true,
-)
-
-internal fun draculaScheme() = CloudStreamColorScheme(
-    background = CloudStreamPalette.DraculaBlackBg,
-    surfaceVariant = CloudStreamPalette.DraculaPrimaryGrayBg,
-    surface = CloudStreamPalette.DraculaIconGrayBg,
-    surfaceContainer = CloudStreamPalette.DraculaBoxItemBg,
-    onBackground = CloudStreamPalette.DraculaText,
-    onSurfaceVariant = CloudStreamPalette.DraculaGrayText,
-    icon = CloudStreamPalette.DraculaIcon,
-    primary = CloudStreamPalette.Primary,
-    ongoing = CloudStreamPalette.Ongoing,
-    isLight = false,
-)
-
-internal fun lavenderScheme() = CloudStreamColorScheme(
-    background = CloudStreamPalette.LavenderBlackBg,
-    surfaceVariant = CloudStreamPalette.LavenderPrimaryGrayBg,
-    surface = CloudStreamPalette.LavenderIconGrayBg,
-    surfaceContainer = CloudStreamPalette.LavenderBoxItemBg,
-    onBackground = CloudStreamPalette.LavenderText,
-    onSurfaceVariant = CloudStreamPalette.LavenderGrayText,
-    icon = CloudStreamPalette.LavenderIcon,
-    primary = CloudStreamPalette.Primary,
-    ongoing = CloudStreamPalette.Ongoing,
-    isLight = true,
-)
-
-internal fun silentBlueScheme() = CloudStreamColorScheme(
-    background = CloudStreamPalette.SilentBlueBlackBg,
-    surfaceVariant = CloudStreamPalette.SilentBluePrimaryGrayBg,
-    surface = CloudStreamPalette.SilentBlueIconGrayBg,
-    surfaceContainer = CloudStreamPalette.SilentBlueBoxItemBg,
-    onBackground = CloudStreamPalette.SilentBlueText,
-    onSurfaceVariant = CloudStreamPalette.SilentBlueGrayText,
-    icon = CloudStreamPalette.SilentBlueIcon,
-    primary = CloudStreamPalette.Primary,
-    ongoing = CloudStreamPalette.Ongoing,
-    isLight = false,
-)
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Theme.kt b/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Theme.kt
deleted file mode 100644
index 196d8d6a1..000000000
--- a/shared/src/commonMain/kotlin/com/lagradost/cloudstream4/theme/Theme.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import androidx.compose.animation.core.InfiniteTransition
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.graphics.Color
-
-enum class CloudStreamThemeMode {
-    /** "Black" standard dark, #111111 backgrounds */
-    Dark,
-
-    /** "Amoled" / "AmoledLight" pure black (#000000) */
-    Amoled,
-
-    /** "AmoledLight" pure black (#000000) */
-    AmoledLight,
-
-    /** "Light" white/gray backgrounds, dark text */
-    Light,
-
-    /** "Dracula" */
-    Dracula,
-
-    /** "Lavender" */
-    Lavender,
-
-    /** "SilentBlue" */
-    SilentBlue,
-
-    /** "System" resolved on each platform via [isSystemInDarkTheme] */
-    FollowSystem,
-
-    /**
-     * Uses platform dynamic color system, Material You on Android 12+,
-     * falls back to [Dark] on unsupported platforms.
-     */
-    Dynamic,
-}
-
-@Composable
-fun modeToTheme(mode : CloudStreamThemeMode, primaryColor: CloudStreamPrimaryColor) : CloudStreamColorScheme {
-    val dynamicTheme = DeviceTheme.resolveDynamicTheme()
-    val dynamicPrimary = DeviceTheme.resolveDynamicPrimaryColor()
-    val dynamicSecondary = DeviceTheme.resolveDynamicSecondaryColor()
-    val systemDark = isSystemInDarkTheme()
-    val color = remember(mode, primaryColor, systemDark, dynamicTheme, dynamicPrimary, dynamicSecondary) {
-        val base = when (mode) {
-            CloudStreamThemeMode.Dark -> darkScheme()
-            CloudStreamThemeMode.Amoled -> amoledScheme()
-            CloudStreamThemeMode.AmoledLight -> amoledLightScheme()
-            CloudStreamThemeMode.Light -> lightScheme()
-            CloudStreamThemeMode.Dracula -> draculaScheme()
-            CloudStreamThemeMode.Lavender -> lavenderScheme()
-            CloudStreamThemeMode.SilentBlue -> silentBlueScheme()
-            CloudStreamThemeMode.FollowSystem -> if (systemDark) darkScheme() else lightScheme()
-            CloudStreamThemeMode.Dynamic -> dynamicTheme
-        }
-        when {
-            mode == CloudStreamThemeMode.Dynamic -> base
-            primaryColor == CloudStreamPrimaryColor.DYNAMIC -> base.copy(primary = dynamicPrimary)
-            primaryColor == CloudStreamPrimaryColor.DYNAMIC_TWO -> base.copy(primary = dynamicSecondary)
-            else -> base.copy(primary = primaryColor.color)
-        }
-    }
-    return color
-}
-
-private fun CloudStreamColorScheme.toMaterial3ColorScheme() = if (isLight) {
-    lightColorScheme(
-        primary = primary,
-        background = background,
-        surface = surface,
-        surfaceVariant = surfaceVariant,
-        surfaceContainer = surfaceContainer,
-        onBackground = onBackground,
-        onSurface = onBackground,
-        onSurfaceVariant = onSurfaceVariant,
-        onPrimary = Color.White,
-    )
-} else {
-    darkColorScheme(
-        primary = primary,
-        background = background,
-        surface = surface,
-        surfaceVariant = surfaceVariant,
-        surfaceContainer = surfaceContainer,
-        onBackground = onBackground,
-        onSurface = onBackground,
-        onSurfaceVariant = onSurfaceVariant,
-        onPrimary = Color.White,
-    )
-}
-
-internal val LocalSharedInfiniteTransition = staticCompositionLocalOf<InfiniteTransition> { throw NotImplementedError() }
-
-/**
- * Global synchronized animation, so many items in e.g. a LazyList can animate at the same time,
- * even if they appeared at different times
- * */
-@Composable
-@ReadOnlyComposable
-fun MaterialTheme.infiniteSharedTransition() = LocalSharedInfiniteTransition.current
-
-@Composable
-fun CloudStreamPreviewTheme(content: @Composable () -> Unit) {
-    CloudStreamTheme(content = content)
-}
-
-@Composable
-fun CloudStreamTheme(
-    mode: CloudStreamThemeMode = CloudStreamThemeMode.FollowSystem,
-    primaryColor: CloudStreamPrimaryColor = CloudStreamPrimaryColor.NORMAL,
-    content: @Composable () -> Unit,
-) {
-    val csColors = modeToTheme(mode, primaryColor)
-    val globalTransition = rememberInfiniteTransition(label = "GlobalSharedTransition")
-    // We do not provide csColors as a global, because people should use MaterialTheme directly instead
-    CompositionLocalProvider(LocalSharedInfiniteTransition provides globalTransition) {
-        MaterialTheme(
-            colorScheme = csColors.toMaterial3ColorScheme(),
-            content = content,
-            typography = AppFont.typography
-        )
-    }
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/LICENSE b/shared/src/commonMain/kotlin/com/mihon/LICENSE
deleted file mode 100644
index d9a10c0d8..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/LICENSE
+++ /dev/null
@@ -1,176 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/shared/src/commonMain/kotlin/com/mihon/common/preference/InMemoryPreferenceStore.kt b/shared/src/commonMain/kotlin/com/mihon/common/preference/InMemoryPreferenceStore.kt
deleted file mode 100644
index 5c604e540..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/common/preference/InMemoryPreferenceStore.kt
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.mihon.common.preference
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.stateIn
-
-/**
- * Local-copy implementation of PreferenceStore mostly for test and preview purposes
- */
-class InMemoryPreferenceStore(
-    initialPreferences: Sequence<InMemoryPreference<*>> = sequenceOf(),
-) : PreferenceStore {
-
-    private val preferences: Map<String, PreferenceData<*>> =
-        initialPreferences.toList().associateBy { it.key() }
-
-    override fun getString(key: String, defaultValue: String): PreferenceData<String> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: String? = preferences[key]?.get() as? String
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    override fun getLong(key: String, defaultValue: Long): PreferenceData<Long> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: Long? = preferences[key]?.get() as? Long
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    override fun getInt(key: String, defaultValue: Int): PreferenceData<Int> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: Int? = preferences[key]?.get() as? Int
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    override fun getFloat(key: String, defaultValue: Float): PreferenceData<Float> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: Float? = preferences[key]?.get() as? Float
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    override fun getBoolean(key: String, defaultValue: Boolean): PreferenceData<Boolean> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: Boolean? = preferences[key]?.get() as? Boolean
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    override fun getStringSet(key: String, defaultValue: Set<String>): PreferenceData<Set<String>> {
-        val default = InMemoryPreference(key, null, defaultValue)
-
-        @Suppress("UNCHECKED_CAST")
-        val data: Set<String>? = preferences[key]?.get() as? Set<String>
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T> getObjectFromString(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> String,
-        deserializer: (String) -> T,
-    ): PreferenceData<T> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: T? = preferences[key]?.get() as? T
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T> getObjectFromInt(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> Int,
-        deserializer: (Int) -> T,
-    ): PreferenceData<T> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: T? = preferences[key]?.get() as? T
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T> getObjectSetFromStringSet(
-        key: String,
-        defaultValue: Set<T>,
-        serializer: (T) -> String,
-        deserializer: (String) -> T?,
-    ): PreferenceData<Set<T>> {
-        val default = InMemoryPreference(key, null, defaultValue)
-        val data: Set<T>? = preferences[key]?.get() as? Set<T>
-        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
-    }
-
-    override fun getAll(): Map<String, *> {
-        return preferences
-    }
-
-    class InMemoryPreference<T>(
-        private val key: String,
-        private var data: T?,
-        private val defaultValue: T,
-    ) : PreferenceData<T> {
-        override fun key(): String = key
-
-        override fun get(): T = data ?: defaultValue()
-
-        override fun isSet(): Boolean = data != null
-
-        override fun delete() {
-            data = null
-        }
-
-        override fun defaultValue(): T = defaultValue
-
-        override fun changes(): Flow<T> = flow { data }
-
-        override fun stateIn(scope: CoroutineScope): StateFlow<T> {
-            return changes().stateIn(scope, SharingStarted.Eagerly, get())
-        }
-
-        override fun set(value: T) {
-            data = value
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/common/preference/PreferenceData.kt b/shared/src/commonMain/kotlin/com/mihon/common/preference/PreferenceData.kt
deleted file mode 100644
index 16aeb41bc..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/common/preference/PreferenceData.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.mihon.common.preference
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-interface PreferenceData<T> {
-
-    fun key(): String
-
-    fun get(): T
-
-    fun set(value: T)
-
-    fun isSet(): Boolean
-
-    fun delete()
-
-    fun defaultValue(): T
-
-    fun changes(): Flow<T>
-
-    fun stateIn(scope: CoroutineScope): StateFlow<T>
-
-    companion object {
-        /**
-         * A preference that should not be exposed in places like backups without user consent.
-         */
-        fun isPrivate(key: String): Boolean {
-            return key.startsWith(PRIVATE_PREFIX)
-        }
-        fun privateKey(key: String): String {
-            return "$PRIVATE_PREFIX$key"
-        }
-
-        /**
-         * A preference used for internal app state that isn't really a user preference
-         * and therefore should not be in places like backups.
-         */
-        fun isAppState(key: String): Boolean {
-            return key.startsWith(APP_STATE_PREFIX)
-        }
-        fun appStateKey(key: String): String {
-            return "$APP_STATE_PREFIX$key"
-        }
-
-        private const val APP_STATE_PREFIX = "__APP_STATE_"
-        private const val PRIVATE_PREFIX = "__PRIVATE_"
-    }
-}
-
-inline fun <reified T, R : T> PreferenceData<T>.getAndSet(crossinline block: (T) -> R) = set(
-    block(get()),
-)
-
-operator fun <T> PreferenceData<Set<T>>.plusAssign(item: T) {
-    set(get() + item)
-}
-
-operator fun <T> PreferenceData<Set<T>>.plusAssign(items: Iterable<T>) {
-    set(get() + items)
-}
-
-operator fun <T> PreferenceData<Set<T>>.minusAssign(item: T) {
-    set(get() - item)
-}
-
-fun PreferenceData<Boolean>.toggle(): Boolean {
-    set(!get())
-    return get()
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/common/preference/PreferenceStore.kt b/shared/src/commonMain/kotlin/com/mihon/common/preference/PreferenceStore.kt
deleted file mode 100644
index 6075fb45c..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/common/preference/PreferenceStore.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.mihon.common.preference
-
-interface PreferenceStore {
-
-    fun getString(key: String, defaultValue: String = ""): PreferenceData<String>
-
-    fun getLong(key: String, defaultValue: Long = 0): PreferenceData<Long>
-
-    fun getInt(key: String, defaultValue: Int = 0): PreferenceData<Int>
-
-    fun getFloat(key: String, defaultValue: Float = 0f): PreferenceData<Float>
-
-    fun getBoolean(key: String, defaultValue: Boolean = false): PreferenceData<Boolean>
-
-    fun getStringSet(key: String, defaultValue: Set<String> = emptySet()): PreferenceData<Set<String>>
-
-    fun <T> getObjectFromString(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> String,
-        deserializer: (String) -> T,
-    ): PreferenceData<T>
-
-    fun <T> getObjectFromInt(
-        key: String,
-        defaultValue: T,
-        serializer: (T) -> Int,
-        deserializer: (Int) -> T,
-    ): PreferenceData<T>
-
-    fun <T> getObjectSetFromStringSet(
-        key: String,
-        defaultValue: Set<T>,
-        serializer: (T) -> String,
-        deserializer: (String) -> T?,
-    ): PreferenceData<Set<T>>
-
-    fun getAll(): Map<String, *>
-}
-
-fun PreferenceStore.getLongArray(
-    key: String,
-    defaultValue: List<Long>,
-): PreferenceData<List<Long>> {
-    return getObjectFromString(
-        key = key,
-        defaultValue = defaultValue,
-        serializer = { it.joinToString(",") },
-        deserializer = { it.split(",").mapNotNull { l -> l.toLongOrNull() } },
-    )
-}
-
-inline fun <reified T : Enum<T>> PreferenceStore.getEnum(
-    key: String,
-    defaultValue: T,
-): PreferenceData<T> {
-    return getObjectFromString(
-        key = key,
-        defaultValue = defaultValue,
-        serializer = { it.name },
-        deserializer = {
-            try {
-                enumValueOf(it)
-            } catch (e: IllegalArgumentException) {
-                defaultValue
-            }
-        },
-    )
-}
-
-inline fun <reified T : Enum<T>> PreferenceStore.getEnumSet(
-    key: String,
-    defaultValue: Set<T>,
-): PreferenceData<Set<T>> {
-    return getObjectSetFromStringSet(
-        key = key,
-        defaultValue = defaultValue,
-        serializer = { it.name },
-        deserializer = {
-            try {
-                enumValueOf<T>(it)
-            } catch (_: IllegalArgumentException) {
-                null
-            }
-        },
-    )
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/AppBar.kt b/shared/src/commonMain/kotlin/com/mihon/material/AppBar.kt
deleted file mode 100644
index e54441595..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/AppBar.kt
+++ /dev/null
@@ -1,406 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.foundation.basicMarquee
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.action_bar_up_description
-import com.lagradost.cloudstream4.generated.resources.arrow_back
-import com.lagradost.cloudstream4.generated.resources.cancel
-import com.lagradost.cloudstream4.generated.resources.close
-import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.compose.resources.stringResource
-
-@Composable
-fun AppBar(
-    title: String?,
-
-    modifier: Modifier = Modifier,
-    backgroundColor: Color? = null,
-    // Text
-    subtitle: String? = null,
-    // Up button
-    navigateUp: (() -> Unit)? = null,
-    navigationIcon: Painter? = null,
-    // Menu
-    actions: @Composable RowScope.() -> Unit = {},
-    // Action mode
-    actionModeCounter: Int = 0,
-    onCancelActionMode: () -> Unit = {},
-    actionModeActions: @Composable RowScope.() -> Unit = {},
-
-    scrollBehavior: TopAppBarScrollBehavior? = null,
-) {
-    val isActionMode by remember(actionModeCounter) {
-        derivedStateOf { actionModeCounter > 0 }
-    }
-
-    AppBar(
-        modifier = modifier,
-        backgroundColor = backgroundColor,
-        titleContent = {
-            if (isActionMode) {
-                AppBarTitle(actionModeCounter.toString())
-            } else {
-                AppBarTitle(title, subtitle = subtitle)
-            }
-        },
-        navigateUp = navigateUp,
-        navigationIcon = navigationIcon,
-        actions = {
-            if (isActionMode) {
-                actionModeActions()
-            } else {
-                actions()
-            }
-        },
-        isActionMode = isActionMode,
-        onCancelActionMode = onCancelActionMode,
-        scrollBehavior = scrollBehavior,
-    )
-}
-
-@Composable
-fun AppBar(
-    // Title
-    titleContent: @Composable () -> Unit,
-
-    modifier: Modifier = Modifier,
-    backgroundColor: Color? = null,
-    // Up button
-    navigateUp: (() -> Unit)? = null,
-    navigationIcon: Painter? = null,
-    // Menu
-    actions: @Composable RowScope.() -> Unit = {},
-    // Action mode
-    isActionMode: Boolean = false,
-    onCancelActionMode: () -> Unit = {},
-
-    scrollBehavior: TopAppBarScrollBehavior? = null,
-) {
-    Column(
-        modifier = modifier,
-    ) {
-        TopAppBar(
-            // TODO @WindowInsets remove this when we have converted everything to compose
-            windowInsets = WindowInsets(0, 0, 0, 0),
-            navigationIcon = {
-                if (isActionMode) {
-                    IconButton(onClick = onCancelActionMode) {
-                        Icon(
-                            painter = painterResource(Res.drawable.close),
-                            contentDescription = stringResource(Res.string.cancel),
-                        )
-                    }
-                } else {
-                    navigateUp?.let {
-                        IconButton(onClick = it) {
-                            UpIcon(navigationIcon = navigationIcon)
-                        }
-                    }
-                }
-            },
-            title = titleContent,
-            actions = actions,
-            colors = TopAppBarDefaults.topAppBarColors(
-                containerColor = backgroundColor ?: MaterialTheme.colorScheme.surfaceColorAtElevation(
-                    elevation = if (isActionMode) 3.dp else 0.dp,
-                ),
-            ),
-            scrollBehavior = scrollBehavior,
-        )
-    }
-}
-
-@Composable
-fun AppBarTitle(
-    title: String?,
-    modifier: Modifier = Modifier,
-    subtitle: String? = null,
-) {
-    Column(modifier = modifier) {
-        title?.let {
-            Text(
-                text = it,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-            )
-        }
-        subtitle?.let {
-            Text(
-                text = it,
-                style = MaterialTheme.typography.bodyMedium,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier.basicMarquee(
-                    repeatDelayMillis = 2_000,
-                ),
-            )
-        }
-    }
-}
-
-/*
-@Composable
-fun AppBarActions(
-    actions: List<AppBar.AppBarAction>,
-) {
-    var showMenu by remember { mutableStateOf(false) }
-
-    actions.filterIsInstance<AppBar.Action>().map {
-        TooltipBox(
-            positionProvider = rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
-            tooltip = {
-                PlainTooltip {
-                    Text(it.title)
-                }
-            },
-            state = rememberTooltipState(),
-            focusable = false,
-        ) {
-            IconButton(
-                onClick = it.onClick,
-                enabled = it.enabled,
-            ) {
-                Icon(
-                    imageVector = it.icon,
-                    tint = it.iconTint ?: LocalContentColor.current,
-                    contentDescription = it.title,
-                )
-            }
-        }
-    }
-
-    val overflowActions = actions.filterIsInstance<AppBar.OverflowAction>()
-    if (overflowActions.isNotEmpty()) {
-        TooltipBox(
-            positionProvider = rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
-            tooltip = {
-                PlainTooltip {
-                    Text(stringResource(MR.strings.action_menu_overflow_description))
-                }
-            },
-            state = rememberTooltipState(),
-            focusable = false,
-        ) {
-            IconButton(
-                onClick = { showMenu = !showMenu },
-            ) {
-                Icon(
-                    MaterialSymbols.Rounded.MoreVert,
-                    contentDescription = stringResource(MR.strings.action_menu_overflow_description),
-                )
-            }
-        }
-
-        DropdownMenu(
-            expanded = showMenu,
-            onDismissRequest = { showMenu = false },
-        ) {
-            overflowActions.map {
-                DropdownMenuItem(
-                    onClick = {
-                        it.onClick()
-                        showMenu = false
-                    },
-                    text = { Text(it.title, fontWeight = FontWeight.Normal) },
-                )
-            }
-        }
-    }
-}*/
-
-/*
-/**
- * @param searchEnabled Set to false if you don't want to show search action.
- * @param searchQuery If null, use normal toolbar.
- * @param placeholderText If null, [MR.strings.action_search_hint] is used.
- */
-@Composable
-fun SearchToolbar(
-    searchQuery: String?,
-    onChangeSearchQuery: (String?) -> Unit,
-    modifier: Modifier = Modifier,
-    titleContent: @Composable () -> Unit = {},
-    navigateUp: (() -> Unit)? = null,
-    searchEnabled: Boolean = true,
-    placeholderText: String? = null,
-    onSearch: (String) -> Unit = {},
-    onClickCloseSearch: () -> Unit = { onChangeSearchQuery(null) },
-    actions: @Composable RowScope.() -> Unit = {},
-    scrollBehavior: TopAppBarScrollBehavior? = null,
-    visualTransformation: VisualTransformation = VisualTransformation.None,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-) {
-    val focusRequester = remember { FocusRequester() }
-
-    AppBar(
-        modifier = modifier,
-        titleContent = {
-            if (searchQuery == null) return@AppBar titleContent()
-
-            val keyboardController = LocalSoftwareKeyboardController.current
-            val focusManager = LocalFocusManager.current
-
-            val searchAndClearFocus: () -> Unit = f@{
-                if (searchQuery.isBlank()) return@f
-                onSearch(searchQuery)
-                focusManager.clearFocus()
-                keyboardController?.hide()
-                focusManager.moveFocus(FocusDirection.Next)
-            }
-
-            BasicTextField(
-                value = searchQuery,
-                onValueChange = onChangeSearchQuery,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .focusRequester(focusRequester)
-                    .runOnEnterKeyPressed(action = searchAndClearFocus)
-                    .showSoftKeyboard(remember { searchQuery.isEmpty() })
-                    .clearFocusOnSoftKeyboardHide(),
-                textStyle = MaterialTheme.typography.titleMedium.copy(
-                    color = MaterialTheme.colorScheme.onBackground,
-                    fontWeight = FontWeight.Normal,
-                    fontSize = 18.sp,
-                ),
-                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-                keyboardActions = KeyboardActions(onSearch = { searchAndClearFocus() }),
-                singleLine = true,
-                cursorBrush = SolidColor(MaterialTheme.colorScheme.onBackground),
-                visualTransformation = visualTransformation,
-                interactionSource = interactionSource,
-                decorationBox = { innerTextField ->
-                    TextFieldDefaults.DecorationBox(
-                        value = searchQuery,
-                        innerTextField = innerTextField,
-                        enabled = true,
-                        singleLine = true,
-                        visualTransformation = visualTransformation,
-                        interactionSource = interactionSource,
-                        placeholder = {
-                            Text(
-                                modifier = Modifier.secondaryItemAlpha(),
-                                text = (placeholderText ?: stringResource(MR.strings.action_search_hint)),
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis,
-                                style = MaterialTheme.typography.titleMedium.copy(
-                                    fontSize = 18.sp,
-                                    fontWeight = FontWeight.Normal,
-                                ),
-                            )
-                        },
-                        container = {},
-                    )
-                },
-            )
-        },
-        navigateUp = if (searchQuery == null) navigateUp else onClickCloseSearch,
-        actions = {
-            key("search") {
-                val onClick = { onChangeSearchQuery("") }
-
-                if (!searchEnabled) {
-                    // Don't show search action
-                } else if (searchQuery == null) {
-                    TooltipBox(
-                        positionProvider = rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
-                        tooltip = {
-                            PlainTooltip {
-                                Text(stringResource(MR.strings.action_search))
-                            }
-                        },
-                        state = rememberTooltipState(),
-                        focusable = false,
-                    ) {
-                        IconButton(
-                            onClick = onClick,
-                        ) {
-                            Icon(
-                                MaterialSymbols.Rounded.Search,
-                                contentDescription = stringResource(MR.strings.action_search),
-                            )
-                        }
-                    }
-                } else if (searchQuery.isNotEmpty()) {
-                    TooltipBox(
-                        positionProvider = rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
-                        tooltip = {
-                            PlainTooltip {
-                                Text(stringResource(MR.strings.action_reset))
-                            }
-                        },
-                        state = rememberTooltipState(),
-                        focusable = false,
-                    ) {
-                        IconButton(
-                            onClick = {
-                                onClick()
-                                focusRequester.requestFocus()
-                            },
-                        ) {
-                            Icon(
-                                MaterialSymbols.Rounded.Close,
-                                contentDescription = stringResource(MR.strings.action_reset),
-                            )
-                        }
-                    }
-                }
-            }
-
-            key("actions") { actions() }
-        },
-        isActionMode = false,
-        scrollBehavior = scrollBehavior,
-    )
-}*/
-
-@Composable
-fun UpIcon(
-    modifier: Modifier = Modifier,
-    navigationIcon: Painter? = null,
-) {
-    val icon = navigationIcon
-        ?: painterResource(Res.drawable.arrow_back)
-    Icon(
-        painter = icon,
-        contentDescription = stringResource(Res.string.action_bar_up_description),
-        modifier = modifier,
-    )
-}
-/*
-sealed interface AppBar {
-    sealed interface AppBarAction
-
-    data class Action(
-        val title: String,
-        val icon: ImageVector,
-        val iconTint: Color? = null,
-        val onClick: () -> Unit,
-        val enabled: Boolean = true,
-    ) : AppBarAction
-
-    data class OverflowAction(
-        val title: String,
-        val onClick: () -> Unit,
-    ) : AppBarAction
-}
-*/
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/Constants.kt b/shared/src/commonMain/kotlin/com/mihon/material/Constants.kt
deleted file mode 100644
index 2b38b4485..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/Constants.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.ui.unit.dp
-
-val topSmallPaddingValues = PaddingValues(top = MaterialTheme.padding.small)
-
-const val DISABLED_ALPHA = .38f
-const val SECONDARY_ALPHA = .78f
-
-class Padding {
-
-    val extraLarge = 32.dp
-
-    val large = 24.dp
-
-    val medium = 16.dp
-
-    val small = 8.dp
-
-    val extraSmall = 4.dp
-}
-
-val MaterialTheme.padding: Padding
-    get() = Padding()
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/LabeledCheckbox.kt b/shared/src/commonMain/kotlin/com/mihon/material/LabeledCheckbox.kt
deleted file mode 100644
index 123bb34b7..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/LabeledCheckbox.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun LabeledCheckbox(
-    label: String,
-    checked: Boolean,
-    onCheckedChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-) {
-    Row(
-        modifier = modifier
-            .clip(MaterialTheme.shapes.small)
-            .fillMaxWidth()
-            .heightIn(min = 48.dp)
-            .clickable(
-                role = Role.Checkbox,
-                onClick = {
-                    if (enabled) {
-                        onCheckedChange(!checked)
-                    }
-                },
-            ),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
-    ) {
-        Checkbox(
-            checked = checked,
-            onCheckedChange = null,
-            enabled = enabled,
-        )
-
-        Text(text = label)
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/Pill.kt b/shared/src/commonMain/kotlin/com/mihon/material/Pill.kt
deleted file mode 100644
index 44d6c2931..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/Pill.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun Pill(
-    text: String,
-    modifier: Modifier = Modifier,
-    color: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
-    contentColor: Color = MaterialTheme.colorScheme.onSurface,
-    style: TextStyle = LocalTextStyle.current,
-) {
-    Surface(
-        modifier = modifier
-            .padding(start = 4.dp),
-        shape = MaterialTheme.shapes.extraLarge,
-        color = color,
-        contentColor = contentColor,
-    ) {
-        Box(
-            modifier = Modifier
-                .padding(6.dp, 1.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text(
-                text = text,
-                maxLines = 1,
-                style = style,
-            )
-        }
-    }
-}
-
-@Composable
-fun Pill(
-    text: String,
-    modifier: Modifier = Modifier,
-    color: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
-    contentColor: Color = MaterialTheme.colorScheme.onSurface,
-    fontSize: TextUnit = LocalTextStyle.current.fontSize,
-) {
-    Pill(
-        text = text,
-        modifier = modifier,
-        color = color,
-        contentColor = contentColor,
-        style = LocalTextStyle.current.merge(fontSize = fontSize),
-    )
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/Scaffold.kt b/shared/src/commonMain/kotlin/com/mihon/material/Scaffold.kt
deleted file mode 100644
index 65c11f193..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/Scaffold.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.material3.FabPosition
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScaffoldDefaults
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.contentColorFor
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun Scaffold(
-    modifier: Modifier = Modifier,
-    topBarScrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(
-        rememberTopAppBarState(),
-    ),
-    topBar: @Composable (TopAppBarScrollBehavior) -> Unit = {},
-    bottomBar: @Composable () -> Unit = {},
-    snackbarHost: @Composable () -> Unit = {},
-    floatingActionButton: @Composable () -> Unit = {},
-    floatingActionButtonPosition: FabPosition = FabPosition.End,
-    containerColor: Color = MaterialTheme.colorScheme.background,
-    contentColor: Color = contentColorFor(containerColor),
-    contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
-    content: @Composable (PaddingValues) -> Unit,
-) {
-    var fabHeight by remember { mutableIntStateOf(0) }
-    val density = LocalDensity.current
-
-    Scaffold(
-        modifier = modifier.nestedScroll(topBarScrollBehavior.nestedScrollConnection),
-        topBar = { topBar(topBarScrollBehavior) },
-        bottomBar = bottomBar,
-        snackbarHost = snackbarHost,
-        floatingActionButton = {
-            Box(Modifier.onSizeChanged { fabHeight = it.height }) {
-                floatingActionButton()
-            }
-        },
-        floatingActionButtonPosition = floatingActionButtonPosition,
-        containerColor = containerColor,
-        contentColor = contentColor,
-        contentWindowInsets = contentWindowInsets,
-    ) { contentPadding ->
-        val paddingValues = remember(contentPadding) {
-            FabAwarePaddingValues(contentPadding) {
-                if (fabHeight == 0) 0.dp else with(density) { fabHeight.toDp() } + FabSpacing
-            }
-        }
-        content(paddingValues)
-    }
-}
-
-private class FabAwarePaddingValues(
-    private val base: PaddingValues,
-    private val extraBottom: () -> Dp,
-) : PaddingValues {
-    override fun calculateLeftPadding(layoutDirection: LayoutDirection): Dp =
-        base.calculateLeftPadding(layoutDirection)
-
-    override fun calculateTopPadding(): Dp = base.calculateTopPadding()
-
-    override fun calculateRightPadding(layoutDirection: LayoutDirection): Dp =
-        base.calculateRightPadding(layoutDirection)
-
-    override fun calculateBottomPadding(): Dp = base.calculateBottomPadding() + extraBottom()
-}
-private val FabSpacing = 16.dp
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/SettingsItems.kt b/shared/src/commonMain/kotlin/com/mihon/material/SettingsItems.kt
deleted file mode 100644
index ab640e685..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/SettingsItems.kt
+++ /dev/null
@@ -1,474 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.FlowRowScope
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyGridScope
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExposedDropdownMenuAnchorType
-import androidx.compose.material3.ExposedDropdownMenuBox
-import androidx.compose.material3.ExposedDropdownMenuDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream4.compose.whiteOutline
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.arrow_downward
-import com.lagradost.cloudstream4.generated.resources.arrow_upward
-import com.lagradost.cloudstream4.generated.resources.preview
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import com.mihon.common.preference.PreferenceData
-import com.mihon.common.preference.toggle
-import com.mihon.presentation.secondaryItemAlpha
-import com.mihon.presentation.settings.collectAsState
-import com.mihon.presentation.settings.widget.PrefsHorizontalPadding
-import org.jetbrains.compose.resources.StringResource
-import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.compose.resources.stringResource
-
-object SettingsItemsPaddings {
-    val Horizontal = 24.dp
-    val Vertical = 10.dp
-}
-
-@Composable
-fun HeadingItem(labelRes: StringResource) {
-    HeadingItem(stringResource(labelRes))
-}
-
-@Composable
-fun HeadingItem(text: String) {
-    Text(
-        text = text,
-        style = MaterialTheme.typography.header,
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(
-                horizontal = SettingsItemsPaddings.Horizontal,
-                vertical = SettingsItemsPaddings.Vertical,
-            ),
-    )
-}
-
-@Composable
-fun IconItem(label: String, icon: ImageVector, onClick: () -> Unit) {
-    BaseSettingsItem(
-        label = label,
-        widget = {
-            Icon(
-                imageVector = icon,
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.primary,
-            )
-        },
-        onClick = onClick,
-    )
-}
-
-@Composable
-fun SortItem(label: String, sortDescending: Boolean?, onClick: () -> Unit) {
-    val arrowIcon = when (sortDescending) {
-        true -> painterResource(Res.drawable.arrow_downward)
-        false -> painterResource(Res.drawable.arrow_upward)
-        null -> null
-    }
-
-    BaseSortItem(
-        label = label,
-        icon = arrowIcon,
-        onClick = onClick,
-    )
-}
-
-@Composable
-fun BaseSortItem(label: String, icon: Painter?, onClick: () -> Unit) {
-    BaseSettingsItem(
-        label = label,
-        widget = {
-            if (icon != null) {
-                Icon(
-                    painter = icon,
-                    contentDescription = null,
-                    tint = MaterialTheme.colorScheme.primary,
-                )
-            } else {
-                Spacer(modifier = Modifier.size(24.dp))
-            }
-        },
-        onClick = onClick,
-    )
-}
-
-@Composable
-fun CheckboxItem(label: String, pref: PreferenceData<Boolean>) {
-    val checked by pref.collectAsState()
-    CheckboxItem(
-        label = label,
-        checked = checked,
-        onClick = { pref.toggle() },
-    )
-}
-
-@Composable
-fun CheckboxItem(label: String, checked: Boolean, onClick: () -> Unit) {
-    BaseSettingsItem(
-        label = label,
-        widget = {
-            Checkbox(
-                checked = checked,
-                onCheckedChange = null,
-            )
-        },
-        onClick = onClick,
-    )
-}
-
-@Composable
-fun RadioItem(label: String, selected: Boolean, onClick: () -> Unit) {
-    BaseSettingsItem(
-        label = label,
-        widget = {
-            RadioButton(
-                selected = selected,
-                onClick = null,
-            )
-        },
-        onClick = onClick,
-    )
-}
-
-@Composable
-fun SliderItem(
-    value: Int,
-    valueRange: IntProgression,
-    label: String,
-    onChange: (Int) -> Unit,
-    steps: Int = with(valueRange) { (last - first) - 1 },
-    valueString: String = value.toString(),
-    labelStyle: TextStyle = MaterialTheme.typography.bodyMedium,
-    pillColor: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
-) {
-    BaseSliderItem(
-        value = value,
-        valueRange = valueRange,
-        steps = steps,
-        title = label,
-        valueString = valueString,
-        onChange = onChange,
-        titleStyle = labelStyle,
-        pillColor = pillColor,
-        modifier = Modifier.padding(
-            horizontal = SettingsItemsPaddings.Horizontal,
-            vertical = SettingsItemsPaddings.Vertical,
-        ),
-    )
-}
-
-@Composable
-fun BaseSliderItem(
-    value: Int,
-    valueRange: IntProgression,
-    title: String,
-    onChange: (Int) -> Unit,
-    modifier: Modifier = Modifier,
-    subtitle: String? = null,
-    steps: Int = with(valueRange) { (last - first) - 1 },
-    valueString: String = value.toString(),
-    titleStyle: TextStyle = MaterialTheme.typography.titleLarge,
-    subtitleStyle: TextStyle = MaterialTheme.typography.bodySmall,
-    pillColor: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
-    icon: Painter? = null,
-) {
-    var hasFocus by remember { mutableStateOf(false) }
-    val haptic = LocalHapticFeedback.current
-    Column(
-        modifier = Modifier.whiteOutline(hasFocus)
-            .fillMaxWidth()
-            .then(modifier),
-        verticalArrangement = Arrangement.spacedBy(2.dp),
-    ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
-        ) {
-            if (icon != null) {
-                Box(
-                    modifier = Modifier.padding(end = PrefsHorizontalPadding)
-                ) {
-                    Icon(
-                        painter = icon,
-                        contentDescription = null,
-                        tint = MaterialTheme.colorScheme.onBackground,
-                    )
-                }
-            }
-            Column(modifier = Modifier.weight(1f)) {
-                Text(
-                    text = title,
-                    style = titleStyle,
-                )
-                if (subtitle != null) {
-                    Text(
-                        text = subtitle,
-                        style = subtitleStyle,
-                        modifier = Modifier.secondaryItemAlpha(),
-                    )
-                }
-            }
-            Pill(
-                text = valueString,
-                style = MaterialTheme.typography.bodyMedium,
-                color = pillColor,
-            )
-        }
-        Slider(
-            modifier = Modifier.onFocusChanged { newFocus ->
-                hasFocus = newFocus.hasFocus
-            },
-            value = value,
-            onValueChange = f@{
-                if (it == value) return@f
-                onChange(it)
-                haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
-            },
-            valueRange = valueRange,
-            steps = steps,
-        )
-    }
-}
-
-@Composable
-@PreviewLightDark
-fun SliderItemPreview() {
-    CloudStreamPreviewTheme {
-        var value by remember { mutableIntStateOf(0) }
-        Surface {
-            BaseSliderItem(
-                value = value,
-                valueRange = 0..10,
-                title = "Item per row",
-                valueString = if (value == 0) "Auto" else value.toString(),
-                onChange = { value = it },
-                modifier = Modifier.padding(
-                    horizontal = SettingsItemsPaddings.Horizontal,
-                    vertical = SettingsItemsPaddings.Vertical,
-                ),
-                icon = painterResource(Res.drawable.preview)
-            )
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SelectItem(
-    label: String,
-    options: Array<out Any?>,
-    selectedIndex: Int,
-    onSelect: (Int) -> Unit,
-) {
-    var expanded by remember { mutableStateOf(false) }
-
-    ExposedDropdownMenuBox(
-        expanded = expanded,
-        onExpandedChange = { expanded = !expanded },
-    ) {
-        OutlinedTextField(
-            modifier = Modifier
-                .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
-                .fillMaxWidth()
-                .padding(
-                    horizontal = SettingsItemsPaddings.Horizontal,
-                    vertical = SettingsItemsPaddings.Vertical,
-                ),
-            label = { Text(text = label) },
-            value = options[selectedIndex].toString(),
-            onValueChange = {},
-            readOnly = true,
-            singleLine = true,
-            trailingIcon = {
-                ExposedDropdownMenuDefaults.TrailingIcon(
-                    expanded = expanded,
-                )
-            },
-            colors = ExposedDropdownMenuDefaults.textFieldColors(),
-        )
-
-        ExposedDropdownMenu(
-            modifier = Modifier.exposedDropdownSize(),
-            expanded = expanded,
-            onDismissRequest = { expanded = false },
-        ) {
-            options.forEachIndexed { index, text ->
-                DropdownMenuItem(
-                    text = { Text(text.toString()) },
-                    onClick = {
-                        onSelect(index)
-                        expanded = false
-                    },
-                    contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
-                )
-            }
-        }
-    }
-}
-
-/*
-@Composable
-fun TriStateItem(
-    label: String,
-    state: TriState,
-    enabled: Boolean = true,
-    onClick: ((TriState) -> Unit)?,
-) {
-    Row(
-        modifier = Modifier
-            .clickable(
-                enabled = enabled && onClick != null,
-                onClick = {
-                    when (state) {
-                        TriState.DISABLED -> onClick?.invoke(TriState.ENABLED_IS)
-                        TriState.ENABLED_IS -> onClick?.invoke(TriState.ENABLED_NOT)
-                        TriState.ENABLED_NOT -> onClick?.invoke(TriState.DISABLED)
-                    }
-                },
-            )
-            .fillMaxWidth()
-            .padding(
-                horizontal = SettingsItemsPaddings.Horizontal,
-                vertical = SettingsItemsPaddings.Vertical,
-            ),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.large),
-    ) {
-        val stateAlpha = if (enabled && onClick != null) 1f else DISABLED_ALPHA
-
-        Icon(
-            imageVector = when (state) {
-                TriState.DISABLED -> MaterialSymbols.Rounded.CheckBoxOutlineBlank
-                TriState.ENABLED_IS -> MaterialSymbols.RoundedFilled.CheckBox
-                TriState.ENABLED_NOT -> MaterialSymbols.RoundedFilled.DisabledByDefault
-            },
-            contentDescription = null,
-            tint = if (!enabled || state == TriState.DISABLED) {
-                MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = stateAlpha)
-            } else {
-                when (onClick) {
-                    null -> MaterialTheme.colorScheme.onSurface.copy(alpha = DISABLED_ALPHA)
-                    else -> MaterialTheme.colorScheme.primary
-                }
-            },
-        )
-        Text(
-            text = label,
-            color = MaterialTheme.colorScheme.onSurface.copy(alpha = stateAlpha),
-            style = MaterialTheme.typography.bodyMedium,
-        )
-    }
-}*/
-
-@Composable
-fun TextItem(label: String, value: String, onChange: (String) -> Unit) {
-    OutlinedTextField(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = SettingsItemsPaddings.Horizontal, vertical = 4.dp),
-        label = { Text(text = label) },
-        value = value,
-        onValueChange = onChange,
-        singleLine = true,
-    )
-}
-
-@Composable
-fun SettingsChipRow(labelRes: StringResource, content: @Composable FlowRowScope.() -> Unit) {
-    Column {
-        HeadingItem(labelRes)
-        FlowRow(
-            modifier = Modifier.padding(
-                start = SettingsItemsPaddings.Horizontal,
-                top = 0.dp,
-                end = SettingsItemsPaddings.Horizontal,
-                bottom = SettingsItemsPaddings.Vertical,
-            ),
-            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
-            content = content,
-        )
-    }
-}
-
-@Composable
-fun SettingsIconGrid(labelRes: StringResource, content: LazyGridScope.() -> Unit) {
-    Column {
-        HeadingItem(labelRes)
-        LazyVerticalGrid(
-            columns = GridCells.Adaptive(128.dp),
-            modifier = Modifier.padding(
-                start = SettingsItemsPaddings.Horizontal,
-                end = SettingsItemsPaddings.Horizontal,
-                bottom = SettingsItemsPaddings.Vertical,
-            ),
-            verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
-            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
-            content = content,
-        )
-    }
-}
-
-@Composable
-private fun BaseSettingsItem(
-    label: String,
-    widget: @Composable RowScope.() -> Unit,
-    onClick: () -> Unit,
-) {
-    Row(
-        modifier = Modifier
-            .clickable(onClick = onClick)
-            .fillMaxWidth()
-            .padding(
-                horizontal = SettingsItemsPaddings.Horizontal,
-                vertical = SettingsItemsPaddings.Vertical,
-            ),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(24.dp),
-    ) {
-        widget(this)
-        Text(
-            text = label,
-            style = MaterialTheme.typography.bodyMedium,
-        )
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/Slider.kt b/shared/src/commonMain/kotlin/com/mihon/material/Slider.kt
deleted file mode 100644
index 105c38ab8..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/Slider.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mihon.material
-
-import androidx.annotation.IntRange
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.height
-import androidx.compose.material3.Slider
-import androidx.compose.material3.SliderColors
-import androidx.compose.material3.SliderDefaults
-import androidx.compose.material3.SliderState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.dp
-import kotlin.math.roundToInt
-
-@Composable
-fun Slider(
-    value: Int,
-    onValueChange: (Int) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    valueRange: IntProgression = 0..1,
-    @IntRange(from = 0) steps: Int = with(valueRange) { (last - first) - 1 },
-    onValueChangeFinished: (() -> Unit)? = null,
-    colors: SliderColors = SliderDefaults.colors(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    thumb: @Composable (SliderState) -> Unit = {
-        SliderDefaults.Thumb(
-            interactionSource = interactionSource,
-            colors = colors,
-            enabled = enabled,
-            thumbSize = DpSize(4.0.dp, 34.0.dp)
-        )
-    },
-    track: @Composable (SliderState) -> Unit = { sliderState ->
-        SliderDefaults.Track(
-            modifier = Modifier.height(10.dp),
-            colors = colors,
-            enabled = enabled,
-            sliderState = sliderState
-        )
-    },
-) {
-    Slider(
-        value = value.toFloat(),
-        onValueChange = { onValueChange(it.roundToInt()) },
-        modifier = modifier,
-        enabled = enabled,
-        valueRange = with(valueRange) { first.toFloat()..last.toFloat() },
-        steps = steps,
-        onValueChangeFinished = onValueChangeFinished,
-        colors = colors,
-        interactionSource = interactionSource,
-        thumb = thumb,
-        track = track,
-    )
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/material/Typography.kt b/shared/src/commonMain/kotlin/com/mihon/material/Typography.kt
deleted file mode 100644
index 789f81539..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/material/Typography.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mihon.material
-
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Typography
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-
-val Typography.header: TextStyle
-    @Composable
-    get() = bodyMedium.copy(
-        color = MaterialTheme.colorScheme.onSurfaceVariant,
-        fontWeight = FontWeight.SemiBold,
-    )
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/Modifier.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/Modifier.kt
deleted file mode 100644
index 7a60342e9..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/Modifier.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.mihon.presentation
-
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.KeyEventType
-import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onPreviewKeyEvent
-import androidx.compose.ui.input.key.type
-import com.mihon.material.SECONDARY_ALPHA
-
-@Composable
-fun Modifier.selectedBackground(isSelected: Boolean): Modifier {
-    if (!isSelected) return this
-    val alpha = if (isSystemInDarkTheme()) 0.16f else 0.22f
-    val color = MaterialTheme.colorScheme.secondary.copy(alpha = alpha)
-    return this.drawBehind { drawRect(color) }
-}
-
-fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(SECONDARY_ALPHA)
-
-fun Modifier.clickableNoIndication(
-    onLongClick: (() -> Unit)? = null,
-    onClick: () -> Unit,
-) = this.combinedClickable(
-    interactionSource = null,
-    indication = null,
-    onLongClick = onLongClick,
-    onClick = onClick,
-)
-
-/**
- * For TextField, the provided [action] will be invoked when
- * physical enter key is pressed.
- *
- * Naturally, the TextField should be set to single line only.
- */
-fun Modifier.runOnEnterKeyPressed(action: () -> Unit): Modifier = this.onPreviewKeyEvent {
-    when (it.key) {
-        Key.Enter, Key.NumPadEnter -> {
-            // Physical keyboards generate two event types:
-            // - KeyDown when the key is pressed
-            // - KeyUp when the key is released
-            if (it.type == KeyEventType.KeyDown) {
-                action()
-                true
-            } else {
-                false
-            }
-        }
-
-        else -> false
-    }
-}
-
-/**
- * For TextField on AppBar, this modifier will request focus
- * to the element the first time it's composed.
- */
-@Composable
-fun Modifier.showSoftKeyboard(show: Boolean): Modifier {
-    if (!show) return this
-    val focusRequester = remember { FocusRequester() }
-    var openKeyboard by rememberSaveable { mutableStateOf(show) }
-    LaunchedEffect(focusRequester) {
-        if (openKeyboard) {
-            focusRequester.requestFocus()
-            openKeyboard = false
-        }
-    }
-    return this.focusRequester(focusRequester)
-}
-
-/*
-/**
- * For TextField, this modifier will clear focus when soft
- * keyboard is hidden.
- */
-@Composable
-fun Modifier.clearFocusOnSoftKeyboardHide(
-    onFocusCleared: (() -> Unit)? = null,
-): Modifier {
-    var isFocused by remember { mutableStateOf(false) }
-    var keyboardShowedSinceFocused by remember { mutableStateOf(false) }
-    if (isFocused) {
-        val imeVisible = WindowInsets.isImeVisible
-        val focusManager = LocalFocusManager.current
-        LaunchedEffect(imeVisible) {
-            if (imeVisible) {
-                keyboardShowedSinceFocused = true
-            } else if (keyboardShowedSinceFocused) {
-                focusManager.clearFocus()
-                onFocusCleared?.invoke()
-            }
-        }
-    }
-
-    return this.onFocusChanged {
-        if (isFocused != it.isFocused) {
-            if (isFocused) {
-                keyboardShowedSinceFocused = false
-            }
-            isFocused = it.isFocused
-        }
-    }
-}
-*/
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/Navigation.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/Navigation.kt
deleted file mode 100644
index 5cdb8aada..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/Navigation.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mihon.presentation
-
-import androidx.compose.runtime.ProvidableCompositionLocal
-import androidx.compose.runtime.staticCompositionLocalOf
-
-/**
- * For invoking back press to the parent activity
- */
-val LocalBackPress: ProvidableCompositionLocal<(() -> Unit)?> = staticCompositionLocalOf { null }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/Preference.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/Preference.kt
deleted file mode 100644
index 0fc381946..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/Preference.kt
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.mihon.presentation.settings
-
-import androidx.annotation.IntRange
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.remember
-import androidx.compose.ui.graphics.painter.Painter
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.none
-import com.mihon.common.preference.PreferenceData
-import org.jetbrains.compose.resources.stringResource
-
-sealed class Preference {
-    abstract val title: String
-    abstract val enabled: Boolean
-
-    sealed class PreferenceItem<T, R> : Preference() {
-        abstract val subtitle: String?
-        abstract val icon: Painter?
-        abstract val onValueChanged: suspend (value: T) -> R
-
-        /**
-         * A basic [PreferenceItem] that only displays texts.
-         */
-        data class TextPreference(
-            override val title: String,
-            override val subtitle: String? = null,
-            override val enabled: Boolean = true,
-            val widget: @Composable (() -> Unit)? = null,
-            val onClick: (() -> Unit)? = null,
-            override val icon: Painter? = null
-        ) : PreferenceItem<String, Unit>() {
-            override val onValueChanged: suspend (value: String) -> Unit = {}
-        }
-
-        /**
-         * A [PreferenceItem] that provides a two-state toggleable option.
-         */
-        data class SwitchPreference(
-            val preference: PreferenceData<Boolean>,
-            override val title: String,
-            override val subtitle: String? = null,
-            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Boolean) -> Boolean = { true },
-            override val icon: Painter? = null
-        ) : PreferenceItem<Boolean, Boolean>()
-
-        /**
-         * A [PreferenceItem] that provides a color
-         */
-        data class ColorPreference(
-            val preference: PreferenceData<Int>,
-            override val title: String,
-            override val subtitle: String? = null,
-            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Int) -> Boolean = { true },
-            override val icon: Painter? = null
-        ) : PreferenceItem<Int, Boolean>()
-
-        /**
-         * A [PreferenceItem] that provides a slider to select an integer number.
-         */
-        data class SliderPreference(
-            val preference: PreferenceData<Int>,
-            override val title: String,
-            override val subtitle: String? = null,
-            val valueString: String? = null,
-            val valueRange: IntProgression = 0..1,
-            @IntRange(from = 0) val steps: Int = with(valueRange) { (last - first) - 1 },
-            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Int) -> Boolean = { true },
-            override val icon: Painter? = null
-        ) : PreferenceItem<Int, Boolean>()
-
-        /**
-         * A [PreferenceItem] that displays a list of entries as a dialog.
-         */
-        @Suppress("UNCHECKED_CAST")
-        data class ListPreference<T>(
-            val preference: PreferenceData<T>,
-            val entries: Map<T, String>,
-            override val title: String,
-            override val subtitle: String? = "%s",
-            val subtitleProvider: @Composable (value: T, entries: Map<T, String>) -> String? =
-                { v, e -> subtitle?.format(e[v]) },
-            override val icon: Painter? = null,
-            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: T) -> Boolean = { true },
-            val iconProvider: (@Composable (key: T, value: String) -> Unit)? = null,
-        ) : PreferenceItem<T, Boolean>() {
-            internal fun internalSet(value: Any?) = preference.set(value as T)
-            internal suspend fun internalOnValueChanged(value: Any?) = onValueChanged(value as T)
-
-            @Composable
-            internal fun internalSubtitleProvider(value: Any?, entries: Map<out Any?, String>) =
-                subtitleProvider(value as T, entries as Map<T, String>)
-            @Composable
-            internal fun InternalIconProvider(key: Any?, value: String) =
-                iconProvider?.invoke(key as T, value)
-        }
-
-        /**
-         * A [PreferenceItem] that displays a list of entries as a dialog.
-         * Multiple entries can be selected at the same time.
-         */
-        @Suppress("UNCHECKED_CAST")
-        data class MultiSelectListPreference<T>(
-            val preference: PreferenceData<Set<T>>,
-            val entries: Map<T, String>,
-            override val title: String,
-            override val subtitle: String? = "%s",
-            val subtitleProvider: @Composable (value: Set<T>, entries: Map<T, String>) -> String? =
-                { v, e ->
-                    val combined = remember(v, e) {
-                        v.mapNotNull { e[it] }
-                            .joinToString()
-                            .takeUnless { it.isBlank() }
-                    }
-                        ?: stringResource(Res.string.none)
-                    subtitle?.format(combined)
-                },
-            override val icon: Painter? = null,
-            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Set<T>) -> Boolean = { true },
-        ) : PreferenceItem<Set<T>, Boolean>() {
-            internal fun internalSet(value: Set<Any?>) = preference.set(value as Set<T>)
-            internal suspend fun internalOnValueChanged(value: Set<Any?>) = onValueChanged(value as Set<T>)
-
-            @Composable
-            internal fun internalSubtitleProvider(value: Set<Any?>, entries: Map<out Any?, String>) =
-                subtitleProvider(value as Set<T>, entries as Map<T, String>)
-        }
-
-        /**
-         * A [PreferenceItem] that shows a EditText in the dialog.
-         */
-        data class EditTextPreference(
-            val preference: PreferenceData<String>,
-            override val title: String,
-            override val subtitle: String? = "%s",
-            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: String) -> Boolean = { true },
-        ) : PreferenceItem<String, Boolean>() {
-            override val icon: Painter? = null
-        }
-
-        data class InfoPreference(
-            override val title: String,
-        ) : PreferenceItem<String, Unit>() {
-            override val enabled: Boolean = true
-            override val subtitle: String? = null
-            override val icon: Painter? = null
-            override val onValueChanged: suspend (value: String) -> Unit = {}
-        }
-
-        data class CustomPreference(
-            override val title: String,
-            val content: @Composable () -> Unit,
-        ) : PreferenceItem<Unit, Unit>() {
-            override val enabled: Boolean = true
-            override val subtitle: String? = null
-            override val icon: Painter? = null
-            override val onValueChanged: suspend (value: Unit) -> Unit = {}
-        }
-    }
-
-    data class PreferenceGroup(
-        override val title: String,
-        override val enabled: Boolean = true,
-
-        val preferenceItems: List<PreferenceItem<out Any?, out Any?>>,
-    ) : Preference()
-}
-
-@Composable
-fun <T> PreferenceData<T>.collectAsState(): State<T> {
-    val flow = remember(this) { changes() }
-    return flow.collectAsState(initial = get())
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceItem.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceItem.kt
deleted file mode 100644
index 06d775aec..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceItem.kt
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.mihon.presentation.settings
-
-import com.mihon.presentation.settings.widget.ColorPreferenceWidget
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.shrinkVertically
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.structuralEqualityPolicy
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.unit.dp
-import com.mihon.material.BaseSliderItem
-import com.mihon.presentation.settings.widget.EditTextPreferenceWidget
-import com.mihon.presentation.settings.widget.InfoWidget
-import com.mihon.presentation.settings.widget.ListPreferenceWidget
-import com.mihon.presentation.settings.widget.MultiSelectListPreferenceWidget
-import com.mihon.presentation.settings.widget.PrefsHorizontalPadding
-import com.mihon.presentation.settings.widget.PrefsVerticalPadding
-import com.mihon.presentation.settings.widget.SwitchPreferenceWidget
-import com.mihon.presentation.settings.widget.TextPreferenceWidget
-import com.mihon.presentation.settings.widget.TitleFontSize
-import kotlinx.coroutines.launch
-
-val LocalPreferenceHighlighted = compositionLocalOf(structuralEqualityPolicy()) { false }
-val LocalPreferenceMinHeight = compositionLocalOf(structuralEqualityPolicy()) { 56.dp }
-
-@Composable
-fun StatusWrapper(
-    item: Preference.PreferenceItem<*, *>,
-    highlightKey: String?,
-    content: @Composable () -> Unit,
-) {
-    val enabled = item.enabled
-    val highlighted = item.title == highlightKey
-    AnimatedVisibility(
-        visible = enabled,
-        enter = expandVertically() + fadeIn(),
-        exit = shrinkVertically() + fadeOut(),
-        content = {
-            CompositionLocalProvider(
-                LocalPreferenceHighlighted provides highlighted,
-                content = content,
-            )
-        },
-    )
-}
-
-@Composable
-internal fun PreferenceItem(
-    item: Preference.PreferenceItem<*, *>,
-    highlightKey: String?,
-) {
-    val scope = rememberCoroutineScope()
-    StatusWrapper(
-        item = item,
-        highlightKey = highlightKey,
-    ) {
-        when (item) {
-            is Preference.PreferenceItem.SwitchPreference -> {
-                val value by item.preference.collectAsState()
-                SwitchPreferenceWidget(
-                    title = item.title,
-                    subtitle = item.subtitle,
-                    icon = item.icon,
-                    checked = value,
-                    onCheckedChanged = { newValue ->
-                        scope.launch {
-                            if (item.onValueChanged(newValue)) {
-                                item.preference.set(newValue)
-                            }
-                        }
-                    },
-                )
-            }
-
-            is Preference.PreferenceItem.ColorPreference -> {
-                val color = item.preference.collectAsState()
-                val derivedColor = Color(color.value)
-                ColorPreferenceWidget(
-                    title = item.title,
-                    subtitle = item.subtitle,
-                    icon = item.icon,
-                    color = derivedColor,
-                    onValueChange = { newValue ->
-                        scope.launch {
-                            if(item.onValueChanged(newValue.toArgb())) {
-                                item.preference.set(newValue.toArgb())
-                            }
-                        }
-                    },
-                )
-            }
-
-            is Preference.PreferenceItem.ListPreference<*> -> {
-                val value by item.preference.collectAsState()
-                ListPreferenceWidget(
-                    value = value,
-                    title = item.title,
-                    subtitle = item.internalSubtitleProvider(value, item.entries),
-                    icon = item.icon,
-                    entries = item.entries,
-                    iconProvider = item::InternalIconProvider,
-                    onValueChange = { newValue ->
-                        scope.launch {
-                            if (item.internalOnValueChanged(newValue)) {
-                                item.internalSet(newValue)
-                            }
-                        }
-                    },
-                )
-            }
-
-            is Preference.PreferenceItem.MultiSelectListPreference<*> -> {
-                val values by item.preference.collectAsState()
-                MultiSelectListPreferenceWidget(
-                    values = values,
-                    title = item.title,
-                    subtitle = item.internalSubtitleProvider(values, item.entries),
-                    icon = item.icon,
-                    entries = item.entries,
-                    onValuesChange = { newValues ->
-                        scope.launch {
-                            if (item.internalOnValueChanged(newValues)) {
-                                item.internalSet(newValues)
-                            }
-                        }
-                    },
-                )
-            }
-
-            is Preference.PreferenceItem.TextPreference -> {
-                TextPreferenceWidget(
-                    title = item.title,
-                    subtitle = item.subtitle,
-                    icon = item.icon,
-                    widget = item.widget,
-                    onPreferenceClick = item.onClick,
-                )
-            }
-
-            is Preference.PreferenceItem.EditTextPreference -> {
-                val values by item.preference.collectAsState()
-                EditTextPreferenceWidget(
-                    title = item.title,
-                    subtitle = item.subtitle,
-                    icon = item.icon,
-                    value = values,
-                    onConfirm = {
-                        val accepted = item.onValueChanged(it)
-                        if (accepted) item.preference.set(it)
-                        accepted
-                    },
-                )
-            }
-            is Preference.PreferenceItem.InfoPreference -> {
-                InfoWidget(text = item.title)
-            }
-
-            is Preference.PreferenceItem.CustomPreference -> {
-                item.content()
-            }
-
-            is Preference.PreferenceItem.SliderPreference -> {
-                val state by item.preference.collectAsState()
-                BaseSliderItem(
-                    value = state,
-                    valueRange = item.valueRange,
-                    steps = item.steps,
-                    title = item.title,
-                    subtitle = item.subtitle,
-                    valueString = item.valueString.takeUnless { it.isNullOrEmpty() }
-                        ?: state.toString(),
-                    onChange = { newValue ->
-                        scope.launch {
-                            if(item.onValueChanged(newValue)) {
-                                item.preference.set(newValue)
-                            }
-                        }
-                    },
-                    titleStyle = MaterialTheme.typography.titleLarge.copy(fontSize = TitleFontSize),
-                    modifier = Modifier.padding(
-                        horizontal = PrefsHorizontalPadding,
-                        vertical = PrefsVerticalPadding,
-                    ),
-                    icon = item.icon
-                )
-            }
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceScaffold.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceScaffold.kt
deleted file mode 100644
index 4f97d9f2b..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceScaffold.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.mihon.presentation.settings
-
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component1
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component2
-import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.focus.focusRequester
-import com.mihon.material.AppBar
-import com.mihon.material.Scaffold
-
-@Composable
-fun PreferenceScaffold(
-    title: String,
-    actions: @Composable RowScope.() -> Unit = {},
-    onBackPressed: (() -> Unit)? = null,
-    itemsProvider: @Composable () -> List<Preference>,
-) {
-    val (top, bottom) = remember { FocusRequester.createRefs() }
-
-    Scaffold(
-        // TODO @WindowInsets remove this when we have converted everything to compose
-        contentWindowInsets = WindowInsets(0, 0, 0, 0),
-        topBar = {
-            AppBar(
-                modifier = Modifier.focusRequester(top).focusProperties {
-                    down = bottom
-                },
-                title = title,
-                navigateUp = onBackPressed,
-                actions = actions,
-                scrollBehavior = it,
-            )
-        },
-        content = { contentPadding ->
-            PreferenceScreen(
-                modifier = Modifier.focusRequester(bottom).focusProperties {
-                    up = top
-                },
-                items = itemsProvider(),
-                contentPadding = contentPadding,
-            )
-        },
-    )
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceScreen.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceScreen.kt
deleted file mode 100644
index 0e99aa9a3..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/PreferenceScreen.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.mihon.presentation.settings
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.fastForEachIndexed
-import com.mihon.presentation.settings.widget.PreferenceGroupHeader
-import kotlinx.coroutines.delay
-import kotlin.time.Duration.Companion.seconds
-
-/**
- * Preference Screen composable which contains a list of [Preference] items
- * @param items [Preference] items which should be displayed on the preference screen. An item can be a single [PreferenceItem] or a group ([Preference.PreferenceGroup])
- * @param modifier [Modifier] to be applied to the preferenceScreen layout
- */
-@Composable
-fun PreferenceScreen(
-    items: List<Preference>,
-    modifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(0.dp),
-) {
-    val state = rememberLazyListState()
-    val highlightKey = SearchableSettings.highlightKey
-    if (highlightKey != null) {
-        LaunchedEffect(Unit) {
-            val i = items.findHighlightedIndex(highlightKey)
-            if (i >= 0) {
-                delay(0.5.seconds)
-                state.animateScrollToItem(i)
-            }
-            SearchableSettings.highlightKey = null
-        }
-    }
-
-    LazyColumn(
-        modifier = modifier,
-        state = state,
-        contentPadding = contentPadding,
-    ) {
-        items.fastForEachIndexed { i, preference ->
-            when (preference) {
-                // Create Preference Group
-                is Preference.PreferenceGroup -> {
-                    if (!preference.enabled) return@fastForEachIndexed
-
-                    item {
-                        Column {
-                            PreferenceGroupHeader(title = preference.title)
-                        }
-                    }
-                    items(preference.preferenceItems) { item ->
-                        PreferenceItem(
-                            item = item,
-                            highlightKey = highlightKey,
-                        )
-                    }
-                    item {
-                        if (i < items.lastIndex) {
-                            Spacer(modifier = Modifier.height(12.dp))
-                        }
-                    }
-                }
-
-                // Create Preference Item
-                is Preference.PreferenceItem<*, *> -> item {
-                    PreferenceItem(
-                        item = preference,
-                        highlightKey = highlightKey,
-                    )
-                }
-            }
-        }
-    }
-}
-
-private fun List<Preference>.findHighlightedIndex(highlightKey: String): Int {
-    return flatMap {
-        if (it is Preference.PreferenceGroup) {
-            buildList<String?> {
-                add(null) // Header
-                addAll(it.preferenceItems.map { groupItem -> groupItem.title })
-                add(null) // Spacer
-            }
-        } else {
-            listOf(it.title)
-        }
-    }.indexOfFirst { it == highlightKey }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/Search.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/Search.kt
deleted file mode 100644
index e3ff47625..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/Search.kt
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.mihon.presentation.settings
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.retain.retain
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.no_results_found
-import com.mihon.presentation.secondaryItemAlpha
-import com.mihon.presentation.settings.widget.TextPreferenceWidget
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
-import org.jetbrains.compose.resources.stringResource
-
-private fun getLocalizedBreadcrumb(path: String, node: String?, isLtr: Boolean): String {
-    return if (node == null) {
-        path
-    } else {
-        if (isLtr) {
-            // This locale reads left to right.
-            "$path > $node"
-        } else {
-            // This locale reads right to left.
-            "$node < $path"
-        }
-    }
-}
-
-data class SettingsData<T>(
-    val title: String,
-    val contents: List<Preference>,
-    val navigation: T,
-)
-
-data class SearchResultItem<T>(
-    val title: String,
-    val breadcrumbs: String,
-    val highlightKey: String,
-    val navigation: T,
-)
-
-@Composable
-fun <T> SettingSearchResults(
-    searchKey: String,
-    onItemClick: (SearchResultItem<T>) -> Unit,
-    deferredItems: @Composable () -> ImmutableList<SettingsData<T>>,
-    nestedScrollConnection: NestedScrollConnection,
-    empty: @Composable () -> Unit
-) {
-    val isLtr = LocalLayoutDirection.current == LayoutDirection.Ltr
-
-    // We want to retain the results as backpress should not re-calc it
-    var result by retain<MutableState<PersistentList<SearchResultItem<T>>?>> {
-        mutableStateOf(null)
-    }
-
-    var items by remember { mutableStateOf<ImmutableList<SettingsData<T>>>(persistentListOf()) }
-    if (items.isEmpty() && searchKey.isNotEmpty()) {
-        items = deferredItems()
-    }
-
-    LaunchedEffect(searchKey) {
-        if (searchKey.isEmpty()) {
-            result = null
-            return@LaunchedEffect
-        }
-        result = items.asSequence()
-            .flatMap { settingsData ->
-                settingsData.contents.asSequence()
-                    // Only search from enabled prefs and one with valid title
-                    .filter { it.enabled && it.title.isNotBlank() }
-                    // Flatten items contained inside *enabled* PreferenceGroup
-                    .flatMap { p ->
-                        when (p) {
-                            is Preference.PreferenceGroup -> {
-                                if (p.enabled) {
-                                    p.preferenceItems.asSequence()
-                                        .filter { it.enabled && it.title.isNotBlank() }
-                                        .map { p.title to it }
-                                } else {
-                                    emptySequence()
-                                }
-                            }
-
-                            is Preference.PreferenceItem<*, *> -> sequenceOf(null to p)
-                        }
-                    }
-                    // Don't show info preference
-                    .filterNot { it.second is Preference.PreferenceItem.InfoPreference }
-                    // Filter by search query
-                    .filter { (_, p) ->
-                        val inTitle = p.title.contains(searchKey, true)
-                        val inSummary = p.subtitle?.contains(searchKey, true) ?: false
-                        inTitle || inSummary // TODO filter out %s ? This is a bug-ish in mihon
-                    }
-                    // Map result data
-                    .map { (categoryTitle, p) ->
-                        SearchResultItem(
-                            navigation = settingsData.navigation,
-                            title = p.title,
-                            breadcrumbs = getLocalizedBreadcrumb(
-                                path = settingsData.title,
-                                node = categoryTitle,
-                                isLtr = isLtr,
-                            ),
-                            highlightKey = p.title,
-                        )
-                    }
-            }
-            .take(10) // Just take top 10 result for quicker result
-            .toPersistentList()
-    }
-
-    Crossfade(
-        targetState = result,
-        label = "results",
-    ) {
-        when {
-            it == null -> empty()
-
-            it.isEmpty() -> {
-                Text(
-                    text = stringResource(Res.string.no_results_found),
-                    modifier = Modifier.secondaryItemAlpha().fillMaxWidth().padding(20.dp),
-                    textAlign = TextAlign.Center
-                )
-            }
-
-            else -> {
-                Column(
-                    modifier = Modifier
-                        .nestedScroll(nestedScrollConnection)
-                ) {
-                    it.forEach { item ->
-                        TextPreferenceWidget(
-                            title = item.title,
-                            subtitle = item.breadcrumbs,
-                            onPreferenceClick = {
-                                onItemClick(item)
-                            }
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/SearchableSettings.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/SearchableSettings.kt
deleted file mode 100644
index c114f0dd0..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/SearchableSettings.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mihon.presentation.settings
-
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import com.lagradost.cloudstream4.compose.Screen
-import com.mihon.presentation.LocalBackPress
-
-interface SearchableSettings : Screen {
-    @Composable
-    @ReadOnlyComposable
-    fun getTitleRes(): String
-
-    @Composable
-    fun getPreferences(): List<Preference>
-
-    @Composable
-    fun RowScope.AppBarAction() {
-    }
-
-    @Composable
-    override fun Content() {
-        val handleBack = LocalBackPress.current
-        PreferenceScaffold(
-            title = getTitleRes(),
-            onBackPressed = if (handleBack != null) handleBack::invoke else null,
-            actions = { AppBarAction() },
-            itemsProvider = { getPreferences() },
-        )
-    }
-
-    companion object {
-        // HACK: for the background blipping thingy.
-        // The title of the target PreferenceItem
-        // Set before showing the destination screen and reset after
-        // See BasePreferenceWidget.highlightBackground
-        var highlightKey: String? = null
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/BasePreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/BasePreferenceWidget.kt
deleted file mode 100644
index e103a1440..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/BasePreferenceWidget.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.StartOffset
-import androidx.compose.animation.core.StartOffsetType
-import androidx.compose.animation.core.repeatable
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.lagradost.cloudstream4.compose.focusOutline
-import com.mihon.presentation.settings.LocalPreferenceHighlighted
-import com.mihon.presentation.settings.LocalPreferenceMinHeight
-import kotlinx.coroutines.delay
-import kotlin.time.Duration.Companion.seconds
-
-@Composable
-internal fun BasePreferenceWidget(
-    modifier: Modifier = Modifier,
-    title: String? = null,
-    subcomponent: @Composable (ColumnScope.() -> Unit)? = null,
-    icon: @Composable (() -> Unit)? = null,
-    onClick: (() -> Unit)? = null,
-    widget: @Composable (() -> Unit)? = null,
-) {
-    val highlighted = LocalPreferenceHighlighted.current
-    val minHeight = LocalPreferenceMinHeight.current
-    Row(
-        modifier = modifier
-            .highlightBackground(highlighted)
-            .focusOutline()
-            .sizeIn(minHeight = minHeight)
-            .clickable(enabled = onClick != null, onClick = { onClick?.invoke() })
-            .fillMaxWidth(),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        if (icon != null) {
-            Box(
-                modifier = Modifier.padding(start = PrefsHorizontalPadding, end = 8.dp),
-                content = { icon() },
-            )
-        }
-        Column(
-            modifier = Modifier
-                .weight(1f)
-                .padding(vertical = PrefsVerticalPadding),
-        ) {
-            if (!title.isNullOrBlank()) {
-                Text(
-                    modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
-                    text = title,
-                    overflow = TextOverflow.Ellipsis,
-                    maxLines = 2,
-                    style = MaterialTheme.typography.titleLarge,
-                    fontSize = TitleFontSize,
-                )
-            }
-            subcomponent?.invoke(this)
-        }
-        if (widget != null) {
-            Box(
-                modifier = Modifier.padding(end = PrefsHorizontalPadding),
-                content = { widget() },
-            )
-        }
-    }
-}
-
-@Composable
-internal fun Modifier.highlightBackground(highlighted: Boolean): Modifier {
-    var highlightFlag by remember { mutableStateOf(false) }
-    LaunchedEffect(Unit) {
-        if (highlighted) {
-            highlightFlag = true
-            delay(3.seconds)
-            highlightFlag = false
-        }
-    }
-    val highlight by animateColorAsState(
-        targetValue = if (highlightFlag) {
-            MaterialTheme.colorScheme.onBackground.copy(alpha = .12f)
-        } else {
-            Color.Transparent
-        },
-        animationSpec = if (highlightFlag) {
-            repeatable(
-                iterations = 5,
-                animation = tween(durationMillis = 200),
-                repeatMode = RepeatMode.Reverse,
-                initialStartOffset = StartOffset(
-                    offsetMillis = 600,
-                    offsetType = StartOffsetType.Delay,
-                ),
-            )
-        } else {
-            tween(200)
-        },
-        label = "highlight",
-    )
-    return this.background(color = highlight)
-}
-
-internal val TrailingWidgetBuffer = 16.dp
-internal val PrefsHorizontalPadding = 16.dp
-internal val PrefsVerticalPadding = 16.dp
-internal val TitleFontSize = 16.sp
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/ColorPreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/ColorPreferenceWidget.kt
deleted file mode 100644
index d8841a3a9..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/ColorPreferenceWidget.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream4.compose.ColorCircle
-import com.lagradost.cloudstream4.compose.ColorDialog
-
-@Composable
-fun ColorPreferenceWidget(
-    modifier: Modifier = Modifier,
-    title: String,
-    subtitle: String? = null,
-    icon: Painter? = null,
-    color : Color,
-    onValueChange: (Color) -> Unit,
-) {
-    var isDialogShown by remember { mutableStateOf(false) }
-
-    TextPreferenceWidget(
-        modifier = modifier,
-        title = title,
-        subtitle = subtitle,
-        icon = icon,
-        onPreferenceClick = {
-            isDialogShown = true
-        },
-        widget = {
-            ColorCircle(color, size = 30.dp)
-        }
-    )
-
-    if (isDialogShown) {
-        ColorDialog(
-            title = title,
-            color = color,
-            dismiss = { isDialogShown = false },
-            confirm = { color ->
-                isDialogShown = false
-                onValueChange(color)
-            }
-        )
-    }
-}
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/EditTextPreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/EditTextPreferenceWidget.kt
deleted file mode 100644
index 137318928..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/EditTextPreferenceWidget.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.window.DialogProperties
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.cancel
-import com.lagradost.cloudstream4.generated.resources.error
-import com.lagradost.cloudstream4.generated.resources.ok
-import kotlinx.coroutines.launch
-import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.compose.resources.stringResource
-
-@Composable
-fun EditTextPreferenceWidget(
-    title: String,
-    subtitle: String?,
-    icon: Painter?,
-    value: String,
-    onConfirm: suspend (String) -> Boolean,
-) {
-    var isDialogShown by remember { mutableStateOf(false) }
-
-    TextPreferenceWidget(
-        title = title,
-        subtitle = subtitle?.format(value),
-        icon = icon,
-        onPreferenceClick = { isDialogShown = true },
-    )
-
-    if (isDialogShown) {
-        val scope = rememberCoroutineScope()
-        val onDismissRequest = { isDialogShown = false }
-        var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
-            mutableStateOf(TextFieldValue(value))
-        }
-        AlertDialog(
-            onDismissRequest = onDismissRequest,
-            title = { Text(text = title) },
-            text = {
-                OutlinedTextField(
-                    value = textFieldValue,
-                    onValueChange = { textFieldValue = it },
-                    trailingIcon = {
-                        if (textFieldValue.text.isBlank()) {
-                            Icon(painter = painterResource(Res.drawable.error), contentDescription = null)
-                        } else {
-                            IconButton(onClick = { textFieldValue = TextFieldValue("") }) {
-                                Icon(painter = painterResource(Res.drawable.cancel), contentDescription = null)
-                            }
-                        }
-                    },
-                    isError = textFieldValue.text.isBlank(),
-                    singleLine = true,
-                    modifier = Modifier.fillMaxWidth(),
-                )
-            },
-            properties = DialogProperties(
-                usePlatformDefaultWidth = true,
-            ),
-            confirmButton = {
-                TextButton(
-                    enabled = textFieldValue.text != value && textFieldValue.text.isNotBlank(),
-                    onClick = {
-                        scope.launch {
-                            if (onConfirm(textFieldValue.text)) {
-                                onDismissRequest()
-                            }
-                        }
-                    },
-                ) {
-                    Text(text = stringResource(Res.string.ok))
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = onDismissRequest) {
-                    Text(text = stringResource(Res.string.cancel))
-                }
-            },
-        )
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/InfoWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/InfoWidget.kt
deleted file mode 100644
index 3382ebda5..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/InfoWidget.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.info
-import com.lagradost.cloudstream4.generated.resources.lorem_content
-import com.lagradost.cloudstream4.generated.resources.lorem_title
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.compose.resources.stringResource
-import com.mihon.presentation.secondaryItemAlpha
-import com.mihon.material.padding
-
-@Composable
-internal fun InfoWidget(text: String) {
-    Column(
-        modifier = Modifier
-            .padding(
-                horizontal = PrefsHorizontalPadding,
-                vertical = MaterialTheme.padding.medium,
-            )
-            .secondaryItemAlpha(),
-        verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.medium),
-    ) {
-        Icon(
-            painter = painterResource(Res.drawable.info),
-            contentDescription = null,
-        )
-        Text(
-            text = text,
-            style = MaterialTheme.typography.bodySmall,
-        )
-    }
-}
-
-@PreviewLightDark
-@Composable
-private fun InfoWidgetPreview() {
-    CloudStreamPreviewTheme {
-        Surface {
-            InfoWidget(text = stringResource(Res.string.lorem_content))
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/ListPreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/ListPreferenceWidget.kt
deleted file mode 100644
index 6a573e7e8..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/ListPreferenceWidget.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.painter.Painter
-import com.lagradost.cloudstream4.compose.SingleSelectDialog
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.cancel
-import com.lagradost.cloudstream4.generated.resources.ok
-import org.jetbrains.compose.resources.stringResource
-
-@Composable
-fun <T> ListPreferenceWidget(
-    value: T,
-    title: String,
-    subtitle: String?,
-    icon: Painter?,
-    entries: Map<out T, String>,
-    onValueChange: (T) -> Unit,
-    iconProvider: (@Composable (key: T, value: String) -> Unit)? = null
-) {
-    var isDialogShown by remember { mutableStateOf(false) }
-
-    TextPreferenceWidget(
-        title = title,
-        subtitle = subtitle,
-        icon = icon,
-        onPreferenceClick = { isDialogShown = true },
-    )
-
-    if (isDialogShown) {
-        SingleSelectDialog(
-            dismiss = { isDialogShown = false },
-            title = title,
-            entries = entries,
-            selectedKey = value,
-            confirm = { key ->
-                onValueChange(key)
-                isDialogShown = false
-            },
-            confirmText = stringResource(Res.string.ok),
-            dismissText = stringResource(Res.string.cancel),
-            iconProvider = iconProvider
-        )
-        /*AlertDialog(
-            onDismissRequest = { isDialogShown = false },
-            title = { Text(text = title) },
-            text = {
-                Box {
-                    val state = rememberLazyListState()
-                    LazyColumn(state = state) {
-                        entries.forEach { current ->
-                            val isSelected = value == current.key
-                            item {
-                                DialogRow(
-                                    label = current.value,
-                                    isSelected = isSelected,
-                                    onSelected = {
-                                        onValueChange(current.key!!)
-                                        isDialogShown = false
-                                    },
-                                )
-                            }
-                        }
-                    }
-                    if (state.canScrollBackward) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
-                    if (state.canScrollForward) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
-                }
-            },
-            confirmButton = {
-                TextButton(onClick = { isDialogShown = false }) {
-                    Text(text = stringResource(Res.string.cancel))
-                }
-            },
-        )*/
-    }
-}
-/*
-@Composable
-private fun DialogRow(
-    label: String,
-    isSelected: Boolean,
-    onSelected: () -> Unit,
-) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier
-            .clip(MaterialTheme.shapes.small)
-            .selectable(
-                selected = isSelected,
-                onClick = { if (!isSelected) onSelected() },
-            )
-            .fillMaxWidth()
-            .minimumInteractiveComponentSize(),
-    ) {
-        RadioButton(
-            selected = isSelected,
-            onClick = null,
-        )
-        Text(
-            text = label,
-            style = MaterialTheme.typography.bodyLarge.merge(),
-            modifier = Modifier.padding(start = 24.dp),
-        )
-    }
-}
-*/
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/MultiSelectListPreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/MultiSelectListPreferenceWidget.kt
deleted file mode 100644
index c0a2d735f..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/MultiSelectListPreferenceWidget.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.window.DialogProperties
-import com.lagradost.cloudstream4.compose.MultiSelectDialog
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.cancel
-import com.lagradost.cloudstream4.generated.resources.ok
-import org.jetbrains.compose.resources.stringResource
-
-@Composable
-fun <T> MultiSelectListPreferenceWidget(
-    values: Set<T>,
-    title: String,
-    subtitle: String?,
-    icon: Painter?,
-    entries: Map<out T, String>,
-    onValuesChange: (Set<T>) -> Unit,
-) {
-    var isDialogShown by remember { mutableStateOf(false) }
-
-    TextPreferenceWidget(
-        title = title,
-        subtitle = subtitle,
-        icon = icon,
-        onPreferenceClick = { isDialogShown = true },
-    )
-
-    if (isDialogShown) {
-        MultiSelectDialog(
-            title = title,
-            entries = entries,
-            properties = DialogProperties(
-                usePlatformDefaultWidth = true,
-            ),
-            confirmText = stringResource(Res.string.ok),
-            confirm = { selection ->
-                onValuesChange(selection)
-                isDialogShown = false
-            },
-            dismissText = stringResource(Res.string.cancel),
-            dismiss = {
-                isDialogShown = false
-            },
-            selectedKeys = values,
-        )
-
-        /*
-        AlertDialog(
-            onDismissRequest = { isDialogShown = false },
-            title = { Text(text = title) },
-            text = {
-                LazyColumn {
-                    entries.forEach { current ->
-                        item {
-                            val isSelected = selected.contains(current.key)
-                            LabeledCheckbox(
-                                label = current.value,
-                                checked = isSelected,
-                                onCheckedChange = {
-                                    if (it) {
-                                        selected.add(current.key)
-                                    } else {
-                                        selected.remove(current.key)
-                                    }
-                                },
-                            )
-                        }
-                    }
-                }
-            },
-            properties = DialogProperties(
-                usePlatformDefaultWidth = true,
-            ),
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        onValuesChange(selected.toMutableSet())
-                        isDialogShown = false
-                    },
-                ) {
-                    Text(text = stringResource(Res.string.ok))
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { isDialogShown = false }) {
-                    Text(text = stringResource(Res.string.cancel))
-                }
-            },
-        )*/
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/PreferenceGroupHeader.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/PreferenceGroupHeader.kt
deleted file mode 100644
index b7d1197a9..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/PreferenceGroupHeader.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun PreferenceGroupHeader(title: String) {
-    Box(
-        contentAlignment = Alignment.CenterStart,
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(bottom = 8.dp, top = 14.dp),
-    ) {
-        Text(
-            text = title,
-            color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
-            style = MaterialTheme.typography.bodyMedium,
-        )
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/SwitchPreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/SwitchPreferenceWidget.kt
deleted file mode 100644
index 2744cdcdc..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/SwitchPreferenceWidget.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Switch
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.preview
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import org.jetbrains.compose.resources.painterResource
-
-@Composable
-fun SwitchPreferenceWidget(
-    modifier: Modifier = Modifier,
-    title: String,
-    subtitle: String? = null,
-    icon: Painter? = null,
-    checked: Boolean = false,
-    onCheckedChanged: (Boolean) -> Unit,
-) {
-    TextPreferenceWidget(
-        modifier = modifier,
-        title = title,
-        subtitle = subtitle,
-        icon = icon,
-        widget = {
-            Switch(
-                checked = checked,
-                onCheckedChange = null,
-                modifier = Modifier.padding(start = TrailingWidgetBuffer),
-            )
-        },
-        onPreferenceClick = { onCheckedChanged(!checked) },
-    )
-}
-
-@PreviewLightDark
-@Composable
-private fun SwitchPreferenceWidgetPreview() {
-    CloudStreamPreviewTheme {
-        Surface {
-            Column {
-                SwitchPreferenceWidget(
-                    title = "Text preference with icon",
-                    subtitle = "Text preference summary",
-                    icon = painterResource(Res.drawable.preview) ,
-                    checked = true,
-                    onCheckedChanged = {},
-                )
-                SwitchPreferenceWidget(
-                    title = "Text preference",
-                    subtitle = "Text preference summary",
-                    checked = false,
-                    onCheckedChanged = {},
-                )
-                SwitchPreferenceWidget(
-                    title = "Text preference no summary",
-                    checked = false,
-                    onCheckedChanged = {},
-                )
-                SwitchPreferenceWidget(
-                    title = "Another text preference no summary",
-                    checked = false,
-                    onCheckedChanged = {},
-                )
-            }
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/TextPreferenceWidget.kt b/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/TextPreferenceWidget.kt
deleted file mode 100644
index 91c19cd6a..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/presentation/settings/widget/TextPreferenceWidget.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.mihon.presentation.settings.widget
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream4.generated.resources.Res
-import com.lagradost.cloudstream4.generated.resources.preview
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import org.jetbrains.compose.resources.painterResource
-import com.mihon.presentation.secondaryItemAlpha
-
-@Composable
-fun TextPreferenceWidget(
-    modifier: Modifier = Modifier,
-    title: String? = null,
-    subtitle: String? = null,
-    icon: Painter? = null,
-    iconTint: Color = MaterialTheme.colorScheme.onBackground,
-    widget: @Composable (() -> Unit)? = null,
-    onPreferenceClick: (() -> Unit)? = null,
-) {
-    BasePreferenceWidget(
-        modifier = modifier,
-        title = title,
-        subcomponent = if (!subtitle.isNullOrBlank()) {
-            {
-                Text(
-                    text = subtitle,
-                    modifier = Modifier
-                        .padding(horizontal = PrefsHorizontalPadding)
-                        .secondaryItemAlpha(),
-                    style = MaterialTheme.typography.bodyMedium,
-                    maxLines = 10,
-                )
-            }
-        } else {
-            null
-        },
-        icon = if (icon != null) {
-            {
-                Icon(
-                    painter = icon,
-                    modifier = Modifier.size(24.dp),
-                    tint = iconTint,
-                    contentDescription = null,
-                )
-            }
-        } else {
-            null
-        },
-        onClick = onPreferenceClick,
-        widget = widget,
-    )
-}
-
-@PreviewLightDark
-@Composable
-private fun TextPreferenceWidgetPreview() {
-    CloudStreamPreviewTheme {
-        Surface {
-            Column {
-                TextPreferenceWidget(
-                    title = "Text preference with icon",
-                    subtitle = "Text preference summary",
-                    icon = painterResource(Res.drawable.preview),
-                    onPreferenceClick = {},
-                )
-                TextPreferenceWidget(
-                    title = "Text preference",
-                    subtitle = "Text preference summary",
-                    onPreferenceClick = {},
-                )
-            }
-        }
-    }
-}
diff --git a/shared/src/commonMain/kotlin/com/mihon/readme.md b/shared/src/commonMain/kotlin/com/mihon/readme.md
deleted file mode 100644
index 2984058d0..000000000
--- a/shared/src/commonMain/kotlin/com/mihon/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Mihon (tachiyomi) has a great codebase for working with compose. 
-Because they do not provide these features as a lib, we are forced to fork each file we want instead. 
-
-https://github.com/mihonapp/mihon
\ No newline at end of file
diff --git a/shared/src/jvmMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.jvm.kt b/shared/src/jvmMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.jvm.kt
deleted file mode 100644
index cca2d70d7..000000000
--- a/shared/src/jvmMain/kotlin/com/lagradost/cloudstream4/DevicePreferenceStore.jvm.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.lagradost.cloudstream4
-
-import androidx.compose.runtime.Composable
-import com.mihon.common.preference.InMemoryPreferenceStore
-
-/** As this is mostly for testing so far, we can assume we have a shared global for settings */
-internal val settings = AppSettings()
-
-@Composable
-actual fun rememberAppSettings(): AppSettings {
-    return settings
-}
-
-fun AppSettings() : AppSettings {
-    return AppSettings(preferences = InMemoryPreferenceStore())
-}
diff --git a/shared/src/jvmMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.jvm.kt b/shared/src/jvmMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.jvm.kt
deleted file mode 100644
index dc9f4f1ae..000000000
--- a/shared/src/jvmMain/kotlin/com/lagradost/cloudstream4/theme/DeviceTheme.jvm.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.lagradost.cloudstream4.theme
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.graphics.Color
-
-internal actual object DeviceTheme {
-    @Composable
-    @ReadOnlyComposable
-    actual fun resolveDynamicTheme(): CloudStreamColorScheme = darkScheme()
-
-    @Composable
-    @ReadOnlyComposable
-    actual fun resolveDynamicPrimaryColor(): Color = CloudStreamPrimaryColor.NORMAL.color
-
-    @Composable
-    @ReadOnlyComposable
-    actual fun resolveDynamicSecondaryColor(): Color = CloudStreamPrimaryColor.NORMAL.color
-}
\ No newline at end of file
diff --git a/shared/src/readme.md b/shared/src/readme.md
deleted file mode 100644
index 8b37a84a0..000000000
--- a/shared/src/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-https://kotlinlang.org/docs/multiplatform/compose-multiplatform-create-first-app.html#examine-the-project-structure
-
-`jvmMain` contains source files for the desktop target, which uses Kotlin/JVM.
-
-`androidMain` contains Android source files and targets Kotlin/JVM.
-
-`iosMain` contains Kotlin code for iOS and targets Kotlin/Native.
-
-`jsMain` contains JavaScript-specific Kotlin code and targets Kotlin/JS.
-
-`wasmJsMain` contains Wasm-specific Kotlin code and targets Kotlin/Wasm.
\ No newline at end of file