diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index fce227e8..346eb44e 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -31,15 +31,14 @@ jobs:
           ref: main
           token: ${{ secrets.BOT_PAT }}
 
-      # Temporary pause because of leak of tj-actions/changed-files
-      # - name: Find lib changes
-      #   id: modified-libs
-      #   uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 #v42
-      #   with:
-      #     files: lib/
-      #     files_ignore: lib/**.md
-      #     files_separator: " "
-      #     safe_output: false
+      - name: Find lib changes
+        id: modified-libs
+        uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 #v42
+        with:
+          files: lib/
+          files_ignore: lib/**.md
+          files_separator: " "
+          safe_output: false
 
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v6  # v6.1.0
@@ -49,15 +48,15 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      #   # This step is going to commit, but this will not trigger another workflow.
-      # - name: Bump extensions that uses a modified lib
-      #   if: steps.modified-libs.outputs.any_changed == 'true'
-      #   run: |
-      #     chmod +x ./.github/scripts/bump-versions.py
-      #     ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
+        # This step is going to commit, but this will not trigger another workflow.
+      - name: Bump extensions that uses a modified lib
+        if: steps.modified-libs.outputs.any_changed == 'true'
+        run: |
+          chmod +x ./.github/scripts/bump-versions.py
+          ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2
 
       - name: Get number of modules
         run: |
diff --git a/lib-multisrc/anilist/build.gradle.kts b/lib-multisrc/anilist/build.gradle.kts
index 6e70fd15..e2f11e9c 100644
--- a/lib-multisrc/anilist/build.gradle.kts
+++ b/lib-multisrc/anilist/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 4
+baseVersionCode = 3
diff --git a/lib-multisrc/anilist/src/eu/kanade/tachiyomi/multisrc/anilist/AniListFilters.kt b/lib-multisrc/anilist/src/eu/kanade/tachiyomi/multisrc/anilist/AniListFilters.kt
index 83b7b6dd..688d64e4 100644
--- a/lib-multisrc/anilist/src/eu/kanade/tachiyomi/multisrc/anilist/AniListFilters.kt
+++ b/lib-multisrc/anilist/src/eu/kanade/tachiyomi/multisrc/anilist/AniListFilters.kt
@@ -110,8 +110,6 @@ object AniListFilters {
 
         val YEAR_LIST = arrayOf(
             Pair("<Select>", ""),
-            Pair("2026", "2026"),
-            Pair("2025", "2025"),
             Pair("2024", "2024"),
             Pair("2023", "2023"),
             Pair("2022", "2022"),
diff --git a/lib-multisrc/zorotheme/build.gradle.kts b/lib-multisrc/zorotheme/build.gradle.kts
index 00f303c9..c963594a 100644
--- a/lib-multisrc/zorotheme/build.gradle.kts
+++ b/lib-multisrc/zorotheme/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 5
+baseVersionCode = 4
 
 dependencies {
     api(project(":lib:megacloud-extractor"))
diff --git a/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt
index 46fd4e29..07dd3b22 100644
--- a/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt
+++ b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt
@@ -183,7 +183,7 @@ object ZoroThemeFilters {
             Pair("Most Watched", "most_watched"),
         )
 
-        val YEARS = arrayOf(ALL) + (1917..2025).map {
+        val YEARS = arrayOf(ALL) + (1917..2024).map {
             Pair(it.toString(), it.toString())
         }.reversed().toTypedArray()
 
diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
index 550ddae9..afcd99bc 100644
--- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
+++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
@@ -3,18 +3,16 @@ package eu.kanade.tachiyomi.lib.luluextractor
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import java.util.regex.Pattern
 
-class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
+class LuluExtractor(private val client: OkHttpClient) {
 
-    private val headers = headers.newBuilder()
-        .add("Referer", "https://luluvdo.com/")
+    private val headers = Headers.Builder()
+        .add("Referer", "https://luluvdo.com")
         .add("Origin", "https://luluvdo.com")
         .build()
 
-    //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
     fun videosFromUrl(url: String, prefix: String): List<Video> {
         val videos = mutableListOf<Video>()
 
@@ -24,7 +22,7 @@ class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
             val fixedUrl = fixM3u8Link(m3u8Url)
             val quality = getResolution(fixedUrl)
 
-            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl, headers))
+            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl))
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -52,41 +50,34 @@ class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
 
     private fun fixM3u8Link(link: String): String {
         val paramOrder = listOf("t", "s", "e", "f")
-        val params = Pattern.compile("[?&]([^=]*)=([^&]*)").matcher(link).let { matcher ->
-            generateSequence { if (matcher.find()) matcher.group(1) to matcher.group(2) else null }.toList()
-        }
+        val baseUrl = link.split("?").first()
+        val params = link.split("?").getOrNull(1)?.split("&") ?: emptyList()
 
-        val paramDict = mutableMapOf<String, String>()
-        val extraParams = mutableMapOf<String, String>()
+        val paramMap = mutableMapOf<String, String>()
+        val extraParams = mutableMapOf(
+            "i" to "0.3",
+            "sp" to "0"
+        )
 
-        params.forEachIndexed { index, (key , value) ->
-            if (key.isNullOrEmpty()) {
-                if (index < paramOrder.size) {
-                    if (value != null) {
-                        paramDict[paramOrder[index]] = value
-                    }
-                }
-            } else {
-                if (value != null) {
-                    extraParams[key] = value
+        params.forEachIndexed { index, param ->
+            val parts = param.split("=")
+            when {
+                parts.size == 2 -> {
+                    val (key, value) = parts
+                    if (key in paramOrder) paramMap[key] = value
+                    else extraParams[key] = value
                 }
+                index < paramOrder.size -> paramMap[paramOrder[index]] = parts.firstOrNull() ?: ""
             }
         }
 
-        extraParams["i"] = "0.3"
-        extraParams["sp"] = "0"
-
-        val baseUrl = link.split("?")[0]
-
-        val fixedLink = baseUrl.toHttpUrl().newBuilder()
-        paramOrder.filter { paramDict.containsKey(it) }.forEach { key ->
-            fixedLink.addQueryParameter(key, paramDict[key])
+        return buildString {
+            append(baseUrl)
+            append("?")
+            append(paramOrder.joinToString("&") { "$it=${paramMap[it]}" })
+            append("&")
+            append(extraParams.map { "${it.key}=${it.value}" }.joinToString("&"))
         }
-        extraParams.forEach { (key, value) ->
-            fixedLink.addQueryParameter(key, value)
-        }
-
-        return fixedLink.build().toString()
     }
 
     private fun getResolution(m3u8Url: String): String {
@@ -107,10 +98,11 @@ class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
 }
 
 object JavaScriptUnpacker {
-    private val UNPACK_REGEX by lazy {
-        Regex("""\}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""",
-            RegexOption.DOT_MATCHES_ALL)
-    }
+    private val UNPACK_REGEX = Regex(
+        """}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""",
+        RegexOption.DOT_MATCHES_ALL
+    )
+
     fun unpack(encodedJs: String): String? {
         val match = UNPACK_REGEX.find(encodedJs) ?: return null
         val (payload, radixStr, countStr, symtabStr) = match.destructured
@@ -129,8 +121,8 @@ object JavaScriptUnpacker {
         return Regex("""\b\w+\b""").replace(payload) { mr ->
             symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
         }.replace("\\", "")
-
     }
+
     private fun unbase(value: String, radix: Int, dict: Map<Char, Int>): Int {
         var result = 0
         var multiplier = 1
diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 0b2430d4..57b47590 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -4,12 +4,13 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import android.util.Base64
 import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parseAs
+import kotlinx.serialization.json.Json
 import kotlinx.serialization.Serializable
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
 import java.nio.charset.Charset
 
 class LycorisCafeExtractor(private val client: OkHttpClient) {
@@ -18,15 +19,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     private val GETLNKURL = "https://www.lycoris.cafe/api/watch/getLink"
 
-    private val wordsRegex by lazy {
-        Regex(
-        """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
-            """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
-            """\\x([0-9a-fA-F]{2})|""" +     // \xHH
-            """\\([0-7]{1,3})|""" +          // \OOO (octal)
-            """\\([btnfr"'$\\])"""         // \n, \t, itd.
-        )
-    }
+    private val json: Json by injectLazy()
 
     // Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lycoris.py
     fun getVideosFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
@@ -40,63 +33,72 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             GET(url, headers = embedHeaders),
         ).execute().asJsoup()
 
-        val script = document.selectFirst("script[type='application/json']")?.data() ?: return emptyList()
+        val scripts = document.select("script")
 
-        val scriptData = script.parseAs<ScriptBody>()
+        val episodeDataPattern = Regex("episodeInfo\\s*:\\s*(\\{.*?\\}),", RegexOption.DOT_MATCHES_ALL)
+        var episodeData: String? = null
 
-        val data = scriptData.body.parseAs<ScriptEpisode>()
+        for (script in scripts) {
+            val content = script.data()
+            val match = episodeDataPattern.find(content)
 
-        val linkList = data.episodeInfo.id?.let {
-            fetchAndDecodeVideo(client, data.episodeInfo.id.toString(), isSecondary = false)
+            if (match != null) {
+                episodeData = match.groupValues[1]
+                break
+            }
         }
 
-        val fhdLink = data.episodeInfo.FHD?.let {
-            fetchAndDecodeVideo(client, data.episodeInfo.FHD, isSecondary = true)
-        }
-        val sdLink = data.episodeInfo.SD?.let {
-            fetchAndDecodeVideo(client, data.episodeInfo.SD, isSecondary = true)
-        }
-        val hdLink = data.episodeInfo.HD?.let {
-            fetchAndDecodeVideo(client, data.episodeInfo.HD, isSecondary = true)
+        val result = mutableMapOf<String, String?>()
+
+        val patterns = listOf(
+            "id" to Regex("id\\s*:\\s*(\\d+)"),
+            "FHD" to Regex("FHD\\s*:\\s*\"([^\"]+)\""),
+            "HD" to Regex("HD\\s*:\\s*\"([^\"]+)\""),
+            "SD" to Regex("SD\\s*:\\s*\"([^\"]+)\"")
+        )
+
+        patterns.forEach { (key, pattern) ->
+            result[key] = episodeData?.let { pattern.find(it)?.groups?.get(1)?.value }
         }
 
+        var linkList: String? = fetchAndDecodeVideo(client, result["id"].toString(), isSecondary = false).toString()
+
+        val fhdLink = fetchAndDecodeVideo(client, result["FHD"].toString(), isSecondary = true).toString()
+        val sdLink = fetchAndDecodeVideo(client, result["SD"].toString(), isSecondary = true).toString()
+        val hdLink = fetchAndDecodeVideo(client, result["HD"].toString(), isSecondary = true).toString()
+
+
         if (linkList.isNullOrBlank() || linkList == "{}") {
-            if (!fhdLink.isNullOrBlank()) {
+            if (fhdLink.isNotEmpty()) {
                 videos.add(Video(fhdLink, "${prefix}lycoris.cafe - 1080p", fhdLink))
             }
-            if (!hdLink.isNullOrBlank()) {
+            if (hdLink.isNotEmpty()) {
                 videos.add(Video(hdLink, "${prefix}lycoris.cafe - 720p", hdLink))
             }
-            if (!sdLink.isNullOrBlank()) {
+            if (sdLink.isNotEmpty()) {
                 videos.add(Video(sdLink, "${prefix}lycoris.cafe - 480p", sdLink))
             }
-        } else {
-            val videoLinks = linkList.parseAs<VideoLinksApi>()
+        }else {
+            val videoLinks = Json.decodeFromString<VideoLinks>(linkList)
 
             videoLinks.FHD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
-            } ?: fhdLink?.takeIf { checkLinks(client, it) }?.let {
-                videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
-            }
+            }?: videos.add(Video(fhdLink, "${prefix}lycoris.cafe - 1080p", fhdLink))
 
             videoLinks.HD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
-            } ?: hdLink?.takeIf { checkLinks(client, it) }?.let {
-                videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
-            }
+            }?: videos.add(Video(hdLink, "${prefix}lycoris.cafe - 720p", hdLink))
 
             videoLinks.SD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
-            } ?: sdLink?.takeIf { checkLinks(client, it) }?.let {
-                videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
-            }
+            }?: videos.add(Video(sdLink, "${prefix}lycoris.cafe - 480p", sdLink))
         }
         return videos
 
     }
 
-    private fun decodeVideoLinks(encodedUrl: String): String? {
-        if (encodedUrl.isBlank()) {
+    private fun decodeVideoLinks(encodedUrl: String?): Any? {
+        if (encodedUrl.isNullOrEmpty()) {
             return null
         }
 
@@ -119,33 +121,31 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         }
     }
 
-    private fun fetchAndDecodeVideo(client: OkHttpClient, episodeId: String, isSecondary: Boolean = false): String? {
-        val url: HttpUrl
+    private fun fetchAndDecodeVideo(client: OkHttpClient, episodeId: String, isSecondary: Boolean = false): Any? {
+            val url: HttpUrl
 
-        if (isSecondary) {
-            val convertedText = episodeId.toByteArray(Charset.forName("UTF-8")).toString(Charset.forName("ISO-8859-1"))
-            val unicodeEscape = decodePythonEscape(convertedText)
-            val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
+            if (isSecondary) {
+                val convertedText = episodeId.toByteArray(Charset.forName("UTF-8")).toString(Charset.forName("ISO-8859-1"))
+                val unicodeEscape = decodePythonEscape(convertedText)
+                val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
 
-            url = GETLNKURL.toHttpUrl().newBuilder()
-                .addQueryParameter("link", finalText)
-                .build()
-        } else {
-            url = GETSECONDARYURL.toHttpUrl().newBuilder()
-                .addQueryParameter("id", episodeId)
-                .build()
-        }
-        client.newCall(GET(url))
-            .execute()
-            .use { response ->
-                val data = response.body.string()
-                return decodeVideoLinks(data)
+                url = GETLNKURL.toHttpUrl().newBuilder()
+                    ?.addQueryParameter("link", finalText)
+                    ?.build() ?: throw IllegalStateException("Invalid URL")
+            } else {
+                url = GETSECONDARYURL.toHttpUrl().newBuilder()
+                    ?.addQueryParameter("id", episodeId)
+                    ?.build() ?: throw IllegalStateException("Invalid URL")
             }
+            client.newCall(GET(url))
+                .execute()
+                .use { response ->
+                    val data = response.body.string() ?: ""
+                    return decodeVideoLinks(data)
+                }
     }
 
     private fun checkLinks(client: OkHttpClient, link: String): Boolean {
-        if (!link.contains("https://")) return false
-
         client.newCall(GET(link)).execute().use { response ->
             return response.code.toString() == "200"
         }
@@ -155,7 +155,16 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         // 1. Obsługa kontynuacji linii (backslash + newline)
         val withoutLineContinuation = text.replace("\\\n", "")
 
-        return wordsRegex.replace(withoutLineContinuation) { match ->
+        // 2. Regex do wykrywania wszystkich sekwencji escape
+        val regex = Regex(
+            """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
+                """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
+                """\\x([0-9a-fA-F]{2})|""" +     // \xHH
+                """\\([0-7]{1,3})|""" +          // \OOO (octal)
+                """\\([btnfr"'$\\\\])"""         // \n, \t, itd.
+        )
+
+        return regex.replace(withoutLineContinuation) { match ->
             val (u8, u4, x2, octal, simple) = match.destructured
             when {
                 u8.isNotEmpty() -> handleUnicode8(u8)
@@ -199,32 +208,16 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
     }
 
     @Serializable
-    data class ScriptBody(
-        val body: String
-    )
-
-    @Serializable
-    data class ScriptEpisode(
-        val episodeInfo: EpisodeInfo
-    )
-
-    @Serializable
-    data class EpisodeInfo(
-        val id: Int? = null,
-        val FHD: String? = null,
-        val HD: String? = null,
-        val SD: String? = null,
-    )
-
-    @Serializable
-    data class VideoLinksApi(
+    data class VideoLinks(
         val HD: String? = null,
         val SD: String? = null,
         val FHD: String? = null,
         val Source: String? = null,
+        val preview: String? = null,
         val SourceMKV: String? = null
     )
 
+
 }
 
 
diff --git a/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt b/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
index eb8ff488..ead4b50b 100644
--- a/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
+++ b/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
@@ -141,7 +141,7 @@ class MegaCloudExtractor(
     }
 
     private fun getVideoDto(url: String): VideoDto {
-        val type = if (url.startsWith("https://megacloud.tv") or url.startsWith("https://megacloud.blog")) 0 else 1
+        val type = if (url.startsWith("https://megacloud.tv") or url.startsWith("https://megacloud.club")) 0 else 1
 
         val keyType = SOURCES_KEY[type]
 
@@ -184,4 +184,4 @@ class MegaCloudExtractor(
 
     @Serializable
     data class TrackDto(val file: String, val kind: String, val label: String = "")
-} 
+}
diff --git a/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/WebViewResolver.kt b/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/WebViewResolver.kt
index 9ad99e22..45cc4d01 100644
--- a/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/WebViewResolver.kt
+++ b/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/WebViewResolver.kt
@@ -92,7 +92,7 @@ class WebViewResolver(private val globalHeaders: Headers) {
             val headers = mapOf("X-Requested-With" to "org.lineageos.jelly")
 
             webView?.loadUrl("https://megacloud.tv/about", headers)
-        }  
+        }
 
         latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
 
diff --git a/src/all/shabakatycinemana/build.gradle b/src/all/shabakatycinemana/build.gradle
index 6840459b..f01ac7ca 100644
--- a/src/all/shabakatycinemana/build.gradle
+++ b/src/all/shabakatycinemana/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'ShabakatyCinemana'
     extClass = '.ShabakatyCinemana'
-    extVersionCode = 3
+    extVersionCode = 2
     isNsfw = false
 }
 
diff --git a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt
index 1ac74c0c..5370f8b9 100644
--- a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt
+++ b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt
@@ -134,17 +134,9 @@ object SAnimeDeserializer : DeserializationStrategy<SAnime> {
         val nb = jsonObject["nb"]?.jsonPrimitive?.content!!
         val enTitle = jsonObject["en_title"]?.jsonPrimitive?.content ?: "no title"
         val imgObjUrl = jsonObject["imgObjUrl"]?.jsonPrimitive?.content
-        val categories = jsonObject["categories"]?.jsonArray?.mapNotNull {
+        val categories = jsonObject["categories"]?.jsonArray?.map {
             it.jsonObject["en_title"]?.jsonPrimitive?.content
-        }.orEmpty()
-        val language = jsonObject["videoLanguages"]?.jsonObject?.get("en_title")?.jsonPrimitive?.content
-        val genreText = (categories + language).mapNotNull { it }.joinToString()
-        val directors = jsonObject["directorsInfo"]?.jsonArray?.mapNotNull {
-            it.jsonObject["name"]?.jsonPrimitive?.content
-        }?.joinToString()
-        val actors = jsonObject["actorsInfo"]?.jsonArray?.mapNotNull {
-            it.jsonObject["name"]?.jsonPrimitive?.content
-        }?.joinToString()
+        }?.joinToString(", ")
         val enContent = jsonObject["en_content"]?.jsonPrimitive?.content
         val year = jsonObject["year"]?.jsonPrimitive?.content ?: "N/A"
         val stars = jsonObject["stars"]?.jsonPrimitive?.content?.parseAs<Float>()?.toInt() ?: 0
@@ -157,13 +149,8 @@ object SAnimeDeserializer : DeserializationStrategy<SAnime> {
             url = nb
             title = enTitle
             thumbnail_url = imgObjUrl
-            genre = genreText
-            author = directors
-            artist = actors
-            description = listOfNotNull(
-                "$year | $starsText | $likes\uD83D\uDC4D  $dislikes\uD83D\uDC4E",
-                enContent,
-            ).joinToString("\n\n")
+            genre = categories
+            description = "$year | $starsText | $likes\uD83D\uDC4D  $dislikes\uD83D\uDC4E\n\n$enContent"
         }
     }
 }
@@ -191,8 +178,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         private const val SUB_CATEGORY_FILTER_NAME = "Sub Category"
         private const val LANGUAGE_FILTER_NAME = "Language"
         private const val YEAR_FILTER_NAME = "Year"
-        private const val BROWSE_RESULT_SORT_FILTER_NAME = "Browse Sort"
-        private const val STAFF_TITLE_FILTER_NAME = "Staff Title"
+        private const val BROWSE_RESULT_SORT_FILTER = "Browse Sort"
 
         private const val POPULAR_ITEMS_PER_PAGE = 30
         private const val SEARCH_ITEMS_PER_PAGE = 12
@@ -267,8 +253,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         val subCategoryFilter = filterList.find { it.name == SUB_CATEGORY_FILTER_NAME } as MultipleSelectFilter
         val languageFilter = filterList.find { it.name == LANGUAGE_FILTER_NAME } as SingleSelectFilter
         val yearFilter = filterList.find { it.name == YEAR_FILTER_NAME } as YearFilter
-        val staffTitleFilter = filterList.find { it.name == STAFF_TITLE_FILTER_NAME } as StaffTitleFilter
-        val browseResultSortFilter = filterList.find { it.name == BROWSE_RESULT_SORT_FILTER_NAME } as BrowseResultSort
+        val browseResultSortFilter = filterList.find { it.name == BROWSE_RESULT_SORT_FILTER } as BrowseResultSort
         val isBrowsing = isBrowsingFilter.state
         val kindName = kindFilter.getNameValue()
         val kindNumber = kindFilter.getNumberValue().toString()
@@ -278,7 +263,6 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         val bothCategory = (selectedMainCategories + selectedSubCategories).joinToString(",")
         val language = languageFilter.getNumberValue().toString()
         val year = yearFilter.getFormatted()
-        val staffTitle = staffTitleFilter.state
         val browseResultSort = browseResultSortFilter.getValue()
 
         var url = apiBaseUrl.toHttpUrl()
@@ -327,12 +311,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
             if (query.isNotBlank()) {
                 url = url.newBuilder()
                     .addQueryParameter("videoTitle", query)
-                    .build()
-            }
-
-            if (staffTitle.isNotBlank()) {
-                url = url.newBuilder()
-                    .addQueryParameter("staffTitle", staffTitle)
+                    .addQueryParameter("staffTitle", query)
                     .build()
             }
 
@@ -446,10 +425,8 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
-    private open class StaffTitleFilter(displayName: String) : AnimeFilter.Text(displayName)
-
     override fun getFilterList() = AnimeFilterList(
-        StaffTitleFilter(STAFF_TITLE_FILTER_NAME),
+        AnimeFilter.Header("Filter Search Result"),
         CheckBoxFilter(IS_BROWSING_FILTER_NAME, false),
         SingleSelectFilter(
             KIND_FILTER_NAME,
@@ -573,7 +550,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
                 YearTextFilter("end", Calendar.getInstance().get(Calendar.YEAR).toString()),
         ),
         BrowseResultSort(
-            BROWSE_RESULT_SORT_FILTER_NAME,
+            BROWSE_RESULT_SORT_FILTER,
             arrayOf(
                 Pair("Upload", Pair("asc", "desc")),
                 Pair("Release", Pair("r_asc", "r_desc")),
diff --git a/src/ar/akwam/build.gradle b/src/ar/akwam/build.gradle
new file mode 100644
index 00000000..fed8424f
--- /dev/null
+++ b/src/ar/akwam/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'Akwam'
+    extClass = '.Akwam'
+    extVersionCode = 9
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/ar/akwam/res/mipmap-hdpi/ic_launcher.png b/src/ar/akwam/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..f3a987bb
Binary files /dev/null and b/src/ar/akwam/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/ar/akwam/res/mipmap-mdpi/ic_launcher.png b/src/ar/akwam/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..b0fc45b1
Binary files /dev/null and b/src/ar/akwam/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/ar/akwam/res/mipmap-xhdpi/ic_launcher.png b/src/ar/akwam/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..e86373dc
Binary files /dev/null and b/src/ar/akwam/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/ar/akwam/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/akwam/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..958f71d4
Binary files /dev/null and b/src/ar/akwam/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/ar/akwam/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/akwam/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..386d7cfa
Binary files /dev/null and b/src/ar/akwam/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt
new file mode 100644
index 00000000..e4673522
--- /dev/null
+++ b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt
@@ -0,0 +1,355 @@
+package eu.kanade.tachiyomi.animeextension.ar.akwam
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class Akwam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "أكوام"
+
+    override val baseUrl = "https://akw-cdn1.link"
+
+    override val lang = "ar"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // Popular
+
+    override fun popularAnimeSelector(): String = "div.entry-box-1 div.entry-image a.box"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/movies?page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = element.select("picture img").attr("data-src")
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.title = element.select("picture img").attr("alt")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+
+    // episodes
+    override fun episodeListSelector() = "div.bg-primary2 h2 a"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+        fun addEpisodes(document: Document) {
+            if (document.select(episodeListSelector()).isNullOrEmpty()) {
+                // add movie
+                document.select("input#reportInputUrl").map { episodes.add(episodeFromElement(it)) }
+            } else {
+                document.select(episodeListSelector()).map { episodes.add(episodesFromElement(it)) }
+            }
+        }
+        addEpisodes(response.asJsoup())
+        return episodes
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        episode.setUrlWithoutDomain(element.attr("value"))
+        episode.name = "مشاهدة"
+        return episode
+    }
+
+    private fun episodesFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        val epNum = getNumberFromEpsString(element.text())
+        episode.setUrlWithoutDomain(element.attr("href"))
+        episode.name = element.text()
+        episode.episode_number = when {
+            epNum.isNotEmpty() -> epNum.toFloatOrNull() ?: 1F
+            else -> 1F
+        }
+        return episode
+    }
+
+    private fun getNumberFromEpsString(epsStr: String): String {
+        return epsStr.filter { it.isDigit() }
+    }
+
+    // Video links
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val iframe = "https://akw-cdn1.link/watch" + document.select("a.link-show").attr("href").substringAfter("watch") + "/" + document.ownerDocument()!!.select("input#page_id").attr("value")
+        val referer = response.request.url.toString()
+        val refererHeaders = Headers.headersOf("referer", referer)
+        val iframeResponse = client.newCall(GET(iframe, refererHeaders))
+            .execute().asJsoup()
+        return iframeResponse.select(videoListSelector()).map { videoFromElement(it) }
+    }
+
+    override fun videoListSelector() = "source"
+
+    override fun videoFromElement(element: Element): Video {
+        return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http"))
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", null)
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(quality)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    // Search
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = element.select("picture img").attr("data-src")
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.title = element.select("picture img").attr("alt")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+
+    override fun searchAnimeSelector(): String = "div.widget div.widget-body div.col-lg-auto div.entry-box div.entry-image a.box"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val url = if (query.isNotBlank()) {
+            val url = "$baseUrl/search?q=$query&page=$page".toHttpUrlOrNull()!!.newBuilder()
+            filters.forEach { filter ->
+                when (filter) {
+                    is SectionFilter -> url.addQueryParameter("section", filter.toUriPart())
+                    is RatingFilter -> url.addQueryParameter("rating", filter.toUriPart())
+                    is FormatFilter -> url.addQueryParameter("formats", filter.toUriPart())
+                    is QualityFilter -> url.addQueryParameter("quality", filter.toUriPart())
+                    else -> {}
+                }
+            }
+            url.toString()
+        } else {
+            val url = "$baseUrl/search?page=$page".toHttpUrlOrNull()!!.newBuilder()
+            var type = "movies"
+            filters.forEach { filter ->
+                when (filter) {
+                    is TypeFilter -> type = filter.toUriPart().toString()
+                    is SectionSFilter -> url.addQueryParameter("section", filter.toUriPart())
+                    is CategorySFilter -> url.addQueryParameter("category", filter.toUriPart())
+                    is RatingSFilter -> url.addQueryParameter("rating", filter.toUriPart())
+                    // is LanguageSFilter -> url.addQueryParameter("quality", filter.toUriPart())
+                    else -> {}
+                }
+            }
+            url.toString().replace("search", type)
+        }
+        return GET(url, headers)
+    }
+
+    // Anime Details
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        // anime.thumbnail_url = document.select("div.container div div a picture > img.img-fluid").attr("data-src")
+        anime.title = document.select("picture > img.img-fluid").attr("alt")
+        anime.genre = document.select("div.font-size-16.d-flex.align-items-center.mt-3 a.badge, span.badge-info, span:contains(جودة الفيلم), span:contains(انتاج)").joinToString(", ") { it.text().replace("جودة الفيلم : ", "") }
+        anime.author = document.select("span:contains(انتاج)").text().replace("انتاج : ", "")
+        anime.description = document.select("div.widget:contains(قصة )").text()
+        anime.status = SAnime.COMPLETED
+        return anime
+    }
+
+    // Latest
+
+    override fun latestUpdatesNextPageSelector(): String = throw UnsupportedOperationException()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+
+    override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
+
+    // Filters
+
+    override fun getFilterList() = AnimeFilterList(
+        AnimeFilter.Header("فلترات البحث"),
+        AnimeFilter.Separator(),
+        SectionFilter(getSectionFilter()),
+        RatingFilter(getRatingFilter()),
+        FormatFilter(getFormatFilter()),
+        QualityFilter(getQualityFilter()),
+        AnimeFilter.Header("تصفح الموقع (تعمل فقط لو كان البحث فارغ)"),
+        AnimeFilter.Separator(),
+        TypeFilter(getTypeFilter()),
+        SectionSFilter(getSectionSFilter()),
+        CategorySFilter(getCategorySFilter()),
+        RatingSFilter(getRatingSFilter()),
+    )
+
+    private class SectionFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("الأقسام", vals)
+    private class RatingFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("التقيم", vals)
+    private class FormatFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("الجودة", vals)
+    private class QualityFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("الدقة", vals)
+    private class TypeFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("النوع", vals)
+    private class SectionSFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("القسم", vals)
+    private class CategorySFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("التصنيف", vals)
+    private class RatingSFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("التقييم", vals)
+    private fun getTypeFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("movies", "افلام"),
+        Pair("series", "مسلسلات"),
+    )
+    private fun getSectionFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "الكل"),
+        Pair("movie", "افلام"),
+        Pair("series", "مسلسلات"),
+        Pair("show", "تلفزيون"),
+    )
+
+    private fun getRatingFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "التقييم"),
+        Pair("1", "1+"),
+        Pair("2", "2+"),
+        Pair("3", "3+"),
+        Pair("4", "4+"),
+        Pair("5", "5+"),
+        Pair("6", "6+"),
+        Pair("7", "7+"),
+        Pair("8", "8+"),
+        Pair("9", "9+"),
+    )
+
+    private fun getFormatFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "الكل"),
+        Pair("BluRay", "BluRay"),
+        Pair("WebRip", "WebRip"),
+        Pair("BRRIP", "BRRIP"),
+        Pair("DVDrip", "DVDrip"),
+        Pair("DVDSCR", "DVDSCR"),
+        Pair("HD", "HD"),
+        Pair("HDTS", "HDTS"),
+        Pair("HDTV", "HDTV"),
+        Pair("CAM", "CAM"),
+        Pair("WEB-DL", "WEB-DL"),
+        Pair("HDTC", "HDTC"),
+        Pair("BDRIP", "BDRIP"),
+        Pair("HDRIP", "HDRIP"),
+        Pair("HC+HDRIP", "HC HDRIP"),
+    )
+
+    private fun getQualityFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "الدقة"),
+        Pair("240p", "240p"),
+        Pair("360p", "360p"),
+        Pair("480p", "480p"),
+        Pair("720p", "720p"),
+        Pair("1080p", "1080p"),
+        Pair("3D", "3D"),
+        Pair("4K", "4K"),
+    )
+
+    private fun getSectionSFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "القسم"),
+        Pair("29", "عربي"),
+        Pair("30", "اجنبي"),
+        Pair("31", "هندي"),
+        Pair("32", "تركي"),
+        Pair("33", "اسيوي"),
+    )
+
+    private fun getCategorySFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "التصنيف"),
+        Pair("87", "رمضان"),
+        Pair("30", "انمي"),
+        Pair("18", "اكشن"),
+        Pair("71", "مدبلج"),
+        Pair("72", "NETFLIX"),
+        Pair("20", "كوميدي"),
+        Pair("35", "اثارة"),
+        Pair("34", "غموض"),
+        Pair("33", "عائلي"),
+        Pair("88", "اطفال"),
+        Pair("25", "حربي"),
+        Pair("32", "رياضي"),
+        Pair("89", "قصير"),
+        Pair("43", "فانتازيا"),
+        Pair("24", "خيال علمي"),
+        Pair("31", "موسيقى"),
+        Pair("29", "سيرة ذاتية"),
+        Pair("28", "وثائقي"),
+        Pair("27", "رومانسي"),
+        Pair("26", "تاريخي"),
+        Pair("23", "دراما"),
+        Pair("22", "رعب"),
+        Pair("21", "جريمة"),
+        Pair("19", "مغامرة"),
+        Pair("91", "غربي"),
+    )
+
+    private fun getRatingSFilter(): Array<Pair<String?, String>> = arrayOf(
+        Pair("0", "التقييم"),
+        Pair("1", "1+"),
+        Pair("2", "2+"),
+        Pair("3", "3+"),
+        Pair("4", "4+"),
+        Pair("5", "5+"),
+        Pair("6", "6+"),
+        Pair("7", "7+"),
+        Pair("8", "8+"),
+        Pair("9", "9+"),
+    )
+
+    open class UriPartFilter(displayName: String, private val vals: Array<Pair<String?, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.second }.toTypedArray()) {
+        fun toUriPart() = vals[state].first
+    }
+
+    // preferred quality settings
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("1080p", "720p", "480p", "360p", "240p")
+            entryValues = arrayOf("1080", "720", "480", "360", "240")
+            setDefaultValue("1080")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}
diff --git a/src/ar/tuktukcinema/build.gradle b/src/ar/tuktukcinema/build.gradle
new file mode 100644
index 00000000..349eabf7
--- /dev/null
+++ b/src/ar/tuktukcinema/build.gradle
@@ -0,0 +1,17 @@
+ext {
+    extName = 'Tuktuk Cinema'
+    extClass = '.Tuktukcinema'
+    extVersionCode = 24
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:vidbom-extractor'))
+    implementation(project(':lib:playlist-utils'))
+    implementation(libs.jsunpacker)
+}
diff --git a/src/ar/tuktukcinema/res/mipmap-hdpi/ic_launcher.png b/src/ar/tuktukcinema/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..db20dc7b
Binary files /dev/null and b/src/ar/tuktukcinema/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/ar/tuktukcinema/res/mipmap-mdpi/ic_launcher.png b/src/ar/tuktukcinema/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..d29ea29a
Binary files /dev/null and b/src/ar/tuktukcinema/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/ar/tuktukcinema/res/mipmap-xhdpi/ic_launcher.png b/src/ar/tuktukcinema/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..c1f34e21
Binary files /dev/null and b/src/ar/tuktukcinema/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/ar/tuktukcinema/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/tuktukcinema/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..f007b8ce
Binary files /dev/null and b/src/ar/tuktukcinema/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/ar/tuktukcinema/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/tuktukcinema/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..707a055d
Binary files /dev/null and b/src/ar/tuktukcinema/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
new file mode 100644
index 00000000..be33bfc8
--- /dev/null
+++ b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
@@ -0,0 +1,309 @@
+package eu.kanade.tachiyomi.animeextension.ar.tuktukcinema
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "توك توك سينما"
+
+    // TODO: Check frequency of url changes to potentially
+    // add back overridable baseurl preference
+    override val baseUrl = "https://w.tuktokcinema.com"
+
+    override val lang = "ar"
+
+    override val supportsLatest = true
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // ============================ popular ===============================
+
+    override fun popularAnimeSelector(): String = "div.Block--Item, div.Small--Box"
+
+    override fun popularAnimeRequest(page: Int): Request = GET(baseUrl)
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.title = titleEdit(element.select("a").attr("title"), true).trim()
+        anime.thumbnail_url = element.select("img").attr("data-src")
+        anime.setUrlWithoutDomain(element.select("a").attr("href") + "watch/")
+        return anime
+    }
+
+    private fun titleEdit(title: String, details: Boolean = false): String {
+        return if (Regex("(?:فيلم|عرض)\\s(.*\\s[0-9]+)\\s(.+?)\\s").containsMatchIn(title)) {
+            val titleGroup = Regex("(?:فيلم|عرض)\\s(.*\\s[0-9]+)\\s(.+?)\\s").find(title)
+            val movieName = titleGroup!!.groupValues[1]
+            val type = titleGroup.groupValues[2]
+            movieName + if (details) " ($type)" else ""
+        } else if (Regex("(?:مسلسل|برنامج|انمي)\\s(.+)\\sالحلقة\\s(\\d+)").containsMatchIn(title)) {
+            val titleGroup = Regex("(?:مسلسل|برنامج|انمي)\\s(.+)\\sالحلقة\\s(\\d+)").find(title)
+            val seriesName = titleGroup!!.groupValues[1]
+            val epNum = titleGroup.groupValues[2]
+            if (details) {
+                "$seriesName (ep:$epNum)"
+            } else if (seriesName.contains("الموسم")) {
+                seriesName.split("الموسم")[0].trim()
+            } else {
+                seriesName
+            }
+        } else {
+            title
+        }
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "div.pagination ul.page-numbers li a.next"
+
+    // ============================ episodes ===============================
+
+    private fun seasonsNextPageSelector() = "section.allseasonss div.Block--Item"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+        fun addEpisodeNew(url: String, title: String) {
+            val episode = SEpisode.create()
+            episode.setUrlWithoutDomain(url)
+            episode.name = title
+            episodes.add(episode)
+        }
+        fun addEpisodes(response: Response) {
+            val document = response.asJsoup()
+            val url = response.request.url.toString()
+            if (document.select(seasonsNextPageSelector()).isNullOrEmpty()) {
+                addEpisodeNew("$url/watch/", "مشاهدة")
+            } else {
+                document.select(seasonsNextPageSelector()).reversed().forEach { season ->
+                    val seasonNum = season.select("h3").text()
+                    (
+                        if (seasonNum == document.selectFirst("div#mpbreadcrumbs a span:contains(الموسم)")!!.text()) {
+                            document
+                        } else {
+                            client.newCall(GET(season.selectFirst("a")!!.attr("href"))).execute().asJsoup()
+                        }
+                        )
+                        .select("section.allepcont a").forEach { episode ->
+                            addEpisodeNew(
+                                episode.attr("href") + "watch/",
+                                seasonNum + " : الحلقة " + episode.select("div.epnum").text().filter { it.isDigit() },
+                            )
+                        }
+                }
+            }
+        }
+        addEpisodes(response)
+        return episodes
+    }
+
+    override fun episodeListSelector() = "link[rel=canonical]"
+
+    override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
+
+    // ============================ video links ============================
+    override fun videoListRequest(episode: SEpisode): Request {
+        val refererHeaders = headers.newBuilder().apply {
+            add("Referer", "$baseUrl/")
+        }.build()
+
+        return GET("$baseUrl/${episode.url}", headers = refererHeaders)
+    }
+
+    override fun videoListSelector() = "div.watch--servers--list ul li.server--item"
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        return document.select(videoListSelector())
+            .parallelCatchingFlatMapBlocking(::extractVideos)
+    }
+
+    private fun extractVideos(element: Element): List<Video> {
+        val url = element.attr("data-link")
+        val txt = element.text()
+        return when {
+            "Main" in txt -> {
+                videosFromMain(url)
+            }
+            url.contains("ok") -> {
+                OkruExtractor(client).videosFromUrl(url)
+            }
+            "Vidbom" in txt || "Vidshare" in txt || "Govid" in txt -> {
+                VidBomExtractor(client).videosFromUrl(url)
+            }
+            "Doodstream" in txt -> {
+                DoodExtractor(client).videoFromUrl(url, "Dood mirror")?.let(::listOf)
+            }
+            url.contains("uqload") -> {
+                UqloadExtractor(client).videosFromUrl(url, "mirror")
+            }
+            url.contains("tape") -> {
+                StreamTapeExtractor(client).videoFromUrl(url)?.let(::listOf)
+            }
+            "Upstream" in txt || "Streamruby" in txt || "Streamwish" in txt -> {
+                videosFromOthers(url, txt)
+            }
+            else -> null
+        } ?: emptyList()
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", null)!!
+        return sortedWith(
+            compareBy { it.quality.contains(quality) },
+        ).reversed()
+    }
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    private fun videosFromMain(url: String): List<Video> {
+        val jsE = client.newCall(GET(url)).execute().asJsoup().selectFirst("script:containsData(player)")!!.data()
+        val fileLinks = JsUnpacker.unpackAndCombine(jsE)!!.substringAfter("file").substringBefore("\",")
+        return Regex("\\[(.*?)\\](.*?mp4)").findAll(fileLinks).map {
+            Video(it.groupValues[2], "Main: " + it.groupValues[1], it.groupValues[2])
+        }.toList()
+    }
+    private fun videosFromOthers(url: String, prefix: String): List<Video> {
+        val jsE = client.newCall(GET(url)).execute().asJsoup().selectFirst("script:containsData(source)")!!.data()
+        val masterUrl = JsUnpacker.unpackAndCombine(jsE)!!.substringAfter("file").substringAfter("\"").substringBefore("\"")
+        return PlaylistUtils(client).extractFromHls(masterUrl, url, videoNameGen = { "$prefix - $it" })
+    }
+    // ============================ search ============================
+
+    override fun searchAnimeSelector(): String = "div.Block--Item"
+
+    override fun searchAnimeNextPageSelector(): String = "div.pagination ul.page-numbers li a.next"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val url = if (query.isNotBlank()) {
+            "$baseUrl/?s=$query&page=$page"
+        } else {
+            val url = baseUrl
+            (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
+                when (filter) {
+                    is CategoryList -> {
+                        if (filter.state > 0) {
+                            val catQ = getCategoryList()[filter.state].query
+                            val catUrl = "$baseUrl/$catQ/?page=$page/"
+                            return GET(catUrl, headers)
+                        }
+                    }
+                    else -> {}
+                }
+            }
+            return GET(url, headers)
+        }
+        return GET(url, headers)
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.title = titleEdit(element.select("h3").text(), true).trim()
+        anime.thumbnail_url = element.select("img").attr(if (element.ownerDocument()!!.location().contains("?s="))"src" else "data-src")
+        anime.setUrlWithoutDomain(element.select("a").attr("href") + "watch/")
+        return anime
+    }
+
+    // ============================ details ============================
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.genre = document.select("div.catssection li a").joinToString(", ") { it.text() }
+        anime.title = titleEdit(document.select("h1.post-title").text()).trim()
+        anime.author = document.select("ul.RightTaxContent li:contains(دولة) a").text()
+        anime.description = document.select("div.story").text().trim()
+        anime.status = SAnime.COMPLETED
+        anime.thumbnail_url = document.select("div.left div.image img").attr("src")
+        return anime
+    }
+
+    // ============================ latest ============================
+
+    override fun latestUpdatesSelector(): String = "div.Block--Item"
+
+    override fun latestUpdatesNextPageSelector(): String = "div.pagination ul.page-numbers li a.next"
+
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/recent/page/$page/")
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.title = titleEdit(element.select("a").attr("title"), true).trim()
+        anime.thumbnail_url = element.select("img").attr("data-src")
+        anime.setUrlWithoutDomain(element.select("a").attr("href") + "watch/")
+        return anime
+    }
+
+    // ============================ filters ============================
+
+    override fun getFilterList() = AnimeFilterList(
+        CategoryList(categoriesName),
+    )
+
+    private class CategoryList(categories: Array<String>) : AnimeFilter.Select<String>("الأقسام", categories)
+    private data class CatUnit(val name: String, val query: String)
+    private val categoriesName = getCategoryList().map {
+        it.name
+    }.toTypedArray()
+
+    private fun getCategoryList() = listOf(
+        CatUnit("اختر", ""),
+        CatUnit("كل الافلام", "category/movies-33/"),
+        CatUnit("افلام اجنبى", "category/movies-33/افلام-اجنبي/"),
+        CatUnit("افلام انمى", "category/anime-6/افلام-انمي/"),
+        CatUnit("افلام تركيه", "category/movies-33/افلام-تركي/"),
+        CatUnit("افلام اسيويه", "category/movies-33/افلام-اسيوي/"),
+        CatUnit("افلام هنديه", "category/movies-33/افلام-هندى/"),
+        CatUnit("كل المسسلسلات", "category/series-9/"),
+        CatUnit("مسلسلات اجنبى", "category/series-9/مسلسلات-اجنبي/"),
+        CatUnit("مسلسلات انمى", "category/anime-6/انمي-مترجم/"),
+        CatUnit("مسلسلات تركى", "category/series-9/مسلسلات-تركي/"),
+        CatUnit("مسلسلات اسيوى", "category/series-9/مسلسلات-أسيوي/"),
+        CatUnit("مسلسلات هندى", "category/series-9/مسلسلات-هندي/"),
+    )
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("720p", "480p", "Low", "Normal", "HD", "UHD", "DoodStream", "Uqload")
+            entryValues = arrayOf("720", "480", "Low", "Normal", "HD", "UHD", "Dood", "Uqload")
+            setDefaultValue("1080")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}
diff --git a/src/ar/xsanime/build.gradle b/src/ar/xsanime/build.gradle
new file mode 100644
index 00000000..3783a312
--- /dev/null
+++ b/src/ar/xsanime/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'XS Anime'
+    extClass = '.XsAnime'
+    extVersionCode = 10
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/ar/xsanime/res/mipmap-hdpi/ic_launcher.png b/src/ar/xsanime/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..b1e2d35c
Binary files /dev/null and b/src/ar/xsanime/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/ar/xsanime/res/mipmap-mdpi/ic_launcher.png b/src/ar/xsanime/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..adf2029a
Binary files /dev/null and b/src/ar/xsanime/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/ar/xsanime/res/mipmap-xhdpi/ic_launcher.png b/src/ar/xsanime/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..5cbc085e
Binary files /dev/null and b/src/ar/xsanime/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/ar/xsanime/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/xsanime/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..8c5afd54
Binary files /dev/null and b/src/ar/xsanime/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/ar/xsanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/xsanime/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..9e005bdf
Binary files /dev/null and b/src/ar/xsanime/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt b/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt
new file mode 100644
index 00000000..ad7c9cea
--- /dev/null
+++ b/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt
@@ -0,0 +1,225 @@
+package eu.kanade.tachiyomi.animeextension.ar.xsanime
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class XsAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "XS Anime"
+
+    override val baseUrl = "https://ww.xsanime.com"
+
+    override val lang = "ar"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // Popular Anime
+    override fun popularAnimeSelector(): String = "ul.boxes--holder div.itemtype_anime a"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/anime_list/page/$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.title = element.attr("title")
+        anime.thumbnail_url = element.selectFirst("div.itemtype_anime_poster img")!!.attr("data-src")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
+
+    // Episodes
+    override fun episodeListSelector() = "div.EpisodesList > a"
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        val epNum = getNumberFromEpsString(element.select("a > em").text())
+        episode.setUrlWithoutDomain(element.attr("abs:href"))
+        episode.name = element.select("a > em").text()
+        episode.episode_number = when {
+            epNum.isNotEmpty() -> epNum.toFloatOrNull() ?: 1F
+            else -> 1F
+        }
+
+        return episode
+    }
+
+    private fun getNumberFromEpsString(epsStr: String): String {
+        return epsStr.filter { it.isDigit() }
+    }
+
+    // Video Links
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val srcVid = preferences.getString("preferred_quality", "الجودة العالية")!!
+        val iframe = document.select("div.downloads ul div.listServ:contains($srcVid) div.serL a[href~=4shared]").attr("href").substringBeforeLast("/").replace("video", "web/embed/file")
+        val referer = response.request.url.toString()
+        val refererHeaders = Headers.headersOf("referer", referer)
+        val iframeResponse = client.newCall(GET(iframe, refererHeaders))
+            .execute().asJsoup()
+        return iframeResponse.select(videoListSelector()).map { videoFromElement(it) }
+    }
+
+    override fun videoListSelector() = "source"
+
+    override fun videoFromElement(element: Element): Video {
+        element.attr("src")
+        return Video(element.attr("src"), "Default: If you want to change the quality go to extension settings", element.attr("src"))
+    }
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    // Search
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.title = element.attr("title")
+        anime.thumbnail_url = element.selectFirst("div.itemtype_anime_poster img")!!.attr("data-src")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
+
+    override fun searchAnimeSelector(): String = "ul.boxes--holder div.itemtype_anime a"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        return if (query.isNotBlank()) {
+            GET("$baseUrl/?s=$query&type=anime&page=$page", headers)
+        } else {
+            val url = "$baseUrl/anime_list/page/$page/?".toHttpUrlOrNull()!!.newBuilder()
+            filters.forEach { filter ->
+                when (filter) {
+                    // is SeasonFilter -> url.addQueryParameter("season", filter.toUriPart())
+                    is GenreFilter -> url.addQueryParameter("genre", filter.toUriPart())
+                    is StatusFilter -> url.addQueryParameter("status", filter.toUriPart())
+                    // is LetterFilter -> url.addQueryParameter("letter", filter.toUriPart())
+                    else -> {}
+                }
+            }
+            GET(url.build().toString(), headers)
+        }
+    }
+
+    // Anime Details
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.selectFirst("div.inner--image img")!!.attr("src")
+        anime.title = document.select("h1.post--inner-title").text()
+        anime.genre = document.select("ul.terms--and--metas > li:contains(تصنيفات الأنمي) > a").joinToString(", ") { it.text() }
+        anime.description = document.select("div.post--content--inner").text()
+        document.select("ul.terms--and--metas li:contains(عدد الحلقات) a").text()?.also { statusText ->
+            when {
+                statusText.contains("غير معروف", true) -> anime.status = SAnime.ONGOING
+                else -> anime.status = SAnime.COMPLETED
+            }
+        }
+        return anime
+    }
+
+    // Filters
+
+    override fun getFilterList() = AnimeFilterList(
+        AnimeFilter.Header("NOTE: Ignored if using text search!"),
+        AnimeFilter.Separator(),
+        GenreFilter(getGenreFilters()),
+        StatusFilter(getStatusFilters()),
+        // SeasonFilter(getStatusFilters()),
+        // LetterFilter(getLetterFilter()),
+    )
+
+    private class StatusFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("حالة الأنمي", vals)
+    private class GenreFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("تصنيفات الانمى", vals)
+    // private class SeasonFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("موسم الانمى", vals)
+    // private class LetterFilter(vals: Array<Pair<String?, String>>) : UriPartFilter("الحرف", vals)
+
+    private fun getStatusFilters(): Array<Pair<String?, String>> = arrayOf(
+        Pair("", "<اختر>"),
+        Pair("مستمر", "مستمر"),
+        Pair("منتهي", "منتهي"),
+    )
+
+    private fun getGenreFilters(): Array<Pair<String?, String>> = arrayOf(
+        Pair("", "<اختر>"),
+        Pair("أكشن", "أكشن"),
+        Pair("تاريخي", "تاريخي"),
+        Pair("حريم", "حريم"),
+        Pair("خارق للطبيعة", "خارق للطبيعة"),
+        Pair("خيال", "خيال"),
+        Pair("دراما", "دراما"),
+        Pair("رومانسي", "رومانسي"),
+        Pair("رياضي", "رياضي"),
+        Pair("سينين", "سينين"),
+        Pair("شونين", "شونين"),
+        Pair("شياطين", "شياطين"),
+        Pair("غموض", "غموض"),
+        Pair("قوى خارقة", "قوى خارقة"),
+        Pair("كوميدي", "كوميدي"),
+        Pair("لعبة", "لعبة"),
+        Pair("مدرسي", "مدرسي"),
+        Pair("مغامرات", "مغامرات"),
+        Pair("موسيقي", "موسيقي"),
+        Pair("نفسي", "نفسي"),
+    )
+
+    open class UriPartFilter(displayName: String, private val vals: Array<Pair<String?, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.second }.toTypedArray()) {
+        fun toUriPart() = vals[state].first
+    }
+
+    // Latest
+
+    override fun latestUpdatesNextPageSelector(): String? = throw UnsupportedOperationException()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+
+    override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val qualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred Quality"
+            entries = arrayOf("الجودة العالية", "الجودة الخارقة", "الجودة المتوسطة")
+            entryValues = arrayOf("الجودة العالية", "الجودة الخارقة", "الجودة المتوسطة")
+            setDefaultValue("الجودة العالية")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(qualityPref)
+    }
+}
diff --git a/src/ar/xsmovie/build.gradle b/src/ar/xsmovie/build.gradle
new file mode 100644
index 00000000..fdc97983
--- /dev/null
+++ b/src/ar/xsmovie/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'XS Movie'
+    extClass = '.XsMovie'
+    extVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/ar/xsmovie/res/mipmap-hdpi/ic_launcher.png b/src/ar/xsmovie/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..419d1621
Binary files /dev/null and b/src/ar/xsmovie/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/ar/xsmovie/res/mipmap-mdpi/ic_launcher.png b/src/ar/xsmovie/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..423ee9c9
Binary files /dev/null and b/src/ar/xsmovie/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/ar/xsmovie/res/mipmap-xhdpi/ic_launcher.png b/src/ar/xsmovie/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..1a7b9831
Binary files /dev/null and b/src/ar/xsmovie/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/ar/xsmovie/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/xsmovie/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..820ac2fd
Binary files /dev/null and b/src/ar/xsmovie/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/ar/xsmovie/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/xsmovie/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..100da0fa
Binary files /dev/null and b/src/ar/xsmovie/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt b/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt
new file mode 100644
index 00000000..4a147662
--- /dev/null
+++ b/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt
@@ -0,0 +1,149 @@
+package eu.kanade.tachiyomi.animeextension.ar.xsmovie
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class XsMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "XS Movie"
+
+    override val baseUrl = "https://ww.xsanime.com"
+
+    override val lang = "ar"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // Popular Anime
+    override fun popularAnimeSelector(): String = "ul.boxes--holder div.itemtype_anime a"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/movies_list/page/$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.title = element.attr("title")
+        anime.thumbnail_url = element.selectFirst("div.itemtype_anime_poster img")!!.attr("data-src")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
+
+    // Episodes
+    override fun episodeListSelector() = "h1.post--inner-title > a"
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        episode.setUrlWithoutDomain(element.attr("href"))
+        episode.name = element.text().replace("فيلم ", "").replace("مترجم ", "").replace("اون لاين ", "").replace("بلوراي", "") // "movie"
+
+        return episode
+    }
+
+    // Video Links
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val srcVid = preferences.getString("preferred_quality", "الجودة العالية")!!
+        val iframe = document.select("div.downloads ul div.listServ:contains($srcVid) div.serL a[href~=4shared]").attr("href").substringBeforeLast("/").replace("video", "web/embed/file")
+        val referer = response.request.url.toString()
+        val refererHeaders = Headers.headersOf("referer", referer)
+        val iframeResponse = client.newCall(GET(iframe, refererHeaders))
+            .execute().asJsoup()
+        return iframeResponse.select(videoListSelector()).map { videoFromElement(it) }
+    }
+
+    override fun videoListSelector() = "source"
+
+    override fun videoFromElement(element: Element): Video {
+        return Video(element.attr("src"), "Default: If you want to change the quality go to extension settings", element.attr("src"))
+    }
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    // Search
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.title = element.attr("title")
+        anime.thumbnail_url = element.selectFirst("div.itemtype_anime_poster img")!!.attr("data-src")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
+
+    override fun searchAnimeSelector(): String = "ul.boxes--holder div.itemtype_anime a"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        return GET("$baseUrl/?s=$query&type=movie&page=$page", headers)
+    }
+
+    // Anime Details
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.selectFirst("div.inner--image img")!!.attr("src")
+        anime.title = document.select("h1.post--inner-title").text()
+        anime.genre = document.select("ul.terms--and--metas > li:contains(تصنيفات الأنمي) > a").joinToString(", ") { it.text() }
+        anime.description = document.select("div.post--content--inner").text()
+        document.select("ul.terms--and--metas li:contains(عدد الحلقات) a").text()?.also { statusText ->
+            when {
+                statusText.contains("غير معروف", true) -> anime.status = SAnime.ONGOING
+                else -> anime.status = SAnime.COMPLETED
+            }
+        }
+        return anime
+    }
+
+    // Latest
+
+    override fun latestUpdatesNextPageSelector(): String? = throw UnsupportedOperationException()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+
+    override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val qualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred Quality"
+            entries = arrayOf("الجودة العالية", "الجودة الخارقة", "الجودة المتوسطة")
+            entryValues = arrayOf("الجودة العالية", "الجودة الخارقة", "الجودة المتوسطة")
+            setDefaultValue("الجودة العالية")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(qualityPref)
+    }
+}
diff --git a/src/de/cineclix/build.gradle b/src/de/cineclix/build.gradle
new file mode 100644
index 00000000..dbc4a7b2
--- /dev/null
+++ b/src/de/cineclix/build.gradle
@@ -0,0 +1,16 @@
+ext {
+    extName = 'CineClix'
+    extClass = '.CineClix'
+    extVersionCode = 18
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:playlist-utils'))
+    implementation(libs.jsunpacker)
+}
diff --git a/src/de/cineclix/res/mipmap-hdpi/ic_launcher.png b/src/de/cineclix/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..743437f5
Binary files /dev/null and b/src/de/cineclix/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/de/cineclix/res/mipmap-mdpi/ic_launcher.png b/src/de/cineclix/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..1d018d45
Binary files /dev/null and b/src/de/cineclix/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/de/cineclix/res/mipmap-xhdpi/ic_launcher.png b/src/de/cineclix/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..a31b0ebd
Binary files /dev/null and b/src/de/cineclix/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/de/cineclix/res/mipmap-xxhdpi/ic_launcher.png b/src/de/cineclix/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..4da97b90
Binary files /dev/null and b/src/de/cineclix/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/de/cineclix/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/cineclix/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..edde347b
Binary files /dev/null and b/src/de/cineclix/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
new file mode 100644
index 00000000..1cfc96dc
--- /dev/null
+++ b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
@@ -0,0 +1,364 @@
+package eu.kanade.tachiyomi.animeextension.de.cineclix
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.de.cineclix.extractors.StreamVidExtractor
+import eu.kanade.tachiyomi.animeextension.de.cineclix.extractors.SuperVideoExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.network.GET
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.Headers
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class CineClix : ConfigurableAnimeSource, AnimeHttpSource() {
+
+    override val name = "CineClix"
+
+    override val baseUrl = "https://cineclix.de"
+
+    override val lang = "de"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    private val json = Json {
+        isLenient = true
+        ignoreUnknownKeys = true
+    }
+
+    override fun popularAnimeRequest(page: Int): Request = GET(
+        "$baseUrl/api/v1/channel/64?returnContentOnly=true&restriction=&order=rating:desc&paginate=simple&perPage=50&query=&page=$page",
+        headers = Headers.headersOf("referer", "$baseUrl/movies?order=rating%3Adesc"),
+    )
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val responseString = response.body.string()
+        return parsePopularAnimeJson(responseString)
+    }
+
+    private fun parsePopularAnimeJson(jsonLine: String?): AnimesPage {
+        val jsonData = jsonLine ?: return AnimesPage(emptyList(), false)
+        val jObject = json.decodeFromString<JsonObject>(jsonData)
+        val jO = jObject.jsonObject["pagination"]!!.jsonObject
+        val nextPage = jO.jsonObject["next_page"]!!.jsonPrimitive.int
+        // .substringAfter("page=").toInt()
+        val page = jO.jsonObject["current_page"]!!.jsonPrimitive.int
+        val hasNextPage = page < nextPage
+        val array = jO["data"]!!.jsonArray
+        val animeList = mutableListOf<SAnime>()
+        for (item in array) {
+            val anime = SAnime.create()
+            anime.title = item.jsonObject["name"]!!.jsonPrimitive.content
+            val animeId = item.jsonObject["id"]!!.jsonPrimitive.content
+            anime.setUrlWithoutDomain("$baseUrl/api/v1/titles/$animeId?load=images,genres,productionCountries,keywords,videos,primaryVideo,seasons,compactCredits")
+            anime.thumbnail_url = item.jsonObject["poster"]?.jsonPrimitive?.content ?: item.jsonObject["backdrop"]?.jsonPrimitive?.content
+            animeList.add(anime)
+        }
+        return AnimesPage(animeList, hasNextPage)
+    }
+
+    // episodes
+
+    override fun episodeListRequest(anime: SAnime): Request = GET(baseUrl + anime.url, headers = Headers.headersOf("referer", baseUrl))
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val responseString = response.body.string()
+        val url = response.request.url.toString()
+        return parseEpisodeAnimeJson(responseString, url)
+    }
+
+    private fun parseEpisodeAnimeJson(jsonLine: String?, url: String): List<SEpisode> {
+        val jsonData = jsonLine ?: return emptyList()
+        val jObject = json.decodeFromString<JsonObject>(jsonData)
+        val episodeList = mutableListOf<SEpisode>()
+        val mId = jObject.jsonObject["title"]!!.jsonObject["id"]!!.jsonPrimitive.content
+        val season = jObject.jsonObject["seasons"]?.jsonObject
+        if (season != null) {
+            val dataArray = season.jsonObject["data"]!!.jsonArray
+            val next = season.jsonObject["next_page"]?.jsonPrimitive?.content
+            if (next != null) {
+                val seNextJsonData = client.newCall(GET("$baseUrl/api/v1/titles/$mId/seasons?perPage=8&query=&page=$next", headers = Headers.headersOf("referer", baseUrl))).execute().body.string()
+                val seNextJObject = json.decodeFromString<JsonObject>(seNextJsonData)
+                val seasonNext = seNextJObject.jsonObject["pagination"]!!.jsonObject
+                val dataNextArray = seasonNext.jsonObject["data"]!!.jsonArray
+                val dataAllArray = dataArray.plus(dataNextArray)
+                for (item in dataAllArray) {
+                    val id = item.jsonObject["title_id"]!!.jsonPrimitive.content
+                    val num = item.jsonObject["number"]!!.jsonPrimitive.content
+                    val seUrl = "$baseUrl/api/v1/titles/$id/seasons/$num?load=episodes,primaryVideo"
+                    val seJsonData = client.newCall(GET(seUrl, headers = Headers.headersOf("referer", baseUrl))).execute().body.string()
+                    val seJObject = json.decodeFromString<JsonObject>(seJsonData)
+                    val epObject = seJObject.jsonObject["episodes"]!!.jsonObject
+                    val epDataArray = epObject.jsonObject["data"]!!.jsonArray.reversed()
+                    for (epItem in epDataArray) {
+                        val episode = SEpisode.create()
+                        val seNum = epItem.jsonObject["season_number"]!!.jsonPrimitive.content
+                        val epNum = epItem.jsonObject["episode_number"]!!.jsonPrimitive.content
+                        episode.name = "Staffel $seNum Folge $epNum : " + epItem.jsonObject["name"]!!.jsonPrimitive.content
+                        episode.episode_number = epNum.toFloat()
+                        val epId = epItem.jsonObject["title_id"]!!.jsonPrimitive.content
+                        episode.setUrlWithoutDomain("$baseUrl/api/v1/titles/$epId/seasons/$seNum/episodes/$epNum?load=videos,compactCredits,primaryVideo")
+                        episodeList.add(episode)
+                    }
+                }
+            } else {
+                for (item in dataArray) {
+                    val id = item.jsonObject["title_id"]!!.jsonPrimitive.content
+                    val num = item.jsonObject["number"]!!.jsonPrimitive.content
+                    val seUrl = "$baseUrl/api/v1/titles/$id/seasons/$num?load=episodes,primaryVideo"
+                    val seJsonData = client.newCall(GET(seUrl, headers = Headers.headersOf("referer", baseUrl))).execute().body.string()
+                    val seJObject = json.decodeFromString<JsonObject>(seJsonData)
+                    val epObject = seJObject.jsonObject["episodes"]!!.jsonObject
+                    val epDataArray = epObject.jsonObject["data"]!!.jsonArray.reversed()
+                    for (epItem in epDataArray) {
+                        val episode = SEpisode.create()
+                        val seNum = epItem.jsonObject["season_number"]!!.jsonPrimitive.content
+                        val epNum = epItem.jsonObject["episode_number"]!!.jsonPrimitive.content
+                        episode.name = "Staffel $seNum Folge $epNum : " + epItem.jsonObject["name"]!!.jsonPrimitive.content
+                        episode.episode_number = epNum.toFloat()
+                        val epId = epItem.jsonObject["title_id"]!!.jsonPrimitive.content
+                        episode.setUrlWithoutDomain("$baseUrl/api/v1/titles/$epId/seasons/$seNum/episodes/$epNum?load=videos,compactCredits,primaryVideo")
+                        episodeList.add(episode)
+                    }
+                }
+            }
+        } else {
+            val episode = SEpisode.create()
+            episode.episode_number = 1F
+            episode.name = "Film"
+            episode.setUrlWithoutDomain(url)
+            episodeList.add(episode)
+        }
+        return episodeList
+    }
+
+    // Video Extractor
+
+    override fun videoListRequest(episode: SEpisode): Request {
+        return GET(baseUrl + episode.url, headers = Headers.headersOf("referer", baseUrl))
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val responseString = response.body.string()
+        val url = response.request.url.toString()
+        return videosFromJson(responseString, url)
+    }
+
+    private fun videosFromJson(jsonLine: String?, url: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val hosterSelection = preferences.getStringSet("hoster_selection", setOf("stape", "supv", "mix", "svid", "dood", "voe"))
+        val jsonData = jsonLine ?: return emptyList()
+        val jObject = json.decodeFromString<JsonObject>(jsonData)
+        if (url.contains("episodes")) {
+            val epObject = jObject.jsonObject["episode"]!!.jsonObject
+            val videoArray = epObject.jsonObject["videos"]!!.jsonArray
+            for (item in videoArray) {
+                val host = item.jsonObject["name"]!!.jsonPrimitive.content
+                val eUrl = item.jsonObject["src"]!!.jsonPrimitive.content
+                when {
+                    host.contains("streamtape") && hosterSelection?.contains("stape") == true -> {
+                        val quality = "Streamtape"
+                        val video = StreamTapeExtractor(client).videoFromUrl(eUrl, quality)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    }
+                    host.contains("supervideo") && hosterSelection?.contains("supv") == true -> {
+                        val video = SuperVideoExtractor(client).videosFromUrl(eUrl)
+                        videoList.addAll(video)
+                    }
+                    host.contains("mixdrop") && hosterSelection?.contains("mix") == true -> {
+                        val video = MixDropExtractor(client).videoFromUrl(eUrl)
+                        videoList.addAll(video)
+                    }
+                    host.contains("streamvid") && hosterSelection?.contains("svid") == true -> {
+                        val video = StreamVidExtractor(client).videosFromUrl(eUrl)
+                        videoList.addAll(video)
+                    }
+                    host.contains("DoodStream") && hosterSelection?.contains("dood") == true -> {
+                        val video = DoodExtractor(client).videoFromUrl(eUrl)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    }
+                    host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> {
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(eUrl))
+                    }
+                }
+            }
+        } else {
+            val titleObject = jObject.jsonObject["title"]!!.jsonObject
+            val videoArray = titleObject.jsonObject["videos"]!!.jsonArray
+            for (item in videoArray) {
+                val host = item.jsonObject["name"]!!.jsonPrimitive.content
+                val fUrl = item.jsonObject["src"]!!.jsonPrimitive.content
+                when {
+                    host.contains("streamtape") && hosterSelection?.contains("stape") == true -> {
+                        val quality = "Streamtape"
+                        val video = StreamTapeExtractor(client).videoFromUrl(fUrl, quality)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    }
+                    host.contains("supervideo") && hosterSelection?.contains("supv") == true -> {
+                        val video = SuperVideoExtractor(client).videosFromUrl(fUrl)
+                        videoList.addAll(video)
+                    }
+                    host.contains("mixdrop") && hosterSelection?.contains("mix") == true -> {
+                        val video = MixDropExtractor(client).videoFromUrl(fUrl)
+                        videoList.addAll(video)
+                    }
+                    host.contains("streamvid") && hosterSelection?.contains("svid") == true -> {
+                        val video = StreamVidExtractor(client).videosFromUrl(fUrl)
+                        videoList.addAll(video)
+                    }
+                    host.contains("DoodStream") && hosterSelection?.contains("dood") == true -> {
+                        val video = DoodExtractor(client).videoFromUrl(fUrl)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    }
+                    host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> {
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(fUrl))
+                    }
+                }
+            }
+        }
+        return videoList
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val hoster = preferences.getString("preferred_hoster", null)
+        if (hoster != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(hoster)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    // Search
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET(
+        "$baseUrl/api/v1/search/$query?query=$query",
+        headers = Headers.headersOf("referer", "$baseUrl/search/$query"),
+    )
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val responseString = response.body.string()
+        return parseSearchAnimeJson(responseString)
+    }
+
+    private fun parseSearchAnimeJson(jsonLine: String?): AnimesPage {
+        val jsonData = jsonLine ?: return AnimesPage(emptyList(), false)
+        val jObject = json.decodeFromString<JsonObject>(jsonData)
+        val array = jObject["results"]!!.jsonArray
+        val animeList = mutableListOf<SAnime>()
+        for (item in array) {
+            val anime = SAnime.create()
+            anime.title = item.jsonObject["name"]!!.jsonPrimitive.content
+            val animeId = item.jsonObject["id"]!!.jsonPrimitive.content
+            anime.setUrlWithoutDomain("$baseUrl/api/v1/titles/$animeId?load=images,genres,productionCountries,keywords,videos,primaryVideo,seasons,compactCredits")
+            anime.thumbnail_url = item.jsonObject["poster"]?.jsonPrimitive?.content ?: item.jsonObject["backdrop"]?.jsonPrimitive?.content
+            animeList.add(anime)
+        }
+        return AnimesPage(animeList, hasNextPage = false)
+    }
+    // Details
+
+    override fun animeDetailsRequest(anime: SAnime): Request = GET(baseUrl + anime.url, headers = Headers.headersOf("referer", baseUrl))
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val responseString = response.body.string()
+        return parseAnimeDetailsParseJson(responseString)
+    }
+
+    private fun parseAnimeDetailsParseJson(jsonLine: String?): SAnime {
+        val anime = SAnime.create()
+        val jsonData = jsonLine ?: return anime
+        val jObject = json.decodeFromString<JsonObject>(jsonData)
+        val jO = jObject.jsonObject["title"]!!.jsonObject
+        anime.title = jO.jsonObject["name"]!!.jsonPrimitive.content
+        anime.description = jO.jsonObject["description"]!!.jsonPrimitive.content
+        val genArray = jO.jsonObject["genres"]!!.jsonArray
+        val genres = mutableListOf<String>()
+        for (item in genArray) {
+            val genre = item.jsonObject["display_name"]!!.jsonPrimitive.content
+            genres.add(genre)
+        }
+        anime.genre = genres.joinToString { it }
+        anime.thumbnail_url = jO.jsonObject["poster"]?.jsonPrimitive?.content ?: jO.jsonObject["backdrop"]?.jsonPrimitive?.content
+        return anime
+    }
+
+    // Latest
+
+    override fun latestUpdatesParse(response: Response): AnimesPage = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val hosterPref = ListPreference(screen.context).apply {
+            key = "preferred_hoster"
+            title = "Standard-Hoster"
+            entries = arrayOf("Streamtape", "SuperVideo", "MixDrop", "StreamVid", "DoodStream", "Voe")
+            entryValues = arrayOf("https://streamtape", "https://supervideo", "https://mixdrop", "https://streamvid", "https://dood", "https://voe")
+            setDefaultValue("https://streamtape")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        val subSelection = MultiSelectListPreference(screen.context).apply {
+            key = "hoster_selection"
+            title = "Hoster auswählen"
+            entries = arrayOf("Streamtape", "SuperVideo", "MixDrop", "StreamVid", "DoodStream", "Voe")
+            entryValues = arrayOf("stape", "supv", "mix", "svid", "dood", "voe")
+            setDefaultValue(setOf("stape", "supv", "mix", "svid", "dood", "voe"))
+
+            setOnPreferenceChangeListener { _, newValue ->
+                preferences.edit().putStringSet(key, newValue as Set<String>).commit()
+            }
+        }
+        screen.addPreference(hosterPref)
+        screen.addPreference(subSelection)
+    }
+}
diff --git a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/extractors/StreamVidExtractor.kt b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/extractors/StreamVidExtractor.kt
new file mode 100644
index 00000000..97ecf8e1
--- /dev/null
+++ b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/extractors/StreamVidExtractor.kt
@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.animeextension.de.cineclix.extractors
+
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class StreamVidExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
+        return runCatching {
+            val doc = client.newCall(GET(url)).execute().asJsoup()
+
+            val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
+                ?.let(JsUnpacker::unpackAndCombine)
+                ?: return emptyList()
+            val masterUrl = script.substringAfter("sources:[{src:\"").substringBefore("\",")
+            PlaylistUtils(client).extractFromHls(masterUrl, videoNameGen = { "${prefix}StreamVid - $it" })
+        }.getOrElse { emptyList() }
+    }
+}
diff --git a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/extractors/SuperVideoExtractor.kt b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/extractors/SuperVideoExtractor.kt
new file mode 100644
index 00000000..7929ef16
--- /dev/null
+++ b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/extractors/SuperVideoExtractor.kt
@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.animeextension.de.cineclix.extractors
+
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class SuperVideoExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
+        return runCatching {
+            val doc = client.newCall(GET(url)).execute().asJsoup()
+
+            val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
+                ?.let(JsUnpacker::unpackAndCombine)
+                ?: return emptyList()
+            val masterUrl = script.substringAfter("sources:[{file:\"").substringBefore("\"}]")
+            PlaylistUtils(client).extractFromHls(masterUrl, videoNameGen = { "${prefix}SuperVideo - $it" })
+        }.getOrElse { emptyList() }
+    }
+}
diff --git a/src/de/movie2k/build.gradle b/src/de/movie2k/build.gradle
new file mode 100644
index 00000000..f4ff7b9f
--- /dev/null
+++ b/src/de/movie2k/build.gradle
@@ -0,0 +1,14 @@
+ext {
+    extName = 'Movie2k'
+    extClass = '.Movie2k'
+    extVersionCode = 8
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
+    implementation(libs.jsunpacker)
+}
diff --git a/src/de/movie2k/res/mipmap-hdpi/ic_launcher.png b/src/de/movie2k/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..27449d10
Binary files /dev/null and b/src/de/movie2k/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/de/movie2k/res/mipmap-mdpi/ic_launcher.png b/src/de/movie2k/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..cc3cec2f
Binary files /dev/null and b/src/de/movie2k/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/de/movie2k/res/mipmap-xhdpi/ic_launcher.png b/src/de/movie2k/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..1ea1b4c4
Binary files /dev/null and b/src/de/movie2k/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/de/movie2k/res/mipmap-xxhdpi/ic_launcher.png b/src/de/movie2k/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..da271e15
Binary files /dev/null and b/src/de/movie2k/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/de/movie2k/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/movie2k/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..f719fe5a
Binary files /dev/null and b/src/de/movie2k/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt
new file mode 100644
index 00000000..3f009739
--- /dev/null
+++ b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt
@@ -0,0 +1,259 @@
+package eu.kanade.tachiyomi.animeextension.de.movie2k
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.de.movie2k.extractors.DroploadExtractor
+import eu.kanade.tachiyomi.animeextension.de.movie2k.extractors.UpstreamExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class Movie2k : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Movie2k"
+
+    override val baseUrl = "https://movie2k.skin"
+
+    override val lang = "de"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeSelector(): String = "div.item-container div.item"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/page/$page/")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a").attr("href"))
+        anime.thumbnail_url = element.select("a div.item-inner img").attr("data-src")
+        anime.title = element.select("a div.item-inner img").attr("alt")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "div.pagination a.next"
+
+    // episodes
+
+    override fun episodeListSelector() = throw UnsupportedOperationException()
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episodeList = mutableListOf<SEpisode>()
+        val episode = SEpisode.create()
+        episode.episode_number = 1F
+        episode.name = "Film"
+        val hostdoc = client.newCall(GET(document.select("#multiplayer a").attr("href"))).execute().asJsoup()
+        episode.url = hostdoc.select("#video-container div.server1 iframe").attr("src")
+        episodeList.add(episode)
+        return episodeList.reversed()
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
+
+    // Video Extractor
+
+    override fun videoListRequest(episode: SEpisode): Request {
+        return GET(episode.url.replace(baseUrl, ""))
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        return videosFromElement(document)
+    }
+
+    private fun videosFromElement(document: Document): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val hosterSelection = preferences.getStringSet("hoster_selection", setOf("dood", "stape", "mix", "up", "drop"))
+        document.select("ul._player-mirrors li").forEach {
+            val purl = it.attr("data-link")
+            when {
+                purl.contains("//dood") && hosterSelection?.contains("dood") == true -> {
+                    val quality = "Doodstream"
+                    if (!purl.contains("https://")) {
+                        val url = "https:$purl"
+                        val video = DoodExtractor(client).videoFromUrl(url, quality)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    } else {
+                        val video = DoodExtractor(client).videoFromUrl(purl, quality)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    }
+                }
+                purl.contains("//streamtape.com") && hosterSelection?.contains("stape") == true -> {
+                    val quality = "Streamtape"
+                    if (!purl.contains("https://")) {
+                        val url = "https:$purl"
+                        val video = StreamTapeExtractor(client).videoFromUrl(url, quality)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    } else {
+                        val video = StreamTapeExtractor(client).videoFromUrl(purl, quality)
+                        if (video != null) {
+                            videoList.add(video)
+                        }
+                    }
+                }
+                purl.contains("//mixdrop") && hosterSelection?.contains("mix") == true -> {
+                    if (!purl.contains("https://")) {
+                        val url = "https:$purl"
+                        val videos = MixDropExtractor(client).videoFromUrl(url)
+                        videoList.addAll(videos)
+                    } else {
+                        val videos = MixDropExtractor(client).videoFromUrl(purl)
+                        videoList.addAll(videos)
+                    }
+                }
+                purl.contains("//upstream") && hosterSelection?.contains("up") == true -> {
+                    if (!purl.contains("https://")) {
+                        val url = "https:$purl"
+                        val videos = UpstreamExtractor(client).videoFromUrl(url)
+                        if (videos != null) {
+                            videoList.addAll(videos)
+                        }
+                    } else {
+                        val videos = UpstreamExtractor(client).videoFromUrl(purl)
+                        if (videos != null) {
+                            videoList.addAll(videos)
+                        }
+                    }
+                }
+                purl.contains("//dropload") && hosterSelection?.contains("drop") == true -> {
+                    if (!purl.contains("https://")) {
+                        val url = "https:$purl"
+                        val videos = DroploadExtractor(client).videoFromUrl(url)
+                        if (videos != null) {
+                            videoList.addAll(videos)
+                        }
+                    } else {
+                        val videos = DroploadExtractor(client).videoFromUrl(purl)
+                        if (videos != null) {
+                            videoList.addAll(videos)
+                        }
+                    }
+                }
+            }
+        }
+        return videoList
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val hoster = preferences.getString("preferred_hoster", null)
+        if (hoster != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(hoster)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    // Search
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a").attr("href"))
+        anime.thumbnail_url = element.select("a div.item-inner img").attr("data-src")
+        anime.title = element.select("a div.item-inner img").attr("alt")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "div.pagination a.next"
+
+    override fun searchAnimeSelector(): String = "div.item-container div.item"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/page/$page/?s=$query")
+
+    // Details
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.select("div.movie-image img").attr("src")
+        anime.title = document.select("div.movie-image img").attr("alt")
+        anime.description = document.select("p.movie-description span").text()
+        anime.author = document.select("span[itemprop=\"director\"] a").joinToString(", ") { it.text() }
+        anime.genre = document.select("span[itemprop=\"genre\"] a").joinToString(", ") { it.text() }
+        anime.status = SAnime.COMPLETED
+        return anime
+    }
+
+    // Latest
+
+    override fun latestUpdatesNextPageSelector(): String = throw UnsupportedOperationException()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+
+    override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val hosterPref = ListPreference(screen.context).apply {
+            key = "preferred_hoster"
+            title = "Standard-Hoster"
+            entries = arrayOf("Doodstream", "Streamtape", "Mixdrop", "Upstream", "Dropload")
+            entryValues = arrayOf("https://dood", "https://streamtape", "https://mixdrop", "https://upstream", "https://dropload")
+            setDefaultValue("https://dood")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        val subSelection = MultiSelectListPreference(screen.context).apply {
+            key = "hoster_selection"
+            title = "Hoster auswählen"
+            entries = arrayOf("Doodstream", "Streamtape", "MixDrop", "Upstream", "Dropload")
+            entryValues = arrayOf("dood", "stape", "mix", "up", "drop")
+            setDefaultValue(setOf("dood", "stape", "mix", "up", "drop"))
+
+            setOnPreferenceChangeListener { _, newValue ->
+                preferences.edit().putStringSet(key, newValue as Set<String>).commit()
+            }
+        }
+        screen.addPreference(hosterPref)
+        screen.addPreference(subSelection)
+    }
+}
diff --git a/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/extractors/DroploadExtractor.kt b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/extractors/DroploadExtractor.kt
new file mode 100644
index 00000000..859735a8
--- /dev/null
+++ b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/extractors/DroploadExtractor.kt
@@ -0,0 +1,31 @@
+package eu.kanade.tachiyomi.animeextension.de.movie2k.extractors
+
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class DroploadExtractor(private val client: OkHttpClient) {
+
+    fun videoFromUrl(url: String): MutableList<Video>? {
+        try {
+            val jsE = client.newCall(GET(url)).execute().asJsoup().selectFirst("script:containsData(eval)")!!.data()
+            val masterUrl = JsUnpacker.unpackAndCombine(jsE).toString()
+                .substringAfter("{file:\"").substringBefore("\"}")
+            val masterBase = masterUrl.substringBefore("master")
+            val masterPlaylist = client.newCall(GET(masterUrl)).execute().body.string()
+            val videoList = mutableListOf<Video>()
+            masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:")
+                .forEach {
+                    val quality = "Dropload:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p "
+                    val videoUrl = masterBase + it.substringAfter("\n").substringBefore("\n")
+                    videoList.add(Video(videoUrl, quality, videoUrl, headers = Headers.headersOf("origin", "https://dropload.io", "referer", "https://dropload.io/")))
+                }
+            return videoList
+        } catch (e: Exception) {
+            return null
+        }
+    }
+}
diff --git a/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/extractors/UpstreamExtractor.kt b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/extractors/UpstreamExtractor.kt
new file mode 100644
index 00000000..b3f67cf7
--- /dev/null
+++ b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/extractors/UpstreamExtractor.kt
@@ -0,0 +1,31 @@
+package eu.kanade.tachiyomi.animeextension.de.movie2k.extractors
+
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class UpstreamExtractor(private val client: OkHttpClient) {
+
+    fun videoFromUrl(url: String): MutableList<Video>? {
+        try {
+            val jsE = client.newCall(GET(url)).execute().asJsoup().selectFirst("script:containsData(eval)")!!.data()
+            val masterUrl = JsUnpacker.unpackAndCombine(jsE).toString()
+                .substringAfter("{file:\"").substringBefore("\"}")
+            val masterBase = masterUrl.substringBefore("master")
+            val masterPlaylist = client.newCall(GET(masterUrl)).execute().body.string()
+            val videoList = mutableListOf<Video>()
+            masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:")
+                .forEach {
+                    val quality = "Upstream:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p "
+                    val videoUrl = masterBase + it.substringAfter("\n").substringBefore("\n")
+                    videoList.add(Video(videoUrl, quality, videoUrl, headers = Headers.headersOf("origin", "https://upstream.to", "referer", "https://upstream.to/")))
+                }
+            return videoList
+        } catch (e: Exception) {
+            return null
+        }
+    }
+}
diff --git a/src/de/streamcloud/build.gradle b/src/de/streamcloud/build.gradle
new file mode 100644
index 00000000..d864fc1a
--- /dev/null
+++ b/src/de/streamcloud/build.gradle
@@ -0,0 +1,13 @@
+ext {
+    extName = 'StreamCloud'
+    extClass = '.StreamCloud'
+    extVersionCode = 10
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
+}
\ No newline at end of file
diff --git a/src/de/streamcloud/res/mipmap-hdpi/ic_launcher.png b/src/de/streamcloud/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..c97f1657
Binary files /dev/null and b/src/de/streamcloud/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/de/streamcloud/res/mipmap-mdpi/ic_launcher.png b/src/de/streamcloud/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..459208c0
Binary files /dev/null and b/src/de/streamcloud/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/de/streamcloud/res/mipmap-xhdpi/ic_launcher.png b/src/de/streamcloud/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..2099b6fc
Binary files /dev/null and b/src/de/streamcloud/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/de/streamcloud/res/mipmap-xxhdpi/ic_launcher.png b/src/de/streamcloud/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..ceccd3e8
Binary files /dev/null and b/src/de/streamcloud/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/de/streamcloud/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/streamcloud/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..1f595380
Binary files /dev/null and b/src/de/streamcloud/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
new file mode 100644
index 00000000..4674b94d
--- /dev/null
+++ b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
@@ -0,0 +1,198 @@
+package eu.kanade.tachiyomi.animeextension.de.streamcloud
+
+import android.app.Application
+import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class StreamCloud : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "StreamCloud"
+
+    override val baseUrl = "https://streamcloud.movie"
+
+    override val lang = "de"
+
+    override val supportsLatest = false
+
+    private val preferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/beliebte-filme/")
+
+    override fun popularAnimeSelector() = "div#dle-content > div.item > div.thumb > a"
+
+    override fun popularAnimeFromElement(element: Element) = SAnime.create().apply {
+        setUrlWithoutDomain(element.attr("href"))
+        element.selectFirst("img")!!.run {
+            thumbnail_url = absUrl("src")
+            title = attr("alt")
+        }
+    }
+
+    override fun popularAnimeNextPageSelector() = null
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesNextPageSelector() = throw UnsupportedOperationException()
+
+    override fun latestUpdatesFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int) = throw UnsupportedOperationException()
+
+    override fun latestUpdatesSelector() = throw UnsupportedOperationException()
+
+    // =============================== Search ===============================
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList) =
+        GET("$baseUrl/index.php?do=search&subaction=search&search_start=$page&full_search=0&story=$query")
+
+    override fun searchAnimeSelector() = popularAnimeSelector()
+
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun searchAnimeNextPageSelector() = "#nextlink"
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document) = SAnime.create().apply {
+        title = document.selectFirst("#title span.title")!!.text()
+        status = SAnime.COMPLETED
+        with(document.selectFirst("div#longInfo")!!) {
+            thumbnail_url = selectFirst("img")?.absUrl("src")
+            genre = selectFirst("span.masha_index10")?.let {
+                it.text().split("/").joinToString()
+            }
+            description = select("#storyline > span > p").eachText().joinToString("\n")
+            author = selectFirst("strong:contains(Regie:) + div > a")?.text()
+        }
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episode = SEpisode.create().apply {
+            name = document.selectFirst("#title span.title")!!.text()
+            episode_number = 1F
+            setUrlWithoutDomain(document.location())
+        }
+        return listOf(episode)
+    }
+
+    override fun episodeListSelector() = throw UnsupportedOperationException()
+
+    override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
+
+    // ============================ Video Links =============================
+    private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val mixdropExtractor by lazy { MixDropExtractor(client) }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val iframeurl = document.selectFirst("div.player-container-wrap > iframe")
+            ?.attr("src")
+            ?: error("No videos!")
+        val iframeDoc = client.newCall(GET(iframeurl)).execute().asJsoup()
+
+        val hosterSelection = preferences.getStringSet(PREF_HOSTER_SELECTION_KEY, PREF_HOSTER_SELECTION_DEFAULT)!!
+        val items = iframeDoc.select("div._player ul._player-mirrors li")
+
+        return items.flatMap { element ->
+            val url = element.attr("data-link").run {
+                takeIf { startsWith("https") }
+                    ?: "https:$this"
+            }
+
+            runCatching {
+                when {
+                    url.contains("streamtape") && hosterSelection.contains("stape") -> {
+                        streamtapeExtractor.videosFromUrl(url)
+                    }
+                    url.startsWith("https://dood") && hosterSelection.contains("dood") -> {
+                        doodExtractor.videosFromUrl(url)
+                    }
+                    url.contains("mixdrop.") && hosterSelection.contains("mixdrop") -> {
+                        mixdropExtractor.videosFromUrl(url)
+                    }
+                    else -> emptyList()
+                }
+            }.getOrElse { emptyList() }
+        }
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val hoster = preferences.getString(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
+
+        return sortedWith(
+            compareBy { it.url.contains(hoster) },
+        ).reversed()
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    // ============================== Settings ==============================
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_HOSTER_KEY
+            title = PREF_HOSTER_TITLE
+            entries = PREF_HOSTER_ENTRIES
+            entryValues = PREF_HOSTER_VALUES
+            setDefaultValue(PREF_HOSTER_DEFAULT)
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
+
+        MultiSelectListPreference(screen.context).apply {
+            key = PREF_HOSTER_SELECTION_KEY
+            title = PREF_HOSTER_SELECTION_TITLE
+            entries = PREF_HOSTER_SELECTION_ENTRIES
+            entryValues = PREF_HOSTER_SELECTION_VALUES
+            setDefaultValue(PREF_HOSTER_SELECTION_DEFAULT)
+
+            setOnPreferenceChangeListener { _, newValue ->
+                @Suppress("UNCHECKED_CAST")
+                preferences.edit().putStringSet(key, newValue as Set<String>).commit()
+            }
+        }.also(screen::addPreference)
+    }
+
+    companion object {
+        private const val PREF_HOSTER_KEY = "preferred_hoster"
+        private const val PREF_HOSTER_TITLE = "Standard-Hoster"
+        private const val PREF_HOSTER_DEFAULT = "https://streamtape.com"
+        private val PREF_HOSTER_ENTRIES = arrayOf("Streamtape", "DoodStream")
+        private val PREF_HOSTER_VALUES = arrayOf("https://streamtape.com", "https://dood.")
+
+        private const val PREF_HOSTER_SELECTION_KEY = "hoster_selection"
+        private const val PREF_HOSTER_SELECTION_TITLE = "Hoster auswählen"
+        private val PREF_HOSTER_SELECTION_ENTRIES = arrayOf("Streamtape", "DoodStream", "MixDrop")
+        private val PREF_HOSTER_SELECTION_VALUES = arrayOf("stape", "dood", "mixdrop")
+        private val PREF_HOSTER_SELECTION_DEFAULT by lazy { PREF_HOSTER_SELECTION_VALUES.toSet() }
+    }
+}
diff --git a/src/en/animeowl/build.gradle b/src/en/animeowl/build.gradle
index 40b4fa1d..e5849d46 100644
--- a/src/en/animeowl/build.gradle
+++ b/src/en/animeowl/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeOwl'
     extClass = '.AnimeOwl'
-    extVersionCode = 23
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt
index 3b061288..b53606e8 100644
--- a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt
+++ b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt
@@ -129,20 +129,20 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.asJsoup()
         val sub = document.select("#anime-cover-sub-content .episode-node").mapIndexed { idx, it ->
             EpisodeResponse.Episode(
-                id = it.attr("title").toDoubleOrNull(),
+                id = it.text().toDouble(),
                 episodeIndex = idx.toString(),
-                name = it.attr("title"),
+                name = it.text(),
                 lang = "Sub",
-                href = it.absUrl("href"),
+                href = it.attr("abs:href"),
             )
         }
         val dub = document.select("#anime-cover-dub-content .episode-node").mapIndexed { idx, it ->
             EpisodeResponse.Episode(
-                id = it.attr("title").toDoubleOrNull(),
+                id = it.text().toDouble(),
                 episodeIndex = idx.toString(),
-                name = it.attr("title"),
+                name = it.text(),
                 lang = "Dub",
-                href = it.absUrl("href"),
+                href = it.attr("abs:href"),
             )
         }
 
diff --git a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwlDto.kt b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwlDto.kt
index 66ae5673..0e39f027 100644
--- a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwlDto.kt
+++ b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwlDto.kt
@@ -53,13 +53,12 @@ data class Link(
 
 @Serializable
 data class OwlServers(
-    val kaido: List<Stream>? = null,
-    val luffy: List<Stream>? = null,
-    val zoro: List<Stream>? = null,
+    val kaido: String? = null,
+    val luffy: String? = null,
+    val zoro: String? = null,
 )
 
 @Serializable
 data class Stream(
     val url: String,
-    val resolution: String?,
 )
diff --git a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt
index 3d4c22a9..e3fa8ef1 100644
--- a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt
+++ b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt
@@ -45,32 +45,23 @@ class OwlExtractor(private val client: OkHttpClient, private val baseUrl: String
         coroutineScope {
             val lufDeferred = async {
                 servers.luffy?.let { luffy ->
-                    luffy.forEach { stream ->
-                        noRedirectClient.newCall(GET("${stream.url}$jwt")).execute()
-                            .use { it.headers["Location"] }?.let {
-                                videoList.add(
-                                    Video(it, "${link.lang} Luffy:${stream.resolution}", it),
-                                )
-                            }
-                    }
+                    noRedirectClient.newCall(GET("${luffy}$jwt")).execute()
+                        .use { it.headers["Location"] }
+                        ?.let { videoList.add(Video(it, "${link.lang} Luffy:1080p", it)) }
                 }
             }
             val kaiDeferred = async {
-                servers.kaido?.let { kaido ->
-                    kaido.forEach { stream ->
-                        videoList.addAll(
-                            getHLS("${stream.url}$jwt", "Kaido", link.lang),
-                        )
-                    }
+                servers.kaido?.let {
+                    videoList.addAll(
+                        getHLS("${it}$jwt", "Kaido", link.lang),
+                    )
                 }
             }
             val zorDeferred = async {
-                servers.zoro?.let { zoro ->
-                    zoro.forEach { stream ->
-                        videoList.addAll(
-                            getHLS("${stream.url}$jwt", "Boa", link.lang),
-                        )
-                    }
+                servers.zoro?.let {
+                    videoList.addAll(
+                        getHLS("${it}$jwt", "Boa", link.lang),
+                    )
                 }
             }
 
@@ -80,7 +71,7 @@ class OwlExtractor(private val client: OkHttpClient, private val baseUrl: String
     }
 
     private fun getHLS(url: String, server: String, lang: String): List<Video> {
-        return client.newCall(GET(url)).execute().let { it ->
+        return client.newCall(GET(url)).execute().let {
             if (it.isSuccessful) {
                 it.parseAs<Stream>().url.let {
                     playlistUtils.extractFromHls(it, videoNameGen = { qty -> "$lang $server:$qty" })
diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle
index 2711909a..d2c0f169 100644
--- a/src/en/animepahe/build.gradle
+++ b/src/en/animepahe/build.gradle
@@ -1,11 +1,11 @@
 ext {
     extName = 'AnimePahe'
     extClass = '.AnimePahe'
-    extVersionCode = 30
+    extVersionCode = 29
 }
 
 apply from: "$rootDir/common.gradle"
 
 dependencies {
     implementation(libs.jsunpacker)
-}
+}
\ No newline at end of file
diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
index 98c11cd3..c85d1679 100644
--- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
+++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
@@ -153,15 +153,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
     override fun episodeListParse(response: Response): List<SEpisode> {
         val url = response.request.url.toString()
         val session = url.substringAfter("&id=").substringBefore("&")
-        val episodeList = recursivePages(response, session)
-
-        return episodeList
-            .sortedBy { it.date_upload } // Optional, makes sure it's in correct order
-            .mapIndexed { index, episode ->
-                episode.episode_number = (index + 1).toFloat()
-                episode.name = "Episode ${index + 1}"
-                episode
-            }
+        return recursivePages(response, session)
     }
 
     private fun parseEpisodePage(episodes: List<EpisodeDto>, animeSession: String): MutableList<SEpisode> {
diff --git a/src/en/aniplay/build.gradle b/src/en/aniplay/build.gradle
index edce2f4c..26c595ba 100644
--- a/src/en/aniplay/build.gradle
+++ b/src/en/aniplay/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'AniPlay'
     extClass = '.AniPlay'
     themePkg = 'anilist'
-    overrideVersionCode = 15
+    overrideVersionCode = 12
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
index e23034ec..cb2d4c69 100644
--- a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
+++ b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
@@ -260,14 +260,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         }
     }
 
-    private fun getProxiedUrl(originalUrl: String, serverName: String, referer: String?): String {
-        return when (serverName) {
-            "Yuki" -> "$PROXY_URL/yukiprox?url=$originalUrl"
-            "Pahe" -> "$PROXY_URL/fetch?url=$originalUrl?ref=$referer"
-            else -> return originalUrl
-        }
-    }
-
     private fun processEpisodeData(episodeData: EpisodeData): List<Video> {
         val defaultSource = episodeData.response.sources?.firstOrNull {
             it.quality in listOf("default", "auto")
@@ -290,19 +282,37 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         }
 
         try {
-            val url = getProxiedUrl(defaultSource.url, serverName, episodeData.response.headers?.Referer)
-            return playlistUtils.extractFromHls(
-                playlistUrl = url,
-                videoNameGen = { quality -> "$serverName - $quality - $typeName" },
-                subtitleList = subtitles,
-                masterHeadersGen = { baseHeaders: Headers, _: String ->
-                    baseHeaders.newBuilder().apply {
-                        set("Accept", "*/*")
-                        set("Origin", baseUrl)
-                        set("Referer", "$baseUrl/")
-                    }.build()
-                },
-            )
+            if (episodeData.response.proxy == true) {
+                var proxyUrl = "$PROXY_URL/fetch?url=${defaultSource.url}"
+                if (episodeData.response.headers != null && episodeData.response.headers.Referer?.startsWith("https://") == true) {
+                    proxyUrl += "&ref=${episodeData.response.headers.Referer}"
+                }
+                return playlistUtils.extractFromHls(
+                    playlistUrl = proxyUrl,
+                    videoNameGen = { quality -> "$serverName - $quality - $typeName" },
+                    subtitleList = subtitles,
+                )
+            }
+            if (episodeData.response.headers != null && episodeData.response.headers.Referer?.startsWith("https://") == true) {
+                return playlistUtils.extractFromHls(
+                    playlistUrl = defaultSource.url,
+                    videoNameGen = { quality -> "$serverName - $quality - $typeName" },
+                    subtitleList = subtitles,
+                    masterHeadersGen = { baseHeaders: Headers, _: String ->
+                        baseHeaders.newBuilder().apply {
+                            set("Accept", "*/*")
+                            set("Origin", baseUrl)
+                            set("Referer", episodeData.response.headers.Referer)
+                        }.build()
+                    },
+                )
+            } else {
+                return playlistUtils.extractFromHls(
+                    playlistUrl = defaultSource.url,
+                    videoNameGen = { quality -> "$serverName - $quality - $typeName" },
+                    subtitleList = subtitles,
+                )
+            }
         } catch (e: Exception) {
             Log.e("AniPlay", "processEpisodeData extractFromHls Error (\"$serverName - $typeName\"): $e")
         }
@@ -315,16 +325,8 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         val lang = preferences.getString(PREF_TYPE_KEY, PREF_TYPE_DEFAULT)!!.let(::getTypeName)
         val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!.let(::getServerName)
 
-        val lang2 = if ((lang == PREF_TYPE_ENTRIES[1]) or (lang == PREF_TYPE_ENTRIES[3])) {
-            // if preferred language is SoftSub or Dubtitles
-            PREF_TYPE_ENTRIES[PREF_TYPE_ENTRIES.indexOf(lang) - 1]
-        } else {
-            ""
-        }
-
         return sortedWith(
-            compareByDescending<Video> { it.quality.split(" - ").contains(lang) }
-                .thenByDescending { it.quality.contains(lang2) }
+            compareByDescending<Video> { it.quality.contains(lang) }
                 .thenByDescending { it.quality.contains(quality) }
                 .thenByDescending { it.quality.contains(server, true) },
         )
@@ -526,15 +528,15 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
 
         private val HEADER_NEXT_ACTION = mapOf(
             PREF_DOMAIN_ENTRY_VALUES[0] to mapOf(
-                "NEXT_ACTION_EPISODE_LIST" to "7f07777b5f74e3edb312e0b718a560f9d3ad21aeba",
-                "NEXT_ACTION_SOURCES_LIST" to "7f11490e43dca1ed90fcb5b90bac1e5714a3e11232",
+                "NEXT_ACTION_EPISODE_LIST" to "f3422af67c84852f5e63d50e1f51718f1c0225c4",
+                "NEXT_ACTION_SOURCES_LIST" to "5dbcd21c7c276c4d15f8de29d9ef27aef5ea4a5e",
             ),
             PREF_DOMAIN_ENTRY_VALUES[1] to mapOf(
-                "NEXT_ACTION_EPISODE_LIST" to "7f57233b7a6486e8211b883c502fa0450775f0ee98",
-                "NEXT_ACTION_SOURCES_LIST" to "7f48c7ffeb25edece852102a65d794a1dffa37aaac",
+                "NEXT_ACTION_EPISODE_LIST" to "56e4151352ded056cbe226d2376c7436cffc9a37",
+                "NEXT_ACTION_SOURCES_LIST" to "8a76af451978c817dde2364326a5e4e45eb43db1",
             ),
         )
-        private const val PROXY_URL = "https://prox.aniplaynow.live"
+        private const val PROXY_URL = "https://aniplay-cors.yqizw7.easypanel.host"
 
         private val DATE_FORMATTER = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
     }
diff --git a/src/en/kickassanime/build.gradle b/src/en/kickassanime/build.gradle
index fd3ddc54..58212f64 100644
--- a/src/en/kickassanime/build.gradle
+++ b/src/en/kickassanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'KickAssAnime'
     extClass = '.KickAssAnime'
-    extVersionCode = 45
+    extVersionCode = 46
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
index ec74afc7..c08a04e8 100644
--- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
+++ b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
@@ -339,7 +339,7 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
         private const val PREF_DOMAIN_KEY = "preferred_domain"
         private const val PREF_DOMAIN_TITLE = "Preferred domain (requires app restart)"
         private const val PREF_DOMAIN_DEFAULT = "https://kaas.to"
-        private val PREF_DOMAIN_ENTRIES = arrayOf("kaas.to", "kaas.ro", "kickassanimes.io", "www1.kickassanime.mx")
+        private val PREF_DOMAIN_ENTRIES = arrayOf("kaas.to", "kaas.ro", "kaa.mx", "kickassanimes.io", "www1.kickassanime.mx")
         private val PREF_DOMAIN_ENTRY_VALUES = PREF_DOMAIN_ENTRIES.map { "https://$it" }.toTypedArray()
 
         private const val PREF_HOSTER_KEY = "hoster_selection"
diff --git a/src/es/otakuverso/build.gradle b/src/es/otakuverso/build.gradle
deleted file mode 100644
index 830bd251..00000000
--- a/src/es/otakuverso/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-ext {
-    extName = 'Otakuverso'
-    extClass = '.Otakuverso'
-    extVersionCode = 1
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(':lib:mp4upload-extractor'))
-    implementation(project(':lib:streamtape-extractor'))
-    implementation(project(':lib:yourupload-extractor'))
-    implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib:burstcloud-extractor'))
-    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib:filemoon-extractor'))
-    implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib:streamlare-extractor'))
-    implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib:upstream-extractor'))
-    implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib:universal-extractor'))
-    implementation(project(':lib:sendvid-extractor'))
-    implementation(project(':lib:playlist-utils'))
-    implementation(libs.jsunpacker)
-}
\ No newline at end of file
diff --git a/src/es/otakuverso/res/mipmap-hdpi/ic_launcher.png b/src/es/otakuverso/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cf3d0126..00000000
Binary files a/src/es/otakuverso/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/otakuverso/res/mipmap-mdpi/ic_launcher.png b/src/es/otakuverso/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index cf3d0126..00000000
Binary files a/src/es/otakuverso/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/otakuverso/res/mipmap-xhdpi/ic_launcher.png b/src/es/otakuverso/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index cf3d0126..00000000
Binary files a/src/es/otakuverso/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/otakuverso/res/mipmap-xxhdpi/ic_launcher.png b/src/es/otakuverso/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index cf3d0126..00000000
Binary files a/src/es/otakuverso/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/otakuverso/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/otakuverso/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index cf3d0126..00000000
Binary files a/src/es/otakuverso/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/Otakuverso.kt b/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/Otakuverso.kt
deleted file mode 100644
index 025b34a2..00000000
--- a/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/Otakuverso.kt
+++ /dev/null
@@ -1,339 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.otakuverso
-
-import android.app.Application
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.otakuverso.extractors.UnpackerExtractor
-import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-import eu.kanade.tachiyomi.animesource.model.AnimesPage
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
-import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
-import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
-import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
-import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
-import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
-import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
-import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
-import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
-import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
-import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
-import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
-import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
-import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
-import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
-import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.await
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
-import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
-import okhttp3.FormBody
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-
-class Otakuverso : ConfigurableAnimeSource, AnimeHttpSource() {
-
-    override val name = "Otakuverso"
-
-    override val baseUrl = "https://otakuverso.net"
-
-    override val lang = "es"
-
-    override val supportsLatest = false
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    companion object {
-        private const val PREF_QUALITY_KEY = "preferred_quality"
-        private const val PREF_QUALITY_DEFAULT = "1080"
-        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
-
-        private const val PREF_SERVER_KEY = "preferred_server"
-        private const val PREF_SERVER_DEFAULT = "YourUpload"
-        private val SERVER_LIST = arrayOf(
-            "YourUpload", "Voe", "Mp4Upload", "Doodstream",
-            "Upload", "BurstCloud", "Upstream", "StreamTape",
-            "Fastream", "Filemoon", "StreamWish", "Okru",
-            "Amazon", "AmazonES", "Fireload", "FileLions",
-        )
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val document = response.asJsoup()
-        return SAnime.create().apply {
-            title = document.selectFirst("#back_data_perfil .inn-text h1")?.text().orEmpty()
-            description = document.selectFirst("#back_data_perfil .inn-text p.font14")?.ownText()
-            genre = document.select(".pre .text-deco-none.font-GDSherpa-Regular").joinToString { it.text() }
-            status = with(document.select("#back_data_perfil .inn-text .btn-anime-info")) {
-                when {
-                    text().contains("finalizado", true) -> SAnime.COMPLETED
-                    text().contains("emision", true) || text().contains("emitiéndose", true) -> SAnime.ONGOING
-                    else -> SAnime.UNKNOWN
-                }
-            }
-            document.select(".col-xl-12 .font-GDSherpa-Regular")
-                .map { it.select(".text-white").text() to it.select(".lila-color").text() }
-                .forEach { (title, content) ->
-                    when {
-                        title.contains("Creador(a)", true) -> author = content
-                        title.contains("Director(a)", true) -> artist = content
-                    }
-                }
-        }
-    }
-
-    private fun getToken(): Pair<String, String> {
-        try {
-            val request = client.newCall(GET("$baseUrl/animes")).execute()
-            val document = request.asJsoup()
-            val token = document.selectFirst("[name=\"_token\"]")?.attr("value").orEmpty()
-            val xsrfToken = client.cookieJar.loadForRequest("$baseUrl/animes".toHttpUrl())
-                .firstOrNull { it.name == "XSRF-TOKEN" }?.let { "${it.name}=${it.value}" }
-                .orEmpty()
-            return token to xsrfToken
-        } catch (e: Exception) {
-            Log.i("bruh err", e.toString())
-            return "" to ""
-        }
-    }
-
-    override fun popularAnimeRequest(page: Int): Request {
-        val (token, xsrfToken) = getToken()
-        val data = FormBody.Builder()
-            .add("_token", token)
-            .add("page", "$page")
-            .add("search_genero", "0")
-            .add("search_anno", "0")
-            .add("search_tipo", "0")
-            .add("search_orden", "0")
-            .add("search_estado", "0")
-            .add("Cookie", xsrfToken)
-            .build()
-
-        return POST("$baseUrl/animes", body = data, headers = headers)
-    }
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val elements = document.select(".row [data-original-title]")
-        val nextPage = document.select(".pagination a[rel=next]").any()
-        val animeList = elements.map { element ->
-            SAnime.create().apply {
-                title = element.selectFirst(".font-GDSherpa-Bold")?.text().orEmpty()
-                thumbnail_url = element.selectFirst("img")?.getImageUrl()
-                setUrlWithoutDomain(element.attr("abs:href"))
-            }
-        }
-        return AnimesPage(animeList, nextPage)
-    }
-
-    override fun latestUpdatesParse(response: Response) = throw UnsupportedOperationException()
-
-    override fun latestUpdatesRequest(page: Int) = throw UnsupportedOperationException()
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val params = OtakuversoFilters.getSearchParameters(filters)
-        return when {
-            query.isNotBlank() -> GET("$baseUrl/buscador?q=$query&page=$page", headers)
-            params.isFiltered() -> searchRequest(params, page)
-            else -> popularAnimeRequest(page)
-        }
-    }
-
-    private fun searchRequest(params: OtakuversoFilters.FilterSearchParams, page: Int): Request {
-        val formBody = params.body
-        val (token, xsrfToken) = getToken()
-        val data = FormBody.Builder().apply {
-            for (i in 0 until formBody.size) {
-                add(formBody.name(i), formBody.value(i))
-            }
-            add("page", "$page")
-            add("_token", token)
-            add("Cookie", xsrfToken)
-        }.build()
-
-        return POST("$baseUrl/animes", body = data, headers = headers)
-    }
-
-    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
-
-    private fun parseEpisodeList(document: Document): List<SEpisode> {
-        return document.select(".pl-lg-4 .container-fluid .row .col-6.text-center").map {
-            val episode = it.select(".font-GDSherpa-Bold a")
-            val episodeNumber = episode.text().substringAfter("Episodio").trim().toFloat()
-            SEpisode.create().apply {
-                name = episode.text()
-                episode_number = episodeNumber
-                scanlator = it.select(".font14 .bog").text().trim()
-                setUrlWithoutDomain(episode.attr("abs:href"))
-            }
-        }
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.asJsoup()
-        val pageable = document.select(".dropdown-menu").any()
-        if (pageable) {
-            return document.select(".dropdown-menu a")
-                .map { it.attr("abs:href") }
-                .parallelCatchingFlatMapBlocking {
-                    val page = client.newCall(GET(it)).execute().asJsoup()
-                    parseEpisodeList(page)
-                }
-        }
-        return parseEpisodeList(document)
-    }
-
-    override suspend fun getVideoList(episode: SEpisode): List<Video> {
-        val response = client.newCall(videoListRequest(episode)).await()
-        val document = response.asJsoup()
-        return document.select("#ssel option")
-            .map { it.attr("value") }
-            .parallelCatchingFlatMap { id ->
-                val url = getRealLink(id)
-                serverVideoResolver(url)
-            }
-    }
-
-    private fun getRealLink(id: String): String {
-        val serverResponse = client.newCall(GET("$baseUrl/play-video?id=$id")).execute()
-        val serverLink = """"url":"([^"]+)""".toRegex()
-            .find(serverResponse.body.string())
-            ?.groupValues?.get(1)
-            ?.replace("\\/", "/")
-            .orEmpty()
-        return when {
-            serverLink.startsWith("http") -> serverLink
-            serverLink.startsWith("//") -> "https:$serverLink"
-            else -> ""
-        }
-    }
-
-    override fun getFilterList(): AnimeFilterList = OtakuversoFilters.FILTER_LIST
-
-    /*-------------------------------- Video extractors ------------------------------------*/
-    private val universalExtractor by lazy { UniversalExtractor(client) }
-    private val voeExtractor by lazy { VoeExtractor(client) }
-    private val okruExtractor by lazy { OkruExtractor(client) }
-    private val filemoonExtractor by lazy { FilemoonExtractor(client) }
-    private val uqloadExtractor by lazy { UqloadExtractor(client) }
-    private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
-    private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val doodExtractor by lazy { DoodExtractor(client) }
-    private val streamlareExtractor by lazy { StreamlareExtractor(client) }
-    private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
-    private val burstcloudExtractor by lazy { BurstCloudExtractor(client) }
-    private val upstreamExtractor by lazy { UpstreamExtractor(client) }
-    private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
-    private val filelionsExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
-    private val luluExtractor by lazy { UnpackerExtractor(client, headers) }
-
-    private fun serverVideoResolver(url: String): List<Video> {
-        return when {
-            arrayOf("voe", "robertordercharacter", "donaldlineelse").any(url) -> voeExtractor.videosFromUrl(url)
-            arrayOf("ok.ru", "okru").any(url) -> okruExtractor.videosFromUrl(url)
-            arrayOf("moon").any(url) -> filemoonExtractor.videosFromUrl(url, prefix = "Filemoon:")
-            arrayOf("uqload").any(url) -> uqloadExtractor.videosFromUrl(url)
-            arrayOf("mp4upload").any(url) -> mp4uploadExtractor.videosFromUrl(url, headers)
-            arrayOf("wish").any(url) -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
-            arrayOf("doodstream", "dood.").any(url) -> doodExtractor.videosFromUrl(url, "DoodStream")
-            arrayOf("streamlare").any(url) -> streamlareExtractor.videosFromUrl(url)
-            arrayOf("yourupload", "upload").any(url) -> yourUploadExtractor.videoFromUrl(url, headers = headers)
-            arrayOf("burstcloud", "burst").any(url) -> burstcloudExtractor.videoFromUrl(url, headers = headers)
-            arrayOf("upstream").any(url) -> upstreamExtractor.videosFromUrl(url)
-            arrayOf("streamtape", "stp", "stape").any(url) -> streamTapeExtractor.videosFromUrl(url)
-            arrayOf("ahvsh", "streamhide").any(url) -> streamHideVidExtractor.videosFromUrl(url)
-            arrayOf("/stream/fl.php").any(url) -> {
-                val video = url.substringAfter("/stream/fl.php?v=")
-                if (client.newCall(GET(video)).execute().code == 200) {
-                    listOf(Video(video, "FireLoad", video))
-                } else {
-                    emptyList()
-                }
-            }
-            arrayOf("lion").any(url) -> filelionsExtractor.videosFromUrl(url, videoNameGen = { "FileLions:$it" })
-            arrayOf("sendvid").any(url) -> sendvidExtractor.videosFromUrl(url)
-            arrayOf("lulu").any(url) -> luluExtractor.videosFromUrl(url)
-            else -> universalExtractor.videosFromUrl(url, headers)
-        }
-    }
-
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
-        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
-        return this.sortedWith(
-            compareBy(
-                { it.quality.contains(server, true) },
-                { it.quality.contains(quality) },
-                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
-            ),
-        ).reversed()
-    }
-
-    private fun Element.getImageUrl(): String? {
-        return when {
-            isValidUrl("data-src") -> attr("abs:data-src")
-            isValidUrl("data-lazy-src") -> attr("abs:data-lazy-src")
-            isValidUrl("srcset") -> attr("abs:srcset").substringBefore(" ")
-            isValidUrl("src") -> attr("abs:src")
-            else -> ""
-        }
-    }
-
-    private fun Element.isValidUrl(attrName: String): Boolean {
-        if (!hasAttr(attrName)) return false
-        return !attr(attrName).contains("data:image/")
-    }
-
-    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }.also(screen::addPreference)
-
-        ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
-            entries = QUALITY_LIST
-            entryValues = QUALITY_LIST
-            setDefaultValue(PREF_QUALITY_DEFAULT)
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }.also(screen::addPreference)
-    }
-}
diff --git a/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/OtakuversoFilters.kt b/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/OtakuversoFilters.kt
deleted file mode 100644
index 073c4488..00000000
--- a/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/OtakuversoFilters.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.otakuverso
-
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-import okhttp3.FormBody
-import java.util.Calendar
-
-object OtakuversoFilters {
-    open class QueryPartFilter(displayName: String, val vals: Array<Pair<String, String>>) : AnimeFilter.Select<String>(
-        displayName,
-        vals.map { it.first }.toTypedArray(),
-    )
-
-    private inline fun <reified R> AnimeFilterList.getFirst(): R {
-        return this.filterIsInstance<R>().first()
-    }
-
-    data class FilterSearchParams(
-        val body: FormBody,
-    ) {
-        fun isFiltered(): Boolean {
-            return (0 until body.size).any { body.value(it) != "0" }
-        }
-    }
-
-    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
-        if (filters.isEmpty()) return FilterSearchParams(FormBody.Builder().build())
-
-        val formBuilder = FormBody.Builder()
-        filters.getFirst<GenresFilter>().let { filter ->
-            formBuilder.add("search_genero", filter.vals[filter.state].second)
-        }
-        filters.getFirst<TypesFilter>().let { filter ->
-            formBuilder.add("search_tipo", filter.vals[filter.state].second)
-        }
-        filters.getFirst<StatusFilter>().let { filter ->
-            formBuilder.add("search_estado", filter.vals[filter.state].second)
-        }
-        filters.getFirst<YearsFilter>().let { filter ->
-            formBuilder.add("search_anno", filter.vals[filter.state].second)
-        }
-        filters.getFirst<SortFilter>().let { filter ->
-            formBuilder.add("search_orden", filter.vals[filter.state].second)
-        }
-        return FilterSearchParams(formBuilder.build())
-    }
-
-    val FILTER_LIST get() = AnimeFilterList(
-        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
-        GenresFilter(),
-        TypesFilter(),
-        StatusFilter(),
-        YearsFilter(),
-        SortFilter(),
-    )
-
-    class GenresFilter : QueryPartFilter("Género", OtakuversoFiltersData.GENRES)
-
-    class TypesFilter : QueryPartFilter("Tipo", OtakuversoFiltersData.TYPES)
-
-    class StatusFilter : QueryPartFilter("Estado", OtakuversoFiltersData.STATUS)
-
-    class YearsFilter : QueryPartFilter("Año", OtakuversoFiltersData.YEARS)
-
-    class SortFilter : QueryPartFilter("Orden", OtakuversoFiltersData.SORT)
-
-    private object OtakuversoFiltersData {
-        val GENRES = arrayOf(
-            Pair("Todos", "0"),
-            Pair("Aventura", "jR"),
-            Pair("Misterio", "k5"),
-            Pair("Shounen", "l5"),
-            Pair("Acción", "mO"),
-            Pair("Fantasía", "nR"),
-            Pair("Demonios", "oj"),
-            Pair("Histórico", "p2"),
-            Pair("Sobrenatural", "q2"),
-            Pair("Artes Marciales", "rE"),
-            Pair("Comedia", "vm"),
-            Pair("Superpoderes", "wR"),
-            Pair("Magia", "x9"),
-            Pair("Deportes", "y7"),
-            Pair("Drama", "zY"),
-            Pair("Escolares", "AO"),
-            Pair("Ciencia Ficción", "BX"),
-            Pair("Horror", "Dx"),
-            Pair("Psicológico", "Ev"),
-            Pair("Juegos", "G7"),
-            Pair("Romance", "J2"),
-            Pair("Seinen", "KR"),
-            Pair("Recuentos de la vida", "Lw"),
-            Pair("Mecha", "MA"),
-            Pair("Shoujo", "N6"),
-            Pair("Policía", "Op"),
-            Pair("Suspenso", "Pw"),
-            Pair("Música", "Ql"),
-            Pair("Parodia", "Rq"),
-            Pair("Ecchi", "VM"),
-            Pair("Terror", "WJ"),
-            Pair("Militar", "XW"),
-            Pair("Vampiros", "YK"),
-            Pair("Samurai", "ZJ"),
-            Pair("Infantil", "1R"),
-            Pair("Harem", "2K"),
-            Pair("Escuela", "3M"),
-            Pair("Carreras", "41"),
-            Pair("Lucha", "5B"),
-            Pair("Gore", "6n"),
-            Pair("Latino", "7j"),
-            Pair("Fútbol", "8m"),
-            Pair("Espacial", "9x"),
-            Pair("Josei", "0v"),
-            Pair("Comida", "gJY"),
-            Pair("School", "jRR"),
-            Pair("Yuri", "kR5"),
-            Pair("Yaoi", "lY5"),
-            Pair("Shounen Ai", "mZO"),
-        )
-
-        val TYPES = arrayOf(
-            Pair("Todos", "0"),
-            Pair("Serie", "1"),
-            Pair("Película", "2"),
-            Pair("Especial", "3"),
-            Pair("OVA", "4"),
-        )
-
-        val STATUS = arrayOf(
-            Pair("Todos", "0"),
-            Pair("Emitiendose", "1"),
-            Pair("Próximo", "2"),
-            Pair("Finalizado", "3"),
-        )
-
-        val YEARS = arrayOf(Pair("Todos", "0")) + (1980..Calendar.getInstance().get(Calendar.YEAR)).map { Pair("$it", "$it") }.reversed().toTypedArray()
-
-        val SORT = arrayOf(
-            Pair("Default", "0"),
-            Pair("Ascendente", "1"),
-            Pair("Descendente", "2"),
-        )
-    }
-}
diff --git a/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/extractors/UnpackerExtractor.kt b/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/extractors/UnpackerExtractor.kt
deleted file mode 100644
index 5555e497..00000000
--- a/src/es/otakuverso/src/eu/kanade/tachiyomi/animeextension/es/otakuverso/extractors/UnpackerExtractor.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.otakuverso.extractors
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UnpackerExtractor(private val client: OkHttpClient, private val headers: Headers) {
-    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
-
-    fun videosFromUrl(url: String): List<Video> {
-        val doc = client.newCall(GET(url, headers)).execute()
-            .asJsoup()
-
-        val script = doc.selectFirst("script:containsData(eval)")
-            ?.data()
-            ?.let(JsUnpacker::unpackAndCombine)
-            ?: return emptyList()
-
-        val playlistUrl = script.substringAfter("file:\"").substringBefore('"')
-
-        return playlistUtils.extractFromHls(
-            playlistUrl,
-            referer = playlistUrl,
-            videoNameGen = { "Lulu:$it" },
-        )
-    }
-}
diff --git a/src/es/pelisflix/build.gradle b/src/es/pelisflix/build.gradle
new file mode 100644
index 00000000..33743c9b
--- /dev/null
+++ b/src/es/pelisflix/build.gradle
@@ -0,0 +1,12 @@
+ext {
+    extName = 'Pelisflix'
+    extClass = '.PelisflixFactory'
+    extVersionCode = 18
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:dood-extractor'))
+}
\ No newline at end of file
diff --git a/src/es/pelisflix/res/mipmap-hdpi/ic_launcher.png b/src/es/pelisflix/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..730e7656
Binary files /dev/null and b/src/es/pelisflix/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/pelisflix/res/mipmap-mdpi/ic_launcher.png b/src/es/pelisflix/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..9ec7dbb5
Binary files /dev/null and b/src/es/pelisflix/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/pelisflix/res/mipmap-xhdpi/ic_launcher.png b/src/es/pelisflix/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..0e9c48dc
Binary files /dev/null and b/src/es/pelisflix/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/pelisflix/res/mipmap-xxhdpi/ic_launcher.png b/src/es/pelisflix/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..cf6db2ad
Binary files /dev/null and b/src/es/pelisflix/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/pelisflix/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/pelisflix/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b30b86d6
Binary files /dev/null and b/src/es/pelisflix/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt
new file mode 100644
index 00000000..3aa74ea9
--- /dev/null
+++ b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt
@@ -0,0 +1,267 @@
+package eu.kanade.tachiyomi.animeextension.es.pelisflix
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Base64
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import org.jsoup.select.Elements
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+import java.lang.Exception
+
+open class Pelisflix(override val name: String, override val baseUrl: String) : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    private val json: Json by injectLazy()
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/peliculas-online/page/$page")
+
+    override fun popularAnimeSelector(): String = "#Tf-Wp div.TpRwCont ul.MovieList li.TPostMv article.TPost"
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a").attr("href"))
+        anime.title = element.select("a h2.Title").text()
+        anime.thumbnail_url = externalOrInternalImg(element.selectFirst("a div.Image figure.Objf img.imglazy")!!.attr("data-src"))
+        anime.description = element.select("div.TPMvCn div.Description p:nth-child(1)").text().removeSurrounding("\"")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "nav.wp-pagenavi div.nav-links a ~ a"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episodeList = mutableListOf<SEpisode>()
+        val movie = document.select("ul.optnslst li div[data-url]")
+        val seasons = document.select("main .SeasonBx a")
+        if (movie.any()) {
+            val movieEp = SEpisode.create()
+            movieEp.name = "Pelicula"
+            movieEp.episode_number = 1f
+            movieEp.setUrlWithoutDomain(response.request.url.toString())
+            episodeList.add(movieEp)
+        } else if (seasons.any()) {
+            val seasonEp = extractEpisodesFromSeasons(seasons)
+            if (seasonEp.isNotEmpty()) episodeList.addAll(seasonEp)
+        }
+        return episodeList.reversed()
+    }
+
+    private fun extractEpisodesFromSeasons(seasons: Elements): List<SEpisode> {
+        val episodeList = mutableListOf<SEpisode>()
+        var noEp = 1f
+        var noTemp = 1
+        seasons!!.forEach {
+            var request = client.newCall(GET(it!!.attr("href"))).execute()
+            if (request.isSuccessful) {
+                val document = request.asJsoup()
+                document.select("div.TPTblCn table tbody tr.Viewed")!!.forEach { epContainer ->
+                    val urlEp = epContainer.selectFirst("td.MvTbPly > a")!!.attr("href")
+                    val ep = SEpisode.create()
+                    ep.name = "T$noTemp - Episodio $noEp"
+                    ep.episode_number = noEp
+                    ep.setUrlWithoutDomain(urlEp)
+                    episodeList.add(ep)
+                    noEp++
+                }
+            }
+            noTemp++
+        }
+        return episodeList
+    }
+
+    override fun episodeListSelector() = "uwu"
+
+    override fun episodeFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        document.select("div.TPost.A.D div.Container div.optns-bx div.drpdn button.bstd").forEach { serverList ->
+            serverList.select("ul.optnslst li div[data-url]").forEach {
+                val langTag = it.selectFirst("span:nth-child(2)")!!
+                    .text().substringBefore("HD")
+                    .substringBefore("SD")
+                    .trim()
+                val langVideo = if (langTag.contains("LATINO")) "LAT" else if (langTag.contains("CASTELLANO")) "CAST" else "SUB"
+                val encryptedUrl = it.attr("data-url")
+                val url = String(Base64.decode(encryptedUrl, Base64.DEFAULT))
+                val nuploadDomains = arrayOf("nuuuppp", "nupload")
+                if (nuploadDomains.any { x -> url.contains(x) } && !url.contains("/iframe/")) {
+                    nuploadExtractor(langVideo, url).map { video -> videoList.add(video) }
+                }
+            }
+        }
+        return videoList
+    }
+
+    private fun nuploadExtractor(prefix: String, url: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val request = client.newCall(GET(url)).execute()
+        if (request.isSuccessful) {
+            val document = request.asJsoup()
+            document.select("script").forEach { script ->
+                if (script!!.data().contains("var sesz=\"")) {
+                    val key = script.data().substringAfter("var sesz=\"").substringBefore("\",")
+                    var preUrl = script.data().substringAfter("file:\"").substringBefore("\"+")
+                    var headersNupload = headers.newBuilder()
+                        .set("authority", preUrl.substringAfter("https://").substringBefore("/"))
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("referer", "https://nupload.co/")
+                        .set("dnt", "1")
+                        .set("range", "bytes=0-")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"104\", \" Not A;Brand\";v=\"99\", \"Google Chrome\";v=\"104\"")
+                        .set("sec-fetch-dest", "video")
+                        .set("sec-fetch-mode", "no-cors")
+                        .set("sec-fetch-site", "cross-site")
+                        .set("sec-gpc", "1")
+                        .set("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36")
+                        .build()
+                    videoList.add(Video(preUrl, "$prefix Nupload", preUrl + key, headers = headersNupload))
+                }
+            }
+        }
+        return videoList
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/?s=$query&page=$page")
+            genreFilter.state != 0 -> GET("$baseUrl/${genreFilter.toUriPart()}/page/$page")
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Géneros",
+        arrayOf(
+            Pair("<Selecionar>", ""),
+            Pair("Peliculas", "peliculas-online"),
+            Pair("Series", "series-online"),
+            Pair("Estrenos", "genero/estrenos"),
+            Pair("Aventura", "genero/aventura"),
+            Pair("Acción", "genero/accion"),
+            Pair("Ciencia ficción", "genero/ciencia-ficcion"),
+            Pair("Comedia", "genero/comedia"),
+            Pair("Crimen", "genero/crimen"),
+            Pair("Drama", "genero/drama"),
+            Pair("Romance", "genero/romance"),
+            Pair("Terror", "genero/terror"),
+        ),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        return popularAnimeFromElement(element)
+    }
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        var description = try {
+            document.selectFirst("article.TPost header.Container div.TPMvCn div.Description")!!
+                .text().removeSurrounding("\"")
+                .substringAfter("Online:")
+                .substringBefore("Recuerda ")
+                .substringBefore("Director:")
+                .trim()
+        } catch (e: Exception) {
+            document.selectFirst("article.TPost header div.TPMvCn div.Description p:nth-child(1)")!!.text().removeSurrounding("\"").trim()
+        }
+
+        var title = try {
+            document.selectFirst("article.TPost header.Container div.TPMvCn h1.Title")!!.text().removePrefix("Serie").trim()
+        } catch (e: Exception) {
+            document.selectFirst("article.TPost header.Container div.TPMvCn a h1.Title")!!.text().removePrefix("Serie").trim()
+        }
+
+        anime.title = title
+        anime.description = description
+        anime.genre = document.select("article.TPost header.Container div.TPMvCn div.Description p.Genre a").joinToString { it.text().replace(",", "") }
+        anime.status = SAnime.UNKNOWN
+        return anime
+    }
+
+    private fun externalOrInternalImg(url: String): String {
+        return if (url.contains("https")) url else if (url.startsWith("//")) "https:$url" else "$baseUrl/$url"
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when {
+            statusString.contains("En emision") -> SAnime.ONGOING
+            statusString.contains("Finalizado") -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+
+    override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/browse?order=added&page=$page")
+
+    override fun latestUpdatesSelector() = popularAnimeSelector()
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("LAT Nupload", "CAST Nupload", "SUB Nupload")
+            entryValues = arrayOf("LAT Nupload", "CAST Nupload", "SUB Nupload")
+            setDefaultValue("LAT Nupload")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}
diff --git a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
new file mode 100644
index 00000000..33fe2838
--- /dev/null
+++ b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
@@ -0,0 +1,226 @@
+package eu.kanade.tachiyomi.animeextension.es.pelisflix
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.AnimeSource
+import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class PelisflixFactory : AnimeSourceFactory {
+    override fun createSources(): List<AnimeSource> = listOf(PelisflixClass(), SeriesflixClass())
+}
+
+class PelisflixClass : Pelisflix("Pelisflix", "https://pelisflix2.green")
+
+class SeriesflixClass : Pelisflix("Seriesflix", "https://seriesflix.video") {
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/ver-series-online/page/$page")
+
+    override fun popularAnimeSelector() = "li[id*=post-] > article"
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a").attr("href"))
+        anime.title = element.select("a h2.Title").text()
+        anime.thumbnail_url = element.selectFirst("a div.Image figure.Objf img")!!.attr("src")
+        anime.description = element.select("div.TPMvCn div.Description p:nth-child(1)").text().removeSurrounding("\"")
+        return anime
+    }
+
+    private fun loadVideoSources(urlResponse: String, lang: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        fetchUrls(urlResponse).map { serverUrl ->
+            Log.i("bruh url", serverUrl)
+            if (serverUrl.contains("doodstream")) {
+                val video = DoodExtractor(client).videoFromUrl(serverUrl.replace("https://doodstream.com", "https://dood.wf"), lang + "DoodStream")
+                if (video != null) videoList.add(video)
+            }
+            if (serverUrl.contains("streamtape")) {
+                val video = StreamTapeExtractor(client).videoFromUrl(serverUrl, lang + "StreamTape")
+                if (video != null) videoList.add(video)
+            }
+        }
+        return videoList
+    }
+
+    private fun fetchUrls(text: String?): List<String> {
+        if (text.isNullOrEmpty()) return listOf()
+        val linkRegex = "(http|ftp|https):\\/\\/([\\w_-]+(?:(?:\\.[\\w_-]+)+))([\\w.,@?^=%&:\\/~+#-]*[\\w@?^=%&\\/~+#-])".toRegex()
+        return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        document.select("ul.ListOptions li").forEach { serverList ->
+            val movieID = serverList.attr("data-id")
+            val serverID = serverList.attr("data-key")
+            val type = if (response.request.url.toString().contains("movies")) 1 else 2
+            val url = "$baseUrl/?trembed=$serverID&trid=$movieID&trtype=$type"
+            val langTag = serverList.selectFirst("p.AAIco-language")!!.text().substring(3).uppercase()
+
+            val lang = if (langTag.contains("LATINO")) "[LAT]" else if (langTag.contains("CASTELLANO")) "[CAST]" else "[SUB]"
+            var request = client.newCall(GET(url)).execute()
+            if (request.isSuccessful) {
+                val serverLinks = request.asJsoup()
+                serverLinks.select("div.Video iframe").map {
+                    val iframe = it.attr("src")
+                    if (iframe.contains("https://sc.seriesflix.video/index.php")) {
+                        val postKey = iframe.replace("https://sc.seriesflix.video/index.php?h=", "")
+                        val mediaType = "application/x-www-form-urlencoded".toMediaType()
+                        val body: RequestBody = "h=$postKey".toRequestBody(mediaType)
+                        val newClient = OkHttpClient().newBuilder().build()
+                        val requestServer = Request.Builder()
+                            .url("https://sc.seriesflix.video/r.php?h=$postKey")
+                            .method("POST", body)
+                            .addHeader("Host", "sc.seriesflix.video")
+                            .addHeader(
+                                "User-Agent",
+                                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+                            )
+                            .addHeader(
+                                "Accept",
+                                "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+                            )
+                            .addHeader("Accept-Language", "en-US,en;q=0.5")
+                            .addHeader("Content-Type", "application/x-www-form-urlencoded")
+                            .addHeader("Origin", "null")
+                            .addHeader("DNT", "1")
+                            .addHeader("Connection", "keep-alive")
+                            .addHeader("Upgrade-Insecure-Requests", "1")
+                            .addHeader("Sec-Fetch-Dest", "iframe")
+                            .addHeader("Sec-Fetch-Mode", "no-cors")
+                            .addHeader("sec-fetch-site", "same-origin")
+                            .addHeader("Sec-Fetch-User", "?1")
+                            .addHeader("Alt-Used", "sc.seriesflix.video")
+                            .addHeader("Access-Control-Allow-Methods", "POST")
+                            .build()
+                        val document = newClient.newCall(requestServer).execute()
+                        val urlResponse = document!!.networkResponse!!.toString()
+
+                        loadVideoSources(urlResponse, lang)!!.forEach { source ->
+                            videoList.add(source)
+                        }
+                    } else {
+                        loadVideoSources(iframe, lang)
+                    }
+                }
+            }
+        }
+        return videoList
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/?s=$query&page=$page")
+            genreFilter.state != 0 -> GET("$baseUrl/${genreFilter.toUriPart()}/page/$page")
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Géneros",
+        arrayOf(
+            Pair("<Selecionar>", ""),
+            Pair("Acción", "genero/accion"),
+            Pair("Animación", "genero/animacion"),
+            Pair("Anime", "genero/anime"),
+            Pair("Antiguas", "genero/series-antiguas"),
+            Pair("Aventura", "genero/aventura"),
+            Pair("Ciencia ficción", "genero/ciencia-ficcion"),
+            Pair("Comedia", "genero/comedia"),
+            Pair("Crimen", "genero/crimen"),
+            Pair("DC Comics", "genero/dc-comics"),
+            Pair("Drama", "genero/drama"),
+            Pair("Dorama", "genero/dorama"),
+            Pair("Estrenos", "genero/estrenos"),
+            Pair("Fantasía", "genero/fantasia"),
+            Pair("Misterio", "genero/misterio"),
+            Pair("Romance", "genero/romance"),
+            Pair("Terror", "genero/terror"),
+        ),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        return try {
+            val videoSorted = this.sortedWith(
+                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
+            ).toTypedArray()
+            val userPreferredQuality = preferences.getString("preferred_quality", "[LAT]DoodStream")
+            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
+            if (preferredIdx != -1) {
+                videoSorted.drop(preferredIdx + 1)
+                videoSorted[0] = videoSorted[preferredIdx]
+            }
+            videoSorted.toList()
+        } catch (e: Exception) {
+            this
+        }
+    }
+
+    private fun getNumberFromString(epsStr: String): String {
+        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val qualities = arrayOf(
+            "[LAT]DoodStream",
+            "[CAST]DoodStream",
+            "[SUB]DoodStream",
+            "[LAT]StreamTape",
+            "[CAST]StreamTape",
+            "[SUB]StreamTape", // video servers without resolution
+        )
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = qualities
+            entryValues = qualities
+            setDefaultValue("[LAT]DoodStream")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}
diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle
index 9020acf2..be9d214b 100644
--- a/src/it/animeworld/build.gradle
+++ b/src/it/animeworld/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'ANIMEWORLD.tv'
     extClass = '.ANIMEWORLD'
-    extVersionCode = 47
+    extVersionCode = 46
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
index cbca0853..71517d12 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
@@ -34,7 +34,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // TODO: Check frequency of url changes to potentially
     // add back overridable baseurl preference
-    override val baseUrl = "https://www.animeworld.ac"
+    override val baseUrl = "https://www.animeworld.so"
 
     override val lang = "it"
 
diff --git a/src/pl/docchi/build.gradle b/src/pl/docchi/build.gradle
index 02e2d766..79a34009 100644
--- a/src/pl/docchi/build.gradle
+++ b/src/pl/docchi/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Docchi'
     extClass = '.Docchi'
-    extVersionCode = 3
+    extVersionCode = 2
     isNsfw = true
 }
 
diff --git a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
index 37b3b385..62daaed8 100644
--- a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
+++ b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
@@ -137,7 +137,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
     private val sibnetExtractor by lazy { SibnetExtractor(client) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val lycorisExtractor by lazy { LycorisCafeExtractor(client) }
-    private val luluExtractor by lazy { LuluExtractor(client, headers) }
+    private val luluExtractor by lazy { LuluExtractor(client) }
     private val googledriveExtractor by lazy { GoogleDriveExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
@@ -278,7 +278,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
         val genres: List<String>,
         val broadcast_day: String?,
         val aired_from: String?,
-        val episodes: Int?,
+        val episodes: Int,
         val season: String,
         val season_year: Int,
         val series_type: String,
@@ -294,7 +294,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
         val cover: String,
         val adult_content: String,
         val series_type: String,
-        val episodes: Int?,
+        val episodes: Int,
         val season: String,
         val season_year: Int,
     )
@@ -315,7 +315,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
         val genres: List<String>,
         val broadcast_day: String?,
         val aired_from: String?,
-        val episodes: Int?,
+        val episodes: Int,
         val season: String,
         val season_year: Int,
         val series_type: String,
diff --git a/src/pt/animesgratis/build.gradle b/src/pt/animesgratis/build.gradle
index 8e0c3b14..a9f7edf9 100644
--- a/src/pt/animesgratis/build.gradle
+++ b/src/pt/animesgratis/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Q1N'
     themePkg = 'dooplay'
     baseUrl = 'https://q1n.net'
-    overrideVersionCode = 18
+    overrideVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt
index 03e410bc..ef9a0bb1 100644
--- a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt
+++ b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt
@@ -129,7 +129,6 @@ class Q1N : DooPlay(
             "mixdrop" in name -> mixDropExtractor.videoFromUrl(url)
             "streamtape" in name -> streamTapeExtractor.videosFromUrl(url)
             "noa" in name -> noaExtractor.videosFromUrl(url)
-            "mdplayer" in name -> noaExtractor.videosFromUrl(url, "MDPLAYER")
             "/player/" in url -> bloggerExtractor.videosFromUrl(url, headers)
             else -> emptyList()
         }
diff --git a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt
index 9755a9a1..5bb5d42c 100644
--- a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt
+++ b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt
@@ -6,7 +6,7 @@ import okhttp3.Headers
 import okhttp3.OkHttpClient
 
 class NoaExtractor(private val client: OkHttpClient, private val headers: Headers) {
-    fun videosFromUrl(url: String, name: String = "NOA"): List<Video> {
+    fun videosFromUrl(url: String): List<Video> {
         val body = client.newCall(GET(url)).execute()
             .body.string()
 
@@ -16,7 +16,7 @@ class NoaExtractor(private val client: OkHttpClient, private val headers: Header
                     .substringAfter(":\"")
                     .substringBefore('"')
                     .replace("\\", "")
-                listOf(Video(videoUrl, name, videoUrl, headers))
+                listOf(Video(videoUrl, "NOA", videoUrl, headers))
             }
 
             "sources:" in body -> {
@@ -31,7 +31,7 @@ class NoaExtractor(private val client: OkHttpClient, private val headers: Header
                             .substringAfter(":\"")
                             .substringBefore('"')
                             .replace("\\", "")
-                        Video(videoUrl, "$name - $label", videoUrl, headers)
+                        Video(videoUrl, "NOA - $label", videoUrl, headers)
                     }
             }
 
diff --git a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt
index aa2bcc52..0f6e4a73 100644
--- a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt
+++ b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt
@@ -15,7 +15,7 @@ class RuplayExtractor(private val client: OkHttpClient) {
             .split(",")
             .map {
                 val videoUrl = it.substringAfter("]")
-                val quality = it.substringAfter("[", "").substringBefore("]").ifEmpty { "Default" }
+                val quality = it.substringAfter("[").substringBefore("]")
                 val headers = Headers.headersOf("Referer", videoUrl)
                 Video(videoUrl, "Ruplay - $quality", videoUrl, headers = headers)
             }
diff --git a/src/pt/anitube/build.gradle b/src/pt/anitube/build.gradle
index 9f22f339..d20560a0 100644
--- a/src/pt/anitube/build.gradle
+++ b/src/pt/anitube/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anitube'
     extClass = '.Anitube'
-    extVersionCode = 24
+    extVersionCode = 23
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
index 1736832d..ddf1dcb4 100644
--- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
+++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.animeextension.pt.anitube.extractors
 
 import android.content.SharedPreferences
-import android.util.Base64
 import android.util.Log
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
@@ -15,9 +14,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import java.net.ProtocolException
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
 
 class AnitubeExtractor(
     private val headers: Headers,
@@ -136,86 +132,32 @@ class AnitubeExtractor(
         return "https://widgets.outbrain.com/outbrain.js"
     }
 
-    private fun getAuthCode(serverUrl: String, thumbUrl: String, link: String): String? {
-        try {
-            var authCode = preferences.getString(PREF_AUTHCODE_KEY, "")!!
+    private fun getAuthCode(serverUrl: String, thumbUrl: String, link: String): String {
+        var authCode = preferences.getString(PREF_AUTHCODE_KEY, "")!!
 
-            if (authCode.isNotBlank()) {
-                Log.d(tag, "AuthCode found in preferences")
+        if (authCode.isNotBlank()) {
+            Log.d(tag, "AuthCode found in preferences")
 
-                val authArgs = Base64.decode(authCode.substringAfter("="), Base64.DEFAULT).let(::String)
-                val url = "$serverUrl?$authArgs".toHttpUrl()
+            val response = checkVideoExists("${serverUrl}$authCode")
 
-                val serverTime =
-                    SimpleDateFormat("M/d/yyyy h:m:s a", Locale.ENGLISH).parse(
-                        url.queryParameter("server_time") ?: "",
-                    )
-
-                val calendar = Calendar.getInstance()
-                serverTime?.let { calendar.setTime(it) }
-
-                url.queryParameter("validminutes")?.toInt()
-                    ?.let { calendar.add(Calendar.MINUTE, it) }
-
-                if (Calendar.getInstance() < calendar) {
-                    Log.d(tag, "AuthCode is OK")
-                    return authCode
-                }
-                Log.d(tag, "AuthCode is invalid")
-            }
-
-            Log.d(tag, "Fetching new authCode")
-
-            val adsUrl = getAdsUrl(serverUrl, thumbUrl, link, headers)
-
-            val adsContent = client.newCall(GET(adsUrl)).execute().body.string()
-
-            val body = FormBody.Builder()
-                .add("category", "client")
-                .add("type", "premium")
-                .add("ad", adsContent)
-                .build()
-
-            val newHeaders = headers.newBuilder()
-                .set("Referer", "https://${SITE_URL.toHttpUrl().host}/")
-                .add("Accept", "*/*")
-                .add("Cache-Control", "no-cache")
-                .add("Pragma", "no-cache")
-                .add("Connection", "keep-alive")
-                .add("Sec-Fetch-Dest", "empty")
-                .add("Sec-Fetch-Mode", "cors")
-                .add("Sec-Fetch-Site", "same-site")
-                .build()
-
-            authCode =
-                client.newCall(POST(ADS_URL, headers = newHeaders, body = body))
-                    .execute()
-                    .body.string()
-                    .substringAfter("\"publicidade\"")
-                    .substringAfter('"')
-                    .substringBefore('"')
-
-            if (authCode.startsWith("?wmsAuthSign=")) {
-                Log.d(tag, "Auth code fetched successfully")
-                preferences.edit().putString(PREF_AUTHCODE_KEY, authCode).commit()
+            if (response.exists || response.code == 500) {
+                Log.d(tag, "AuthCode is OK")
                 return authCode
             }
-
-            Log.e(
-                tag,
-                "Failed to fetch \"publicidade\" code, the current response: $authCode",
-            )
-        } catch (e: Exception) {
-            Log.e(tag, e.toString())
+            Log.d(tag, "AuthCode is invalid")
         }
 
-        preferences.edit().putString(PREF_AUTHCODE_KEY, "").commit()
+        Log.d(tag, "Fetching new authCode")
 
-        return null
-    }
+        val adsUrl = getAdsUrl(serverUrl, thumbUrl, link, headers)
 
-    private fun getVideoToken(videoUrl: String, authCode: String?): String {
-        val token = authCode ?: "undefined"
+        val adsContent = client.newCall(GET(adsUrl)).execute().body.string()
+
+        val body = FormBody.Builder()
+            .add("category", "client")
+            .add("type", "premium")
+            .add("ad", adsContent)
+            .build()
 
         val newHeaders = headers.newBuilder()
             .set("Referer", "https://${SITE_URL.toHttpUrl().host}/")
@@ -228,10 +170,27 @@ class AnitubeExtractor(
             .add("Sec-Fetch-Site", "same-site")
             .build()
 
-        val videoToken =
+        val publicidade =
+            client.newCall(POST(ADS_URL, headers = newHeaders, body = body))
+                .execute()
+                .body.string()
+                .substringAfter("\"publicidade\"")
+                .substringAfter('"')
+                .substringBefore('"')
+
+        if (publicidade.isBlank()) {
+            Log.e(
+                tag,
+                "Failed to fetch \"publicidade\" code, the current response: $publicidade",
+            )
+
+            throw Exception("Por favor, abra o vídeo uma vez no navegador para liberar o IP")
+        }
+
+        authCode =
             client.newCall(
                 GET(
-                    "$ADS_URL?token=$token&url=$videoUrl",
+                    "$ADS_URL?token=$publicidade",
                     headers = newHeaders,
                 ),
             )
@@ -241,25 +200,25 @@ class AnitubeExtractor(
                 .substringAfter('"')
                 .substringBefore('"')
 
-        if (videoToken.startsWith("?")) {
-            Log.d(tag, "Video token fetched successfully")
-            return videoToken
+        if (authCode.startsWith("?")) {
+            Log.d(tag, "Auth code fetched successfully")
+            preferences.edit().putString(PREF_AUTHCODE_KEY, authCode).commit()
+        } else {
+            Log.e(
+                tag,
+                "Failed to fetch auth code, the current response: $authCode",
+            )
         }
 
-        Log.e(
-            tag,
-            "Failed to fetch video token, the current response: $videoToken",
-        )
-
-        return ""
+        return authCode
     }
 
     fun getVideoList(doc: Document): List<Video> {
-        Log.d(tag, "Starting to fetch video list")
-
         val hasFHD = doc.selectFirst("div.abaItem:contains(FULLHD)") != null
         val serverUrl = doc.selectFirst("meta[itemprop=contentURL]")!!
             .attr("content")
+            .replace("cdn1", "cdn3")
+            .replace("cdn80", "cdn8")
         val thumbUrl = doc.selectFirst("meta[itemprop=thumbnailUrl]")!!
             .attr("content")
         val type = serverUrl.split("/").get(3)
@@ -272,8 +231,6 @@ class AnitubeExtractor(
             }
         } + listOf("appfullhd")
 
-        Log.d(tag, "Found ${paths.size} videos")
-
         val firstLink =
             doc.selectFirst("div.video_container > a, div.playerContainer > a")!!.attr("href")
 
@@ -283,35 +240,16 @@ class AnitubeExtractor(
             .mapIndexed { index, quality ->
                 object {
                     var path = paths[index]
-                    var url = serverUrl.replace(type, path)
+                    var url = serverUrl.replace(type, path) + authCode
                     var quality = "$quality - Anitube"
                 }
             }
             .parallelCatchingFlatMapBlocking {
-                if (!authCode.isNullOrBlank() && checkVideoExists(it.url + authCode).exists) {
-                    return@parallelCatchingFlatMapBlocking listOf(
-                        Video(
-                            it.url + authCode,
-                            it.quality,
-                            it.url + authCode,
-                            headers = headers,
-                        ),
-                    )
+                if (!checkVideoExists(it.url).exists) {
+                    Log.d(tag, "Video not exists: ${it.url.substringBefore("?")}")
+                    return@parallelCatchingFlatMapBlocking emptyList()
                 }
-                val videoToken = getVideoToken(it.url, authCode)
-                if (videoToken.isNotBlank() && checkVideoExists(it.url + videoToken).exists) {
-                    return@parallelCatchingFlatMapBlocking listOf(
-                        Video(
-                            it.url + videoToken,
-                            it.quality,
-                            it.url + videoToken,
-                            headers = headers,
-                        ),
-                    )
-                }
-
-                Log.d(tag, "Video not exists: ${it.url.substringBefore("?")}")
-                return@parallelCatchingFlatMapBlocking emptyList()
+                listOf(Video(it.url, it.quality, it.url, headers = headers))
             }
             .reversed()
     }
diff --git a/src/zh/hanime1/build.gradle b/src/zh/hanime1/build.gradle
index 85bc719b..52a349f0 100644
--- a/src/zh/hanime1/build.gradle
+++ b/src/zh/hanime1/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hanime1'
     extClass = '.Hanime1'
-    extVersionCode = 4
+    extVersionCode = 3
     isNsfw = true
 }
 
diff --git a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt b/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
index ab8e354b..49f297c0 100644
--- a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
+++ b/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
@@ -24,7 +24,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Interceptor
 import okhttp3.Request
@@ -101,23 +100,13 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     override fun videoListParse(response: Response): List<Video> {
-        val doc = response.asJsoup()
-        val sourceList = doc.select("video source")
+        val sourceList = response.asJsoup().select("video source")
         val preferQuality = preferences.getString(PREF_KEY_VIDEO_QUALITY, DEFAULT_QUALITY)
         return sourceList.map {
             val quality = it.attr("size")
             val url = it.attr("src")
             Video(url, "${quality}P", videoUrl = url)
-        }.filterNot { it.videoUrl?.startsWith("blob") == true }
-            .sortedByDescending { preferQuality == it.quality }
-            .ifEmpty {
-                // Try to find the source from the script content.
-                val videoUrl = doc.select("script[type=application/ld+json]").first()!!.data().let {
-                    val info = json.decodeFromString<JsonElement>(it).jsonObject
-                    info["contentUrl"]!!.jsonPrimitive.content
-                }
-                listOf(Video(videoUrl, "Raw", videoUrl = videoUrl))
-            }
+        }.sortedByDescending { preferQuality == it.quality }
     }
 
     override fun latestUpdatesParse(response: Response): AnimesPage = searchAnimeParse(response)
@@ -148,7 +137,7 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
                 }
             }
         } else {
-            jsoup.select("a:not([target]) > .search-videos").map {
+            jsoup.select(".search-videos").map {
                 SAnime.create().apply {
                     setUrlWithoutDomain(it.parent()!!.attr("href"))
                     thumbnail_url = it.select("img").attr("src")
@@ -288,50 +277,25 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.apply {
-            addPreference(
-                ListPreference(context).apply {
-                    key = PREF_KEY_VIDEO_QUALITY
-                    title = "設置首選畫質"
-                    entries = arrayOf("1080P", "720P", "480P")
-                    entryValues = entries
-                    setDefaultValue(DEFAULT_QUALITY)
-                    summary =
-                        "當前選擇：${preferences.getString(PREF_KEY_VIDEO_QUALITY, DEFAULT_QUALITY)}"
-                    setOnPreferenceChangeListener { _, newValue ->
-                        summary = "當前選擇：${newValue as String}"
-                        true
-                    }
-                },
-            )
-            addPreference(
-                ListPreference(context).apply {
-                    key = PREF_KEY_LANG
-                    title = "設置首選語言"
-                    summary = "該設置僅影響影片字幕"
-                    entries = arrayOf("繁體中文", "簡體中文")
-                    entryValues = arrayOf("zh-CHT", "zh-CHS")
-                    setOnPreferenceChangeListener { _, newValue ->
-                        val baseHttpUrl = baseUrl.toHttpUrl()
-                        client.cookieJar.saveFromResponse(
-                            baseHttpUrl,
-                            listOf(
-                                Cookie.parse(
-                                    baseHttpUrl,
-                                    "user_lang=${newValue as String}",
-                                )!!,
-                            ),
-                        )
-                        true
-                    }
-                },
-            )
-        }
+        screen.addPreference(
+            ListPreference(screen.context).apply {
+                key = PREF_KEY_VIDEO_QUALITY
+                title = "設置首選畫質"
+                entries = arrayOf("1080P", "720P", "480P")
+                entryValues = entries
+                setDefaultValue(DEFAULT_QUALITY)
+                summary =
+                    "當前選擇：${preferences.getString(PREF_KEY_VIDEO_QUALITY, DEFAULT_QUALITY)}"
+                setOnPreferenceChangeListener { _, newValue ->
+                    summary = "當前選擇：${newValue as String}"
+                    true
+                }
+            },
+        )
     }
 
     companion object {
         const val PREF_KEY_VIDEO_QUALITY = "PREF_KEY_VIDEO_QUALITY"
-        const val PREF_KEY_LANG = "PREF_KEY_LANG"
 
         const val PREF_KEY_GENRE_LIST = "PREF_KEY_GENRE_LIST"
         const val PREF_KEY_SORT_LIST = "PREF_KEY_SORT_LIST"