diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 346eb44e..b8143aa9 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -47,13 +47,12 @@ jobs:
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
           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 }}
+          chmod +x ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2
@@ -175,3 +174,4 @@ jobs:
           cwd: "./repo"
           committer_name: Kohi-den-Bot
           committer_email: 177773202+Kohi-den-Bot@users.noreply.github.com
+ 
diff --git a/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt
index 4ec2105c..4d66cf11 100644
--- a/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt
+++ b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt
@@ -217,7 +217,7 @@ abstract class ZoroTheme(
 
         val serversDoc = response.parseAs<HtmlResponse>().getHtml()
 
-        val embedLinks = listOf("servers-sub", "servers-dub", "servers-mixed", "servers-raw").map { type ->
+        val embedLinks = listOf("servers-sub", "servers-dub", "servers-mixed").map { type ->
             if (type !in typeSelection) return@map emptyList()
 
             serversDoc.select("div.$type div.item").parallelMapNotNull {
@@ -332,8 +332,8 @@ abstract class ZoroTheme(
         private const val PREF_HOSTER_KEY = "hoster_selection"
 
         private const val PREF_TYPE_TOGGLE_KEY = "type_selection"
-        private val TYPES_ENTRIES = arrayOf("Sub", "Dub", "Mixed", "Raw")
-        private val TYPES_ENTRY_VALUES = arrayOf("servers-sub", "servers-dub", "servers-mixed", "servers-raw")
+        private val TYPES_ENTRIES = arrayOf("Sub", "Dub", "Mixed")
+        private val TYPES_ENTRY_VALUES = arrayOf("servers-sub", "servers-dub", "servers-mixed")
         private val PREF_TYPES_TOGGLE_DEFAULT = TYPES_ENTRY_VALUES.toSet()
     }
 
diff --git a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
index 1ea54de1..b93dd2e6 100644
--- a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
+++ b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
@@ -23,14 +23,13 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
         private val REGEX_SOURCES = Regex("""sources:\s*\[\{"file":"([^"]+)""")
         private val REGEX_FILE = Regex("""file: ?"([^"]+)"""")
         private val REGEX_SOURCE = Regex("""source = ?"([^"]+)"""")
-        private val REGEX_SUBS = Regex("""\{"file":"([^"]+)","label":"([^"]+)","kind":"captions","default":\w+\}""")
+        private val REGEX_SUBS = Regex("""\[(.*?)\](https?://[^\s,]+)""")
         private const val KEY_SOURCE = "https://raw.githubusercontent.com/Rowdy-Avocado/multi-keys/keys/index.html"
     }
 
     fun videoFromUrl(url: String, referer: String, prefix: String = "Chillx - "): List<Video> {
         val newHeaders = headers.newBuilder()
             .set("Referer", "$referer/")
-            .set("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8")
             .set("Accept-Language", "en-US,en;q=0.5")
             .build()
 
@@ -51,7 +50,7 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
         val subtitleList = buildList {
             val subtitles = REGEX_SUBS.findAll(decryptedScript)
             subtitles.forEach {
-                add(Track(it.groupValues[1], decodeUnicodeEscape(it.groupValues[2])))
+                add(Track(it.groupValues[2], decodeUnicodeEscape(it.groupValues[1])))
             }
         }
 
@@ -86,4 +85,5 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
         @SerialName("chillx") val keys: List<String>
     )
 }
+
 class ErrorLoadingException(message: String) : Exception(message)
diff --git a/lib/fireplayer-extractor/build.gradle.kts b/lib/fireplayer-extractor/build.gradle.kts
deleted file mode 100644
index b102264b..00000000
--- a/lib/fireplayer-extractor/build.gradle.kts
+++ /dev/null
@@ -1,10 +0,0 @@
-plugins {
-    id("lib-android")
-}
-
-dependencies {
-    implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
-        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
-    }
-    implementation(project(":lib:playlist-utils"))
-}
diff --git a/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt b/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt
deleted file mode 100644
index 4afa8d95..00000000
--- a/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package eu.kanade.tachiyomi.lib.fireplayerextractor
-
-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.network.POST
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.FormBody
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-
-class FireplayerExtractor(
-    private val client: OkHttpClient,
-    private val defaultHost: String? = null,
-) {
-    fun videosFromUrl(
-        url: String,
-        videoNameGen: (String) -> String = { quality -> quality },
-        videoHost: String? = null,
-    ): List<Video> {
-        val host = videoHost ?: defaultHost ?: "https://${url.toHttpUrl().host}"
-
-        val headers = Headers.Builder()
-            .set("X-Requested-With", "XMLHttpRequest")
-            .set("Referer", host)
-            .set("Origin", "https://${host.toHttpUrl().host}")
-            .set("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        var id = url.substringAfterLast("/")
-
-        if (id.length < 32) {
-            val doc = client.newCall(GET(url, headers)).execute().asJsoup()
-
-            val script =
-                doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
-                    ?.replace(Regex("[\\u00E0-\\u00FC]"), "-") // Fix a bug in JsUnpacker with accents
-                    ?.let(JsUnpacker::unpackAndCombine)
-                    ?: doc.selectFirst("script:containsData(FirePlayer)")?.data()
-
-            if (script?.contains("FirePlayer(") == true) {
-                id = script.substringAfter("FirePlayer(\"").substringBefore('"')
-            }
-        }
-
-        val postUrl = "$host/player/index.php?data=$id&do=getVideo"
-        val body = FormBody.Builder()
-            .add("hash", id)
-            .add("r", "")
-            .build()
-
-        val masterUrl = client.newCall(POST(postUrl, headers, body = body)).execute()
-            .body.string()
-            .substringAfter("securedLink\":\"")
-            .substringBefore('"')
-            .replace("\\", "")
-
-        val playlistUtils = PlaylistUtils(client, headers)
-
-        return playlistUtils.extractFromHls(masterUrl, videoNameGen = videoNameGen)
-    }
-}
diff --git a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
index 5b2d68ba..f4f231ce 100644
--- a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
+++ b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
@@ -17,12 +17,7 @@ class MixDropExtractor(private val client: OkHttpClient) {
         externalSubs: List<Track> = emptyList(),
         referer: String = DEFAULT_REFERER,
     ): List<Video> {
-        val headers = Headers.headersOf(
-            "Referer",
-            referer,
-            "User-Agent",
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
-        )
+        val headers = Headers.headersOf("Referer", referer)
         val doc = client.newCall(GET(url, headers)).execute().asJsoup()
         val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
             ?.data()
diff --git a/src/all/hikari/build.gradle b/src/all/hikari/build.gradle
index 2e8afef6..23c6a56c 100644
--- a/src/all/hikari/build.gradle
+++ b/src/all/hikari/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hikari'
     extClass = '.Hikari'
-    extVersionCode = 11
+    extVersionCode = 8
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/javguru/build.gradle b/src/all/javguru/build.gradle
index e8f7a0d5..7da90918 100644
--- a/src/all/javguru/build.gradle
+++ b/src/all/javguru/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Jav Guru'
     extClass = '.JavGuru'
-    extVersionCode = 17
+    extVersionCode = 16
     isNsfw = true
 }
 
diff --git a/src/ar/egydead/build.gradle b/src/ar/egydead/build.gradle
index fb5cecb3..2ad2e37e 100644
--- a/src/ar/egydead/build.gradle
+++ b/src/ar/egydead/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Egy Dead'
     extClass = '.EgyDead'
-    extVersionCode = 14
+    extVersionCode = 13
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/cineclix/build.gradle b/src/de/cineclix/build.gradle
index f18df74d..069ad729 100644
--- a/src/de/cineclix/build.gradle
+++ b/src/de/cineclix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'CineClix'
     extClass = '.CineClix'
-    extVersionCode = 16
+    extVersionCode = 15
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/einfach/build.gradle b/src/de/einfach/build.gradle
index 94e405f9..868eeabd 100644
--- a/src/de/einfach/build.gradle
+++ b/src/de/einfach/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Einfach'
     extClass = '.Einfach'
-    extVersionCode = 12
+    extVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/movie2k/build.gradle b/src/de/movie2k/build.gradle
index 35037b6f..f93841e6 100644
--- a/src/de/movie2k/build.gradle
+++ b/src/de/movie2k/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Movie2k'
     extClass = '.Movie2k'
-    extVersionCode = 7
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/streamcloud/build.gradle b/src/de/streamcloud/build.gradle
index 2f90f9e6..d46f4aba 100644
--- a/src/de/streamcloud/build.gradle
+++ b/src/de/streamcloud/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'StreamCloud'
     extClass = '.StreamCloud'
-    extVersionCode = 9
+    extVersionCode = 8
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/aniplay/build.gradle b/src/en/aniplay/build.gradle
index 3dd0fb2b..33076e1d 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 = 4
+    overrideVersionCode = 3
 }
 
 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 63efd01b..d8ba1518 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
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.multisrc.anilist.AniListAnimeHttpSource
-import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
 import eu.kanade.tachiyomi.util.parseAs
@@ -68,8 +67,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         }
     }
 
-    val baseHost: String get() = "${preferences.getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)}"
-
     /* ====================================== Episode List ====================================== */
 
     override fun episodeListRequest(anime: SAnime): Request {
@@ -82,7 +79,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         val headersWithAction =
             headers.newBuilder()
                 // next.js stuff I guess
-                .add("Next-Action", getHeaderValue(baseHost, NEXT_ACTION_EPISODE_LIST))
+                .add("Next-Action", HEADER_NEXT_ACTION_EPISODE_LIST_VALUE)
                 .build()
 
         return POST(url = "$baseUrl/anime/info/$animeId", headersWithAction, requestBody)
@@ -93,28 +90,8 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         val episodeListUrl = response.request.url
         val animeId = episodeListUrl.pathSegments[2]
 
-        val responsePage = client.newCall(GET("$baseUrl/anime/watch/$animeId")).execute()
-        val responsePageString = responsePage.body.string()
-        var idMal: Number? = null
-        val idMalIndex = responsePageString.indexOf("\\\"idMal\\\":")
-        if (idMalIndex != -1) {
-            val startIndex = idMalIndex + "\\\"idMal\\\":".length
-            val endIndex = responsePageString.indexOf(',', startIndex)
-            if (endIndex != -1) {
-                idMal = responsePageString.substring(startIndex, endIndex).toIntOrNull()
-            }
-        }
-        if (idMal == null) {
-            Log.e("AniPlay", "idMal not found - responsePageString: $responsePageString")
-            throw Exception("idMal not found")
-        }
-
         val responseString = response.body.string()
-        val episodesArrayString = extractEpisodeList(responseString)
-        if (episodesArrayString == null) {
-            Log.e("AniPlay", "Episode list not found - ${response.request}\nbody:${response.request.body}\n${responseString.substring(0,200)}")
-            throw Exception("Episode list not found")
-        }
+        val episodesArrayString = responseString.split("1:").last()
 
         val providers = episodesArrayString.parseAs<List<EpisodeListResponse>>()
         val episodes = mutableMapOf<Int, EpisodeListResponse.Episode>()
@@ -150,7 +127,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
                 .addQueryParameter("id", animeId)
                 .addQueryParameter("ep", episodeNumber.toString())
                 .addQueryParameter("extras", episodeExtraString)
-                .addQueryParameter("idMal", idMal.toString())
                 .build()
 
             val name = parseEpisodeName(episodeNumber.toString(), episode.title)
@@ -180,7 +156,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
     override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val episodeUrl = episode.url.toHttpUrl()
         val animeId = episodeUrl.queryParameter("id") ?: return emptyList()
-        val idMal = episodeUrl.queryParameter("idMal") ?: return emptyList()
+        // val episodeNum = episodeUrl.queryParameter("ep") ?: return emptyList()
         val extras = episodeUrl.queryParameter("extras")
             ?.let {
                 try {
@@ -194,7 +170,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
                 try {
                     json.decodeFromString<List<EpisodeExtra>>(it)
                 } catch (e: SerializationException) {
-                    Log.e("AniPlay", "Error parsing JSON extras", e)
+                    Log.e("AniPlay", "Error parsing JSON", e)
                     emptyList()
                 }
             }
@@ -203,7 +179,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         val headersWithAction =
             headers.newBuilder()
                 // next.js stuff I guess
-                .add("Next-Action", getHeaderValue(baseHost, NEXT_ACTION_SOURCES_LIST))
+                .add("Next-Action", HEADER_NEXT_ACTION_SOURCES_LIST_VALUE)
                 .build()
 
         val episodeDataList = extras.parallelFlatMapBlocking { extra ->
@@ -217,7 +193,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
                     extra.episodeNum.toString() // If it has a fractional part, leave it as a float
                 }
 
-                val requestBody = "[\"$animeId\",$idMal,\"${extra.source}\",\"${extra.episodeId}\",\"$epNum\",\"$language\"]"
+                val requestBody = "[\"$animeId\",\"${extra.source}\",\"${extra.episodeId}\",\"$epNum\",\"$language\"]"
                     .toRequestBody("application/json".toMediaType())
 
                 val params = mapOf(
@@ -229,6 +205,7 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
                 val builder = Uri.parse("$baseUrl/anime/watch").buildUpon()
                 params.map { (k, v) -> builder.appendQueryParameter(k, v); }
                 val url = builder.build().toString()
+                Log.i("AniPlay", "Url: $url")
                 try {
                     val request = POST(url, headersWithAction, requestBody)
                     val response = client.newCall(request).execute()
@@ -293,26 +270,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         )
     }
 
-    private fun extractEpisodeList(input: String): String? {
-        val startMarker = "1:["
-        val list1Index = input.indexOf(startMarker)
-        if (list1Index == -1) return null
-
-        val startIndex = list1Index + startMarker.length
-        var endIndex = startIndex
-        var bracketCount = 1
-
-        while (endIndex < input.length && bracketCount > 0) {
-            when (input[endIndex]) {
-                '[' -> bracketCount++
-                ']' -> bracketCount--
-            }
-            endIndex++
-        }
-
-        return if (bracketCount == 0) input.substring(startIndex - 1, endIndex) else null
-    }
-
     /* ====================================== Preferences ====================================== */
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
@@ -434,10 +391,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         } ?: 0L
     }
 
-    private fun getHeaderValue(serverHost: String, key: String): String {
-        return HEADER_NEXT_ACTION[serverHost]?.get(key) ?: throw Exception("Bad host/key")
-    }
-
     companion object {
         private const val PREF_DOMAIN_KEY = "domain"
         private val PREF_DOMAIN_ENTRIES = arrayOf("aniplaynow.live (default)", "aniplay.lol (backup)")
@@ -468,19 +421,8 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         private const val PREF_MARK_FILLER_EPISODE_DEFAULT = true
 
         // These values has probably something to do with Next.js server and hydration
-        private const val NEXT_ACTION_EPISODE_LIST = "NEXT_ACTION_EPISODE_LIST"
-        private const val NEXT_ACTION_SOURCES_LIST = "NEXT_ACTION_SOURCES_LIST"
-
-        private val HEADER_NEXT_ACTION = mapOf(
-            PREF_DOMAIN_ENTRY_VALUES[0] to mapOf(
-                "NEXT_ACTION_EPISODE_LIST" to "f3422af67c84852f5e63d50e1f51718f1c0225c4",
-                "NEXT_ACTION_SOURCES_LIST" to "5dbcd21c7c276c4d15f8de29d9ef27aef5ea4a5e",
-            ),
-            PREF_DOMAIN_ENTRY_VALUES[1] to mapOf(
-                "NEXT_ACTION_EPISODE_LIST" to "56e4151352ded056cbe226d2376c7436cffc9a37",
-                "NEXT_ACTION_SOURCES_LIST" to "8a76af451978c817dde2364326a5e4e45eb43db1",
-            ),
-        )
+        private const val HEADER_NEXT_ACTION_EPISODE_LIST_VALUE = "f3422af67c84852f5e63d50e1f51718f1c0225c4"
+        private const val HEADER_NEXT_ACTION_SOURCES_LIST_VALUE = "5dbcd21c7c276c4d15f8de29d9ef27aef5ea4a5e"
 
         private val DATE_FORMATTER = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
     }
diff --git a/src/en/asiaflix/build.gradle b/src/en/asiaflix/build.gradle
index 31268b5c..1df9ee31 100644
--- a/src/en/asiaflix/build.gradle
+++ b/src/en/asiaflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AsiaFlix'
     extClass = '.AsiaFlix'
-    extVersionCode = 12
+    extVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/asianload/build.gradle b/src/en/asianload/build.gradle
index a54ea4aa..22be6c78 100644
--- a/src/en/asianload/build.gradle
+++ b/src/en/asianload/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AsianLoad'
     extClass = '.AsianLoad'
-    extVersionCode = 41
+    extVersionCode = 40
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/multimovies/build.gradle b/src/en/multimovies/build.gradle
index 01c6cb9a..37ac7992 100644
--- a/src/en/multimovies/build.gradle
+++ b/src/en/multimovies/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Multimovies'
     themePkg = 'dooplay'
     baseUrl = 'https://multimovies.art'
-    overrideVersionCode = 19
+    overrideVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/myrunningman/build.gradle b/src/en/myrunningman/build.gradle
index 4c398408..ac71dc75 100644
--- a/src/en/myrunningman/build.gradle
+++ b/src/en/myrunningman/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'My Running Man'
     extClass = '.MyRunningMan'
-    extVersionCode = 6
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/pinoymoviepedia/build.gradle b/src/en/pinoymoviepedia/build.gradle
index 6f744ae2..05aa585f 100644
--- a/src/en/pinoymoviepedia/build.gradle
+++ b/src/en/pinoymoviepedia/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.PinoyMoviePedia'
     themePkg = 'dooplay'
     baseUrl = 'https://pinoymoviepedia.ru'
-    overrideVersionCode = 1
+    overrideVersionCode = 0
     isNsfw = true
 }
 
diff --git a/src/en/tokuzilla/build.gradle b/src/en/tokuzilla/build.gradle
index 8b31cbfe..4c7d82f8 100644
--- a/src/en/tokuzilla/build.gradle
+++ b/src/en/tokuzilla/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Tokuzilla'
     extClass = '.Tokuzilla'
-    extVersionCode = 20
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/zoro/build.gradle b/src/en/zoro/build.gradle
index 4608827d..b793a514 100644
--- a/src/en/zoro/build.gradle
+++ b/src/en/zoro/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.HiAnime'
     themePkg = 'zorotheme'
     baseUrl = 'https://hianime.to'
-    overrideVersionCode = 41
+    overrideVersionCode = 40
 }
 
 apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
index f08ec865..33da8c4d 100644
--- a/src/es/animefenix/build.gradle
+++ b/src/es/animefenix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Animefenix'
     extClass = '.Animefenix'
-    extVersionCode = 42
+    extVersionCode = 40
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt
index 65c9aa4e..eaab6fbf 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt
@@ -78,7 +78,7 @@ object AnimeFenixFilters {
 
     class SortFilter : QueryPartFilter("Orden", AnimeFenixFiltersData.SORT)
 
-    object AnimeFenixFiltersData {
+    private object AnimeFenixFiltersData {
         val YEARS = (1990..Calendar.getInstance().get(Calendar.YEAR)).map { Pair("$it", "$it") }.reversed().toTypedArray()
 
         val TYPES = arrayOf(
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
index 8bf7dfeb..4ccd7ea5 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
@@ -46,23 +46,6 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val preferences: SharedPreferences by lazy { Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) }
 
-    private object CSSQuery {
-        object AnimeList {
-            const val GRID = "main div.container div.grid"
-            const val ELEMENT = "a"
-            const val ELEMENT_URL = "a"
-            const val ELEMENT_TITLE = "div div h3"
-            const val ELEMENT_THUMBNAIL_URL = "img"
-            const val ELEMENT_STATUS = "div div span.bg-zinc-700"
-            const val NEXT = "a:has(span.sr-only:contains(Next))"
-        }
-
-        object EpisodeList {
-            const val EPISODE = "div.container div.bg-zinc-800 ul li"
-            const val NUMBER = "a span span"
-            const val URL = "a"
-        }
-    }
     companion object {
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_DEFAULT = "1080"
@@ -82,17 +65,14 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun popularAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
-
-        val grid = document.select(CSSQuery.AnimeList.GRID)[1]
-
-        val elements = grid.select(CSSQuery.AnimeList.ELEMENT)
-        val nextPage = document.select(CSSQuery.AnimeList.NEXT).any()
+        val elements = document.select("article.serie-card")
+        val nextPage = document.select("ul.pagination-list li a.pagination-link:contains(Siguiente)").any()
         val animeList = elements.map { element ->
             SAnime.create().apply {
-                setUrlWithoutDomain(element.select(CSSQuery.AnimeList.ELEMENT_URL).attr("abs:href"))
-                title = element.select(CSSQuery.AnimeList.ELEMENT_TITLE).text()
-                thumbnail_url = element.select(CSSQuery.AnimeList.ELEMENT_THUMBNAIL_URL).attr("abs:src")
-                status = parseStatus(element.select(CSSQuery.AnimeList.ELEMENT_STATUS).text())
+                setUrlWithoutDomain(element.select("figure.image a").attr("abs:href"))
+                title = element.select("div.title h3 a").text()
+                thumbnail_url = element.select("figure.image a img").attr("abs:src")
+                description = element.select("div.serie-card__information p").text()
             }
         }
         return AnimesPage(animeList, nextPage)
@@ -116,12 +96,12 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val document = response.asJsoup()
-        return document.select(CSSQuery.EpisodeList.EPISODE).map { it ->
-            val epNum = it.select(CSSQuery.EpisodeList.NUMBER).text().replace("Episodio", "")
+        return document.select("ul.anime-page__episode-list.is-size-6 li").map { it ->
+            val epNum = it.select("a span").text().replace("Episodio", "")
             SEpisode.create().apply {
                 episode_number = epNum.toFloat()
                 name = "Episodio $epNum"
-                setUrlWithoutDomain(it.select(CSSQuery.EpisodeList.URL).attr("abs:href"))
+                setUrlWithoutDomain(it.select("a").attr("abs:href"))
             }
         }
     }
@@ -130,9 +110,7 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
         val servers = document.selectFirst("script:containsData(var tabsArray)")!!.data()
-            .split("\n")
-            .filter { it.contains("tabsArray[") }
-            .map { it.split(" = ").last().trim().trim(';').trim('"') }
+            .split("tabsArray").map { it.substringAfter("src='").substringBefore("'").replace("amp;", "") }
             .filter { it.contains("https") }
 
         servers.forEach { server ->
@@ -238,13 +216,12 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
         ).reversed()
     }
 
-    override fun animeDetailsParse(response: Response) = SAnime.create().apply {
+    override fun animeDetailsParse(response: Response): SAnime {
         val document = response.asJsoup()
-        with(document.selectFirst("main > div.relative > div.container > div.flex")!!) {
-            title = selectFirst("h1.font-bold")!!.ownText()
-            genre = select("div:has(h2:containsOwn(Géneros)) > div.flex > a").joinToString { it.text() }
-            status = parseStatus(selectFirst("li:has(> span:containsOwn(Estado))")!!.ownText())
-            description = select("div:has(h2:containsOwn(Sinopsis)) > p").text()
+        return SAnime.create().apply {
+            title = document.select("h1.title.has-text-orange").text()
+            genre = document.select("a.button.is-small.is-orange.is-outlined.is-roundedX").joinToString { it.text() }
+            status = parseStatus(document.select("div.column.is-12-mobile.xis-3-tablet.xis-3-desktop.xhas-background-danger.is-narrow-tablet.is-narrow-desktop a").text())
         }
     }
 
diff --git a/src/es/animeonlineninja/build.gradle b/src/es/animeonlineninja/build.gradle
index 943ca76d..0d00888d 100644
--- a/src/es/animeonlineninja/build.gradle
+++ b/src/es/animeonlineninja/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AnimeOnlineNinja'
     themePkg = 'dooplay'
     baseUrl = 'https://ww3.animeonline.ninja'
-    overrideVersionCode = 41
+    overrideVersionCode = 39
 }
 
 apply from: "$rootDir/common.gradle"
@@ -14,7 +14,4 @@ dependencies {
     implementation(project(':lib:filemoon-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:uqload-extractor'))
-    implementation(project(':lib:vidhide-extractor'))
-    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib:mp4upload-extractor'))
 }
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinja.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinja.kt
index 0fc2d5c7..06758da5 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinja.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeOnlineNinja.kt
@@ -4,24 +4,20 @@ import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
-import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
-import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
-import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 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.api.get
 
 class AnimeOnlineNinja : DooPlay(
     "es",
@@ -95,7 +91,7 @@ class AnimeOnlineNinja : DooPlay(
         } else if (path.startsWith("/letra") || path.startsWith("/tendencias")) {
             val before = path.substringBeforeLast("/")
             val after = path.substringAfterLast("/")
-            GET("$baseUrl$before/page/$page/$after")
+            GET(baseUrl + before + "/page/$page/" + after)
         } else {
             GET("$baseUrl$path/page/$page")
         }
@@ -104,29 +100,11 @@ class AnimeOnlineNinja : DooPlay(
     // ============================== Episodes ==============================
     override val episodeMovieText = "Película"
 
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val doc = getRealAnimeDoc(response.asJsoup())
-        val seasonList = doc.select(seasonListSelector)
-        return if (seasonList.isEmpty()) {
-            listOf(
-                SEpisode.create().apply {
-                    setUrlWithoutDomain(doc.location())
-                    episode_number = 1F
-                    name = episodeMovieText
-                },
-            )
-        } else {
-            seasonList.reversed().flatMap { seasonElement ->
-                getSeasonEpisodes(seasonElement).reversed()
-            }
-        }
-    }
-
     // ============================ Video Links =============================
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val players = document.select("ul#playeroptionsul li")
-        return players.parallelCatchingFlatMapBlocking { player ->
+        return players.flatMap { player ->
             val name = player.selectFirst("span.title")!!.text()
             val url = getPlayerUrl(player)
             extractVideos(url, name)
@@ -138,41 +116,37 @@ class AnimeOnlineNinja : DooPlay(
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
     private val mixDropExtractor by lazy { MixDropExtractor(client) }
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
-    private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
-    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
 
     private fun extractVideos(url: String, lang: String): List<Video> {
-        try {
-            return when {
-                arrayOf("saidochesto.top").any(url) || "MULTISERVER" in lang.uppercase() -> extractFromMulti(url)
-                arrayOf("filemoon", "filemooon", "moon").any(url) -> filemoonExtractor.videosFromUrl(url, "$lang Filemoon:", headers)
-                arrayOf("doodstream", "dood.", "ds2play", "doods.").any(url) -> doodExtractor.videosFromUrl(url, "$lang DoodStream", false)
-                arrayOf("streamtape", "stp", "stape").any(url) -> streamTapeExtractor.videosFromUrl(url, "$lang StreamTape")
-                arrayOf("mixdrop").any(url) -> mixDropExtractor.videoFromUrl(url, prefix = "$lang ")
-                arrayOf("uqload").any(url) -> uqloadExtractor.videosFromUrl(url, prefix = lang)
-                "wolfstream" in url -> {
-                    client.newCall(GET(url, headers)).execute()
-                        .asJsoup()
-                        .selectFirst("script:containsData(sources)")
-                        ?.data()
-                        ?.let { jsData ->
-                            val videoUrl = jsData.substringAfter("{file:\"").substringBefore("\"")
-                            listOf(Video(videoUrl, "$lang WolfStream", videoUrl, headers = headers))
-                        }
-                }
-                arrayOf("mp4upload").any(url) -> mp4uploadExtractor.videosFromUrl(url, headers, prefix = "$lang ")
-                arrayOf("vidhide", "filelions.top", "vid.").any(url) -> vidHideExtractor.videosFromUrl(url) { "$lang VidHide:$it" }
-                arrayOf("wishembed", "streamwish", "strwish", "wish").any(url) -> streamWishExtractor.videosFromUrl(url, videoNameGen = { "$lang StreamWish:$it" })
-                else -> null
-            } ?: emptyList()
-        } catch (e: Exception) {
-            return emptyList()
-        }
+        return when {
+            "saidochesto.top" in url || "MULTISERVER" in lang.uppercase() ->
+                extractFromMulti(url)
+            "filemoon" in url ->
+                filemoonExtractor.videosFromUrl(url, "$lang Filemoon - ", headers)
+            "dood" in url ->
+                doodExtractor.videoFromUrl(url, "$lang DoodStream", false)
+                    ?.let(::listOf)
+            "streamtape" in url ->
+                streamTapeExtractor.videoFromUrl(url, "$lang StreamTape")
+                    ?.let(::listOf)
+            "mixdrop" in url ->
+                mixDropExtractor.videoFromUrl(url, lang)
+            "uqload" in url ->
+                uqloadExtractor.videosFromUrl(url)
+            "wolfstream" in url -> {
+                client.newCall(GET(url, headers)).execute()
+                    .asJsoup()
+                    .selectFirst("script:containsData(sources)")
+                    ?.data()
+                    ?.let { jsData ->
+                        val videoUrl = jsData.substringAfter("{file:\"").substringBefore("\"")
+                        listOf(Video(videoUrl, "$lang WolfStream", videoUrl, headers = headers))
+                    }
+            }
+            else -> null
+        } ?: emptyList<Video>()
     }
 
-    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
-
     private fun extractFromMulti(url: String): List<Video> {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val prefLang = preferences.getString(PREF_LANG_KEY, PREF_LANG_DEFAULT)!!
@@ -293,7 +267,6 @@ class AnimeOnlineNinja : DooPlay(
 
     override val prefQualityValues = arrayOf("480p", "720p", "1080p")
     override val prefQualityEntries = prefQualityValues
-    override val episodeNumberRegex by lazy { Regex("""(\d+(?:\.\d+)?)$""") }
 
     companion object {
         private const val PREF_LANG_KEY = "preferred_lang"
@@ -303,7 +276,7 @@ class AnimeOnlineNinja : DooPlay(
         private const val PREF_SERVER_DEFAULT = "Uqload"
         private val PREF_LANG_ENTRIES = arrayOf("SUB", "All", "ES", "LAT")
         private val PREF_LANG_VALUES = arrayOf("SUB", "", "ES", "LAT")
-        private val SERVER_LIST = arrayOf("Filemoon", "DoodStream", "StreamTape", "MixDrop", "Uqload", "WolfStream", "saidochesto.top", "VidHide", "StreamWish", "Mp4Upload")
+        private val SERVER_LIST = arrayOf("Filemoon", "DoodStream", "StreamTape", "MixDrop", "Uqload", "WolfStream", "saidochesto.top")
 
         private const val PREF_VRF_INTERCEPT_KEY = "vrf_intercept"
         private const val PREF_VRF_INTERCEPT_TITLE = "Intercept VRF links (Requiere Reiniciar)"
diff --git a/src/es/cinecalidad/build.gradle b/src/es/cinecalidad/build.gradle
index dba72455..611c2857 100644
--- a/src/es/cinecalidad/build.gradle
+++ b/src/es/cinecalidad/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'CineCalidad'
     extClass = '.CineCalidad'
-    extVersionCode = 3
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/cuevana/build.gradle b/src/es/cuevana/build.gradle
index 370bada2..c4836d6a 100644
--- a/src/es/cuevana/build.gradle
+++ b/src/es/cuevana/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Cuevana'
     extClass = '.CuevanaFactory'
-    extVersionCode = 34
+    extVersionCode = 33
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index d77acc4e..4da08891 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasflix'
     extClass = '.Doramasflix'
-    extVersionCode = 23
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index 32420fa1..f73ca3a5 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasyt'
     extClass = '.Doramasyt'
-    extVersionCode = 15
+    extVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index 6a774799..bd2f3829 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Jkanime'
     extClass = '.Jkanime'
-    extVersionCode = 25
+    extVersionCode = 24
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index a22dc4c4..a43225a7 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MonosChinos'
     extClass = '.MonosChinos'
-    extVersionCode = 29
+    extVersionCode = 28
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/pandrama/build.gradle b/src/es/pandrama/build.gradle
deleted file mode 100644
index 8d2ffc3a..00000000
--- a/src/es/pandrama/build.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-ext {
-    extName = 'Pandrama'
-    extClass = '.Pandrama'
-    extVersionCode = 1
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib:vk-extractor'))
-}
\ No newline at end of file
diff --git a/src/es/pandrama/res/mipmap-hdpi/ic_launcher.png b/src/es/pandrama/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 1ef342f6..00000000
Binary files a/src/es/pandrama/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/pandrama/res/mipmap-mdpi/ic_launcher.png b/src/es/pandrama/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index f3e861e6..00000000
Binary files a/src/es/pandrama/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/pandrama/res/mipmap-xhdpi/ic_launcher.png b/src/es/pandrama/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index b43507de..00000000
Binary files a/src/es/pandrama/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/pandrama/res/mipmap-xxhdpi/ic_launcher.png b/src/es/pandrama/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 5986e42b..00000000
Binary files a/src/es/pandrama/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/pandrama/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/pandrama/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 360e0814..00000000
Binary files a/src/es/pandrama/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/pandrama/src/eu/kanade/tachiyomi/animeextension/es/pandrama/Pandrama.kt b/src/es/pandrama/src/eu/kanade/tachiyomi/animeextension/es/pandrama/Pandrama.kt
deleted file mode 100644
index 0f4649da..00000000
--- a/src/es/pandrama/src/eu/kanade/tachiyomi/animeextension/es/pandrama/Pandrama.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.pandrama
-
-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.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.okruextractor.OkruExtractor
-import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import okhttp3.Request
-import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import java.net.URLDecoder
-
-class Pandrama : ConfigurableAnimeSource, AnimeHttpSource() {
-
-    override val name = "Pandrama"
-
-    override val baseUrl = "https://pandra.ma"
-
-    override val lang = "es"
-
-    override val supportsLatest = true
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    private val json: Json by injectLazy()
-
-    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 = "Vk"
-        private val SERVER_LIST = arrayOf("Vk", "Okru")
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val document = response.asJsoup()
-        val details = SAnime.create()
-
-        for (element in document.select(".hl-full-box ul li")) {
-            val title = element.select("em").text()
-            val content = element.select("span")
-
-            when {
-                title.contains("Director:") -> details.author = element.ownText().trim()
-                title.contains("Estado:") -> details.status = parseStatus(content.text())
-                title.contains("Protagonistas:") -> details.artist = element.selectFirst("a")?.text()
-                title.contains("Género:") -> details.genre = element.select("a").joinToString { it.text() }
-                title.contains("Sinopsis:") -> details.description = element.ownText().trim()
-            }
-        }
-
-        return details
-    }
-
-    private fun parseStatus(status: String?) = when (status.orEmpty()) {
-        "En Emisión" -> SAnime.ONGOING
-        "Finalizado" -> SAnime.COMPLETED
-        else -> SAnime.UNKNOWN
-    }
-
-    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/vodshow/Dramas--------$page---/", headers)
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val elements = document.select(".hl-vod-list li > a")
-        val nextPage = document.select(".hl-page-wrap a:not(.hl-disad) span:contains(siguiente)").any()
-        val animeList = elements.map { element ->
-            val langTag = element.select(".hl-pic-tag").text().trim()
-            val prefix = when {
-                langTag.contains("Español LAT") -> "\uD83C\uDDF2\uD83C\uDDFD "
-                langTag.contains("Español ES") -> "\uD83C\uDDEA\uD83C\uDDF8 "
-                else -> ""
-            }
-            SAnime.create().apply {
-                title = """$prefix ${element.attr("title")}""".trim()
-                thumbnail_url = element.attr("abs:data-original")
-                setUrlWithoutDomain(element.attr("abs:href"))
-            }
-        }
-        return AnimesPage(animeList, nextPage)
-    }
-
-    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
-
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/vodshow/Dramas--hits------$page---/", headers)
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val url = when {
-            query.isNotBlank() -> "$baseUrl/vodsearch/$query----------$page---/"
-            else -> "$baseUrl/vodshow/Dramas--------$page---/"
-        }
-        return GET(url, headers)
-    }
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        if (!document.location().contains("vodsearch")) return popularAnimeParse(response)
-        val elements = document.select(".hl-one-list .hl-item-thumb")
-        val nextPage = document.select(".hl-page-wrap a:not(.hl-disad) span:contains(siguiente)").any()
-        val animeList = elements.map { element ->
-            SAnime.create().apply {
-                title = element.attr("title")
-                thumbnail_url = element.attr("abs:data-original")
-                setUrlWithoutDomain(element.attr("abs:href"))
-            }
-        }
-        return AnimesPage(animeList, nextPage)
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.asJsoup()
-        return document.select(".hl-plays-list li > a").groupBy { it.text().trim() }.map {
-            val urlList = json.encodeToString(it.value.map { it.attr("abs:href") })
-            SEpisode.create().apply {
-                name = it.key
-                episode_number = it.key.substringAfter("Ep.").trim().toFloatOrNull() ?: 0F
-                url = urlList
-            }
-        }.reversed()
-    }
-
-    override suspend fun getVideoList(episode: SEpisode): List<Video> {
-        val serverData = json.decodeFromString<List<String>>(episode.url)
-        return serverData.parallelCatchingFlatMapBlocking {
-            val page = client.newCall(GET(it)).execute().asJsoup()
-            val jsonData = page.selectFirst("script:containsData(var player_aaaa)")
-                ?.data()?.substringAfter("var player_aaaa=")?.trim()
-                ?: return@parallelCatchingFlatMapBlocking emptyList()
-            val player = json.decodeFromString<PlayerDto>(jsonData)
-            val url = if (player.encrypt == 2) {
-                URLDecoder.decode(base64decode(player.url ?: ""), "UTF-8")
-            } else {
-                URLDecoder.decode(player.url ?: "", "UTF-8")
-            }
-            serverVideoResolver(url)
-        }
-    }
-
-    private val okruExtractor by lazy { OkruExtractor(client) }
-    private val vkExtractor by lazy { VkExtractor(client, headers) }
-
-    private fun serverVideoResolver(url: String): List<Video> {
-        val embedUrl = url.lowercase()
-        return when {
-            embedUrl.contains("ok.ru") || embedUrl.contains("okru") -> okruExtractor.videosFromUrl(url)
-            embedUrl.contains("vk.") -> vkExtractor.videosFromUrl(url)
-            else -> emptyList()
-        }
-    }
-
-    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()
-    }
-
-    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 = "%d"
-
-            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 = "%d"
-
-            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)
-    }
-
-    private val base64DecodeChars = intArrayOf(
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-        52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-        -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-        17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26,
-        27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-        43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
-    )
-
-    private fun base64decode(str: String): String {
-        var c1: Int
-        var c2: Int
-        var c3: Int
-        var c4: Int
-        var i = 0
-        val len = str.length
-        val out = StringBuilder()
-        while (i < len) {
-            do {
-                c1 = base64DecodeChars[str[i].toInt() and 255]
-                i++
-            } while (i < len && c1 == -1)
-            if (c1 == -1) break
-            do {
-                c2 = base64DecodeChars[str[i].toInt() and 255]
-                i++
-            } while (i < len && c2 == -1)
-            if (c2 == -1) break
-            out.append(((c1 shl 2) or ((c2 and 48) shr 4)).toChar())
-            do {
-                c3 = str[i].toInt() and 255
-                if (c3 == 61) return out.toString()
-                c3 = base64DecodeChars[c3]
-                i++
-            } while (i < len && c3 == -1)
-            if (c3 == -1) break
-            out.append((((c2 and 15) shl 4) or ((c3 and 60) shr 2)).toChar())
-            do {
-                c4 = str[i].toInt() and 255
-                if (c4 == 61) return out.toString()
-                c4 = base64DecodeChars[c4]
-                i++
-            } while (i < len && c4 == -1)
-            if (c4 == -1) break
-            out.append((((c3 and 3) shl 6) or c4).toChar())
-        }
-        return out.toString()
-    }
-
-    @Serializable
-    data class PlayerDto(
-        @SerialName("flag") var flag: String? = null,
-        @SerialName("encrypt") var encrypt: Int? = null,
-        @SerialName("trysee") var trysee: Int? = null,
-        @SerialName("points") var points: Int? = null,
-        @SerialName("link") var link: String? = null,
-        @SerialName("poster") var poster: String? = null,
-        @SerialName("doblado") var doblado: String? = null,
-        @SerialName("vod_en_py") var vodEnPy: String? = null,
-        @SerialName("link_next") var linkNext: String? = null,
-        @SerialName("link_pre") var linkPre: String? = null,
-        @SerialName("vod_data") var vodData: VodData? = VodData(),
-        @SerialName("url") var url: String? = null,
-        @SerialName("url_next") var urlNext: String? = null,
-        @SerialName("from") var from: String? = null,
-        @SerialName("server") var server: String? = null,
-        @SerialName("note") var note: String? = null,
-        @SerialName("id") var id: String? = null,
-        @SerialName("sid") var sid: Int? = null,
-        @SerialName("nid") var nid: Int? = null,
-    )
-
-    @Serializable
-    data class VodData(
-        @SerialName("vod_name") var vodName: String? = null,
-        @SerialName("vod_actor") var vodActor: String? = null,
-        @SerialName("vod_director") var vodDirector: String? = null,
-        @SerialName("vod_class") var vodClass: String? = null,
-    )
-}
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index edabfe2c..0c64293f 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Pelisplushd'
     extClass = '.PelisplushdFactory'
-    extVersionCode = 59
+    extVersionCode = 58
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/tioanimeh/build.gradle b/src/es/tioanimeh/build.gradle
index 3beefeae..77b5ae4a 100644
--- a/src/es/tioanimeh/build.gradle
+++ b/src/es/tioanimeh/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'TioanimeH'
     extClass = '.TioanimeHFactory'
-    extVersionCode = 20
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/tiodonghua/build.gradle b/src/es/tiodonghua/build.gradle
index 6e4ccf90..4a464672 100644
--- a/src/es/tiodonghua/build.gradle
+++ b/src/es/tiodonghua/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Tiodonghua'
     themePkg = 'animestream'
     baseUrl = 'https://anime.tiodonghua.com'
-    overrideVersionCode = 5
+    overrideVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/hi/animesaga/build.gradle b/src/hi/animesaga/build.gradle
index 084ccc7a..fbe05304 100644
--- a/src/hi/animesaga/build.gradle
+++ b/src/hi/animesaga/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AnimeSAGA'
     themePkg = 'dooplay'
     baseUrl = 'https://www.animesaga.in'
-    overrideVersionCode = 14
+    overrideVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/hi/yomovies/build.gradle b/src/hi/yomovies/build.gradle
index 92253063..43a419ab 100644
--- a/src/hi/yomovies/build.gradle
+++ b/src/hi/yomovies/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'YoMovies'
     extClass = '.YoMovies'
-    extVersionCode = 15
+    extVersionCode = 13
     isNsfw = true
 }
 
diff --git a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt
index b25dba40..236abdeb 100644
--- a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt
+++ b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt
@@ -15,6 +15,7 @@ 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 eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
@@ -144,12 +145,13 @@ class YoMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.asJsoup()
 
         val videoList = document.select("div[id*=tab]:has(div.movieplay > iframe)")
-            .flatMap { server ->
+            .parallelCatchingFlatMapBlocking { server ->
                 val iframe = server.selectFirst("div.movieplay > iframe")!!
                 val name = document.selectFirst("ul.idTabs > li:has(a[href=#${server.id()}]) div.les-title")
                     ?.text()
                     ?.let { "[$it] - " }
                     .orEmpty()
+
                 extractVideosFromIframe(iframe.attr("abs:src"), name)
             }
 
diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle
index b3f00d73..29043c33 100644
--- a/src/it/animeworld/build.gradle
+++ b/src/it/animeworld/build.gradle
@@ -1,15 +1,14 @@
 ext {
     extName = 'ANIMEWORLD.tv'
     extClass = '.ANIMEWORLD'
-    extVersionCode = 40
+    extVersionCode = 39
 }
 
 apply from: "$rootDir/common.gradle"
 
 dependencies {
+    implementation(project(':lib:filemoon-extractor'))
     implementation(project(':lib:streamtape-extractor'))
     implementation(project(':lib:dood-extractor'))
-    implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib:vidguard-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
\ No newline at end of file
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 f1f6fd92..6725ce77 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
@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.it.animeworld.extractors.StreamHideExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -12,9 +13,8 @@ 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.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
-import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.Serializable
@@ -102,12 +102,17 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         if (copyrightError.hasText()) throw Exception(copyrightError.text())
 
         val serverList = mutableListOf<Pair<String, String>>()
+
+        val elements = document.select(videoListSelector())
         val epId = document.selectFirst("div#player[data-episode-id]")?.attr("data-episode-id")
 
         val altServers = mutableListOf<Pair<String, String>>()
+        val altList = listOf("StreamHide", "FileMoon")
         document.select("div.servers > div.widget-title span.server-tab").forEach {
             val name = it.text()
-            altServers.add(Pair(name, it.attr("data-name")))
+            if (altList.any { t -> t.contains(name, true) }) {
+                altServers.add(Pair(name, it.attr("data-name")))
+            }
         }
 
         altServers.forEach { serverPair ->
@@ -123,16 +128,21 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     .build()
                 val target = json.decodeFromString<ServerResponse>(
                     client.newCall(GET(apiUrl, headers = apiHeaders)).execute().body.string(),
-                ).grabber
+                ).target
                 serverList.add(Pair(serverPair.first, target))
             }
         }
 
+        for (element in elements) {
+            val url = element.attr("href")
+            val name = element.text().substringAfter("ownload ").substringBefore(" ")
+            serverList.add(Pair(name, url))
+        }
+
         val videoList = serverList.flatMap { server ->
             val url = server.second
-            val url2 = server.first
             when {
-                url2.contains("AnimeWorld Server") -> {
+                url.contains("streamingaw") -> {
                     listOf(Video(url, "AnimeWorld Server", url))
                 }
                 url.contains("https://doo") -> {
@@ -143,14 +153,14 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     StreamTapeExtractor(client).videoFromUrl(url.replace("/v/", "/e/"))
                         ?.let(::listOf)
                 }
-                url.contains("streamhide") -> {
-                    StreamHideVidExtractor(client).videosFromUrl(url)
+                url.contains("filemoon") -> {
+                    FilemoonExtractor(client).videosFromUrl(url, prefix = "${server.first} - ", headers = headers)
                 }
-                url.contains("vidguard") or url.contains("listeamed") -> {
-                    VidGuardExtractor(client).videosFromUrl(url)
+                server.first.contains("streamhide", true) -> {
+                    StreamHideExtractor(client).videosFromUrl(url, headers)
                 }
                 else -> null
-            } ?: emptyList()
+            }.orEmpty()
         }
 
         return videoList
@@ -508,8 +518,8 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         ListPreference(screen.context).apply {
             key = "preferred_server"
             title = "Preferred server"
-            entries = arrayOf("Animeworld server", "StreamHide", "Doodstream", "StreamTape", "VidGuard", "Listeamed")
-            entryValues = arrayOf("Animeworld server", "StreamHide", "Doodstream", "StreamTape", "VidGuard", "Listeamed")
+            entries = arrayOf("Animeworld server", "FileMoon", "StreamHide", "Doodstream", "StreamTape")
+            entryValues = arrayOf("Animeworld server", "FileMoon", "StreamHide", "Doodstream", "StreamTape")
             setDefaultValue("Animeworld server")
             summary = "%s"
 
@@ -527,6 +537,5 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     @Serializable
     data class ServerResponse(
         val target: String,
-        val grabber: String,
     )
 }
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamHideExtractor.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamHideExtractor.kt
new file mode 100644
index 00000000..bc04d2ae
--- /dev/null
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamHideExtractor.kt
@@ -0,0 +1,52 @@
+package eu.kanade.tachiyomi.animeextension.it.animeworld.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.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+
+class StreamHideExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, headers: Headers): List<Video> {
+        val videoList = mutableListOf<Video>()
+
+        val url = OkHttpClient().newBuilder().followRedirects(false).build()
+            .newCall(GET(url, headers)).execute().request.url.toString()
+
+        val packed = client.newCall(GET(url)).execute()
+            .asJsoup().selectFirst("script:containsData(eval)")?.data() ?: return emptyList()
+        val unpacked = JsUnpacker.unpackAndCombine(packed) ?: return emptyList()
+        val masterUrl = Regex("""file: ?"(.*?)"""").find(unpacked)?.groupValues?.get(1) ?: return emptyList()
+
+        val masterHeaders = headers.newBuilder()
+            .add("Accept", "*/*")
+            .add("Host", masterUrl.toHttpUrl().host)
+            .add("Origin", "https://${url.toHttpUrl().host}")
+            .add("Referer", "https://${url.toHttpUrl().host}/")
+            .build()
+        val masterPlaylist = client.newCall(
+            GET(masterUrl, headers = masterHeaders),
+        ).execute().body.string()
+
+        val masterBase = "https://${masterUrl.toHttpUrl().host}${masterUrl.toHttpUrl().encodedPath}"
+            .substringBeforeLast("/") + "/"
+
+        masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:")
+            .forEach {
+                val quality = "StreamHide - " + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p "
+                val videoUrl = masterBase + it.substringAfter("\n").substringBefore("\n")
+
+                val videoHeaders = headers.newBuilder()
+                    .add("Accept", "*/*")
+                    .add("Host", videoUrl.toHttpUrl().host)
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                    .build()
+
+                videoList.add(Video(videoUrl, quality, videoUrl, headers = videoHeaders))
+            }
+        return videoList
+    }
+}
diff --git a/src/pt/animesgratis/build.gradle b/src/pt/animesgratis/build.gradle
index 98fe94e7..4c0078ae 100644
--- a/src/pt/animesgratis/build.gradle
+++ b/src/pt/animesgratis/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Bakashi'
     themePkg = 'dooplay'
     baseUrl = 'https://bakashi.tv'
-    overrideVersionCode = 13
+    overrideVersionCode = 12
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anitube/build.gradle b/src/pt/anitube/build.gradle
index 519039b0..a468f926 100644
--- a/src/pt/anitube/build.gradle
+++ b/src/pt/anitube/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anitube'
     extClass = '.Anitube'
-    extVersionCode = 20
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt
index 4f5f8ae6..9d5e4d02 100644
--- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt
+++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import androidx.preference.SwitchPreferenceCompat
 import eu.kanade.tachiyomi.animeextension.pt.anitube.extractors.AnitubeDownloadExtractor
 import eu.kanade.tachiyomi.animeextension.pt.anitube.extractors.AnitubeExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -200,10 +199,8 @@ class Anitube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         val links = mutableListOf(document.location())
 
-        if (preferences.getBoolean(PREF_FILE4GO_KEY, PREF_FILE4GO_DEFAULT)!!) {
-            document.selectFirst("div.abaItemDown > a")?.attr("href")?.let {
-                links.add(it)
-            }
+        document.selectFirst("div.abaItemDown > a")?.attr("href")?.let {
+            links.add(it)
         }
 
         val epName = document.selectFirst("meta[itemprop=name]")!!.attr("content")
@@ -238,16 +235,6 @@ class Anitube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
         }.also(screen::addPreference)
 
-        SwitchPreferenceCompat(screen.context).apply {
-            key = PREF_FILE4GO_KEY
-            title = "Usar File4Go como mirror"
-            setDefaultValue(PREF_FILE4GO_DEFAULT)
-            summary = PREF_FILE4GO_SUMMARY
-            setOnPreferenceChangeListener { _, newValue ->
-                preferences.edit().putBoolean(key, newValue as Boolean).commit()
-            }
-        }.also(screen::addPreference)
-
         // Auth Code
         EditTextPreference(screen.context).apply {
             key = PREF_AUTHCODE_KEY
@@ -321,9 +308,6 @@ class Anitube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         private const val PREF_AUTHCODE_KEY = "authcode"
         private const val PREF_AUTHCODE_SUMMARY = "Código de Autenticação"
         private const val PREF_AUTHCODE_DEFAULT = ""
-        private const val PREF_FILE4GO_KEY = "file4go"
-        private const val PREF_FILE4GO_SUMMARY = "Usar File4Go como mirror"
-        private const val PREF_FILE4GO_DEFAULT = false
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_TITLE = "Qualidade preferida"
         private const val PREF_QUALITY_DEFAULT = "HD"
diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeDownloadExtractor.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeDownloadExtractor.kt
index a5e864ce..2d0bb1d6 100644
--- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeDownloadExtractor.kt
+++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeDownloadExtractor.kt
@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.util.asJsoup
 import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 
 class AnitubeDownloadExtractor(
@@ -21,33 +20,23 @@ class AnitubeDownloadExtractor(
 
     private fun videosFromFile4Go(url: String, quality: String): Video? {
         Log.d(tag, "Checking download for $url")
+        val docDownload = client.newCall(GET(url)).execute().asJsoup()
 
-        val newHeaders = headers.newBuilder()
-            .set("Referer", "https://${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()
+        val form =
+            docDownload.selectFirst("button.download")?.closest("form")
 
-        val id = url.split('/').last()
-        val idusuario =
-            client.newCall(GET("$ADS_URL/file4go.php", headers = newHeaders))
-                .execute()
-                .body.string()
-                .substringAfter("\"publicidade\"")
-                .substringAfter('"')
-                .substringBefore('"')
+        if (form == null) {
+            Log.d(tag, "Download form not found for $url")
+            return null
+        }
 
         val body = FormBody.Builder().apply {
-            add("id", id)
-            add("idusuario", idusuario)
+            form.select("input[name]").forEach {
+                add(it.attr("name"), it.attr("value"))
+            }
         }.build()
 
-        val postUrl = "https://www.file4go.net/getdownload_new_anitube.php"
+        val postUrl = form.attr("action")
 
         val postHeaders = headers.newBuilder()
             .set("Referer", url)
@@ -106,8 +95,4 @@ class AnitubeDownloadExtractor(
 
         return videosFromDownloadPage(url, epName)
     }
-
-    companion object {
-        private const val ADS_URL = "https://ads.anitube.vip"
-    }
 }
diff --git a/src/pt/flixei/build.gradle b/src/pt/flixei/build.gradle
index efc6facf..1370ae7f 100644
--- a/src/pt/flixei/build.gradle
+++ b/src/pt/flixei/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Flixei'
     extClass = '.Flixei'
-    extVersionCode = 8
+    extVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/megaflix/build.gradle b/src/pt/megaflix/build.gradle
index ff685850..43d7554a 100644
--- a/src/pt/megaflix/build.gradle
+++ b/src/pt/megaflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Megaflix'
     extClass = '.Megaflix'
-    extVersionCode = 20
+    extVersionCode = 18
     isNsfw = true
 }
 
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
index e64a0785..edb032cb 100644
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
+++ b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.pt.megaflix
 
 import android.app.Application
+import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.pt.megaflix.extractors.MegaflixExtractor
@@ -13,7 +14,6 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
-import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
@@ -35,7 +35,7 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "Megaflix"
 
-    override val baseUrl = "https://megaflix.ac"
+    override val baseUrl = "https://megaflix.co"
 
     override val lang = "pt-BR"
 
@@ -73,11 +73,7 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "div.nav-links > a:containsOwn(PRÓXIMO)"
 
     // =============================== Search ===============================
-    override suspend fun getSearchAnime(
-        page: Int,
-        query: String,
-        filters: AnimeFilterList,
-    ): AnimesPage {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path"))
@@ -139,7 +135,6 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     episode_number = 1F
                 },
             )
-
             else -> seasons.parallelFlatMapBlocking(::episodesFromSeason).reversed()
         }
     }
@@ -168,14 +163,12 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .parallelCatchingFlatMapBlocking { element ->
                 val language = element.text().substringAfter("-")
                 val id = element.attr("href")
-                val url = element.closest("body")?.selectFirst("div$id iframe")
-                    ?.let {
-                        val iframeUrl = it.attr("src")
-                        client.newCall(GET(iframeUrl, headers))
-                            .execute()
-                            .asJsoup()
-                            .selectFirst("iframe")
-                            ?.attr("src")
+                val url = element.parents().get(5)?.selectFirst("div$id a")
+                    ?.run {
+                        attr("href")
+                            .substringAfter("token=")
+                            .let { String(Base64.decode(it, Base64.DEFAULT)) }
+                            .substringAfter("||")
                     } ?: return@parallelCatchingFlatMapBlocking emptyList()
 
                 getVideoList(url, language)
@@ -183,9 +176,6 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     /*--------------------------------Video extractors------------------------------------*/
-    private val webViewResolver by lazy { WebViewResolver() }
-    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
-
     private val mixdropExtractor by lazy { MixDropExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
     private val megaflixExtractor by lazy { MegaflixExtractor(client, headers) }
@@ -203,17 +193,6 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             arrayOf("filemoon", "moonplayer").any(url) -> filemoonExtractor.videosFromUrl(url, prefix = "$language Filemoon:")
             arrayOf("vidhide", "vid.").any(url) -> vidHideExtractor.videosFromUrl(url, videoNameGen = { "$language VidHide:$it" })
             arrayOf("wishembed", "streamwish", "strwish", "wish", "jwplayerhls").any(url) -> streamWishExtractor.videosFromUrl(url, videoNameGen = { "$language StreamWish:$it" })
-            arrayOf("fembedder").any(url) -> {
-                val webViewResult = webViewResolver.getUrl(url, headers)
-                if (webViewResult.isBlank()) {
-                    return emptyList()
-                }
-                return if (webViewResult.contains("m3u8")) {
-                    playlistUtils.extractFromHls(webViewResult)
-                } else {
-                    listOf(Video(url, "Default", url))
-                }
-            }
             else -> emptyList()
         }
     }
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/MegaflixUrlActivity.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/MegaflixUrlActivity.kt
index cec9a93d..f3f5edff 100644
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/MegaflixUrlActivity.kt
+++ b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/MegaflixUrlActivity.kt
@@ -8,7 +8,7 @@ import android.util.Log
 import kotlin.system.exitProcess
 
 /**
- * Springboard that accepts https://megaflix.ac/<type>/<item> intents
+ * Springboard that accepts https://megaflix.co/<type>/<item> intents
  * and redirects them to the main Aniyomi process.
  */
 class MegaflixUrlActivity : Activity() {
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/WebViewResolver.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/WebViewResolver.kt
deleted file mode 100644
index a1c377b0..00000000
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/WebViewResolver.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.megaflix
-
-import android.annotation.SuppressLint
-import android.app.Application
-import android.os.Handler
-import android.os.Looper
-import android.webkit.WebResourceRequest
-import android.webkit.WebResourceResponse
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import okhttp3.Headers
-import uy.kohesive.injekt.injectLazy
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-class WebViewResolver() {
-    private val context: Application by injectLazy()
-    private val handler by lazy { Handler(Looper.getMainLooper()) }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    fun getUrl(origRequestUrl: String, origRequestheader: Headers): String {
-        val latch = CountDownLatch(1)
-        var webView: WebView? = null
-        var resultUrl = ""
-        val headers = origRequestheader.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
-
-        handler.post {
-            val webview = WebView(context)
-            webView = webview
-            with(webview.settings) {
-                javaScriptEnabled = true
-                domStorageEnabled = true
-                databaseEnabled = true
-                useWideViewPort = false
-                loadWithOverviewMode = false
-                userAgentString = origRequestheader["User-Agent"]
-            }
-            webview.webViewClient = object : WebViewClient() {
-                override fun shouldInterceptRequest(
-                    view: WebView,
-                    request: WebResourceRequest,
-                ): WebResourceResponse? {
-                    val url = request.url.toString()
-                    if (VIDEO_REGEX.containsMatchIn(url)) {
-                        resultUrl = url
-                        latch.countDown()
-                    }
-                    return super.shouldInterceptRequest(view, request)
-                }
-            }
-
-            webView?.loadUrl(origRequestUrl, headers)
-        }
-
-        latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
-
-        handler.post {
-            webView?.stopLoading()
-            webView?.destroy()
-            webView = null
-        }
-        return resultUrl
-    }
-
-    companion object {
-        const val TIMEOUT_SEC: Long = 20
-        private val VIDEO_REGEX by lazy { Regex("\\.(mp4|m3u8)") }
-    }
-}
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractors/MegaflixExtractor.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractors/MegaflixExtractor.kt
index 849511d8..a7a4e96e 100644
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractors/MegaflixExtractor.kt
+++ b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractors/MegaflixExtractor.kt
@@ -21,7 +21,7 @@ class MegaflixExtractor(private val client: OkHttpClient, private val headers: H
 
         return playlistUtils.extractFromHls(
             playlistUrl,
-            "https://megaflix.ac",
+            "https://megaflix.co",
             videoNameGen = { "Megaflix($lang) - $it" },
         )
     }
diff --git a/src/pt/pobreflix/build.gradle b/src/pt/pobreflix/build.gradle
index dc3a63cd..ec1d8eb7 100644
--- a/src/pt/pobreflix/build.gradle
+++ b/src/pt/pobreflix/build.gradle
@@ -2,8 +2,8 @@ ext {
     extName = 'Pobreflix'
     extClass = '.Pobreflix'
     themePkg = 'dooplay'
-    baseUrl = 'https://pobreflix.global'
-    overrideVersionCode = 13
+    baseUrl = 'https://pobreflix1.art'
+    overrideVersionCode = 10
     isNsfw = true
 }
 
@@ -11,7 +11,6 @@ apply from: "$rootDir/common.gradle"
 
 dependencies {
     implementation(project(":lib:filemoon-extractor"))
-    implementation(project(":lib:fireplayer-extractor"))
     implementation(project(":lib:streamwish-extractor"))
     implementation(project(":lib:streamtape-extractor"))
     implementation(project(":lib:playlist-utils"))
diff --git a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt
index c1159018..30783608 100644
--- a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt
+++ b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt
@@ -1,25 +1,23 @@
 package eu.kanade.tachiyomi.animeextension.pt.pobreflix
 
 import android.util.Base64
+import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.FireplayerExtractor
 import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.MyStreamExtractor
-import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.PlayerFlixExtractor
 import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.SuperFlixExtractor
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
-import eu.kanade.tachiyomi.lib.fireplayerextractor.FireplayerExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Response
 
 class Pobreflix : DooPlay(
     "pt-BR",
     "Pobreflix",
-    "https://pobreflix.global",
+    "https://pobreflix1.art",
 ) {
     // ============================== Popular ===============================
     override fun popularAnimeSelector() = "div.featured div.poster"
@@ -28,52 +26,53 @@ class Pobreflix : DooPlay(
     override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/series/page/$page/", headers)
 
     // ============================ Video Links =============================
-    private val fireplayerExtractor by lazy { FireplayerExtractor(client) }
+    private val embedplayerExtractor by lazy { FireplayerExtractor(client) }
+    private val brbeastExtractor by lazy { FireplayerExtractor(client, "https://brbeast.com") }
+    private val superembedsExtractor by lazy { FireplayerExtractor(client, "https://superembeds.com/") }
     private val filemoonExtractor by lazy { FilemoonExtractor(client) }
     private val mystreamExtractor by lazy { MyStreamExtractor(client, headers) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
     private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val playerflixExtractor by lazy { PlayerFlixExtractor(client, headers, ::genericExtractor) }
     private val superflixExtractor by lazy { SuperFlixExtractor(client, headers, ::genericExtractor) }
     private val supercdnExtractor by lazy { SuperFlixExtractor(client, headers, ::genericExtractor, "https://supercdn.org") }
 
     override fun videoListParse(response: Response): List<Video> {
         val doc = response.asJsoup()
-        return doc.select("div.source-box > a").parallelCatchingFlatMapBlocking {
-            val data = it.attr("href").trim().toHttpUrl().queryParameter("auth")
-                ?.let { Base64.decode(it, Base64.DEFAULT) }
-                ?.let(::String)
-                ?: return@parallelCatchingFlatMapBlocking emptyList()
-            val url = data.replace("\\", "").substringAfter("url\":\"").substringBefore('"')
-            genericExtractor(url)
+        return doc.select("div.source-box > a").flatMap {
+            runCatching {
+                val data = it.attr("href").toHttpUrl().queryParameter("auth")
+                    ?.let { Base64.decode(it, Base64.DEFAULT) }
+                    ?.let(::String)
+                    ?: return@flatMap emptyList()
+                val url = data.replace("\\", "").substringAfter("url\":\"").substringBefore('"')
+                genericExtractor(url)
+            }.getOrElse { emptyList() }
         }
     }
 
     private fun genericExtractor(url: String, language: String = ""): List<Video> {
-        val langSubstr = if (language.isBlank()) "" else "[$language] "
+        val langSubstr = "[$language]"
         return when {
             url.contains("superflix") ->
                 superflixExtractor.videosFromUrl(url)
             url.contains("supercdn") ->
                 supercdnExtractor.videosFromUrl(url)
             url.contains("filemoon") ->
-                filemoonExtractor.videosFromUrl(url, "${langSubstr}Filemoon - ", headers = headers)
+                filemoonExtractor.videosFromUrl(url, "$langSubstr Filemoon - ", headers = headers)
             url.contains("watch.brplayer") || url.contains("/watch?v=") ->
                 mystreamExtractor.videosFromUrl(url, language)
             url.contains("brbeast") ->
-                fireplayerExtractor.videosFromUrl(url = url, videoNameGen = { "${langSubstr}BrBeast - $it" })
+                brbeastExtractor.videosFromUrl(url, language)
             url.contains("embedplayer") ->
-                fireplayerExtractor.videosFromUrl(url = url, videoNameGen = { "${langSubstr}EmbedPlayer - $it" })
+                embedplayerExtractor.videosFromUrl(url, language)
             url.contains("superembeds") ->
-                fireplayerExtractor.videosFromUrl(url = url, videoNameGen = { "${langSubstr}SuperEmbeds - $it" })
+                superembedsExtractor.videosFromUrl(url, language)
             url.contains("streamtape") ->
-                streamtapeExtractor.videosFromUrl(url, "${langSubstr}Streamtape")
+                streamtapeExtractor.videosFromUrl(url, "$langSubstr Streamtape")
             url.contains("filelions") ->
-                streamwishExtractor.videosFromUrl(url, videoNameGen = { "${langSubstr}FileLions - $it" })
+                streamwishExtractor.videosFromUrl(url, videoNameGen = { "$langSubstr FileLions - $it" })
             url.contains("streamwish") ->
-                streamwishExtractor.videosFromUrl(url, videoNameGen = { "${langSubstr}Streamwish - $it" })
-            url.contains("playerflix") ->
-                playerflixExtractor.videosFromUrl(url)
+                streamwishExtractor.videosFromUrl(url, videoNameGen = { "$langSubstr Streamwish - $it" })
             else -> emptyList()
         }
     }
diff --git a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/FireplayerExtractor.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/FireplayerExtractor.kt
new file mode 100644
index 00000000..98cf0104
--- /dev/null
+++ b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/FireplayerExtractor.kt
@@ -0,0 +1,56 @@
+package eu.kanade.tachiyomi.animeextension.pt.pobreflix.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.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class FireplayerExtractor(private val client: OkHttpClient, private val host: String = "https://embedplayer.online") {
+    private val headers by lazy {
+        Headers.headersOf(
+            "X-Requested-With",
+            "XMLHttpRequest",
+            "Referer",
+            host,
+            "Origin",
+            host,
+        )
+    }
+
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    fun videosFromUrl(url: String, lang: String): List<Video> {
+        var id = url.substringAfterLast("/")
+
+        if (id.length < 32) {
+            val doc = client.newCall(GET(url, headers)).execute().asJsoup()
+
+            val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
+                ?.let(JsUnpacker::unpackAndCombine)
+                ?: doc.selectFirst("script:containsData(FirePlayer)")?.data()
+
+            if (script?.contains("FirePlayer(") == true) {
+                id = script.substringAfter("FirePlayer(\"").substringBefore('"')
+            }
+        }
+
+        val postUrl = "$host/player/index.php?data=$id&do=getVideo"
+        val body = FormBody.Builder()
+            .add("hash", id)
+            .add("r", "")
+            .build()
+
+        val masterUrl = client.newCall(POST(postUrl, headers, body = body)).execute()
+            .body.string()
+            .substringAfter("securedLink\":\"")
+            .substringBefore('"')
+            .replace("\\", "")
+
+        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "[$lang] EmbedPlayer - $it" })
+    }
+}
diff --git a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/PlayerFlixExtractor.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/PlayerFlixExtractor.kt
deleted file mode 100644
index 0dab9340..00000000
--- a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/PlayerFlixExtractor.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class PlayerFlixExtractor(
-    private val client: OkHttpClient,
-    private val defaultHeaders: Headers,
-    private val genericExtractor: (String, String) -> List<Video>,
-) {
-    fun videosFromUrl(url: String): List<Video> {
-        val doc = client.newCall(GET(url, defaultHeaders)).execute().asJsoup()
-
-        val items = doc.select("#hostList div.buttonLoadHost").mapNotNull {
-            val url = it.attr("onclick")
-                .substringAfter('"', "")
-                .substringBefore('"')
-                ?: return@mapNotNull null
-
-            val language = if (it.hasClass("hostDub")) {
-                "Dublado"
-            } else {
-                "Legendado"
-            }
-
-            language to url // (Language, videoId)
-        }
-
-        return items.parallelCatchingFlatMapBlocking { genericExtractor(it.second, it.first) }
-    }
-}
diff --git a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/SuperFlixExtractor.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/SuperFlixExtractor.kt
index 92a2dcbe..70d588bb 100644
--- a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/SuperFlixExtractor.kt
+++ b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/extractors/SuperFlixExtractor.kt
@@ -18,7 +18,7 @@ class SuperFlixExtractor(
     private val client: OkHttpClient,
     private val defaultHeaders: Headers,
     private val genericExtractor: (String, String) -> List<Video>,
-    private val host: String = "https://superflixapi.dev",
+    private val host: String = "https://superflixapi.top",
 ) {
     private val json: Json by injectLazy()
 
diff --git a/src/pt/rinecloud/build.gradle b/src/pt/rinecloud/build.gradle
index ceed6d7d..3d177f49 100644
--- a/src/pt/rinecloud/build.gradle
+++ b/src/pt/rinecloud/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.RineCloud'
     themePkg = 'animestream'
     baseUrl = 'https://rine.cloud'
-    overrideVersionCode = 10
+    overrideVersionCode = 9
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/extractors/RineCloudExtractor.kt b/src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/extractors/RineCloudExtractor.kt
index a5c313e7..ced8df4e 100644
--- a/src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/extractors/RineCloudExtractor.kt
+++ b/src/pt/rinecloud/src/eu/kanade/tachiyomi/animeextension/pt/rinecloud/extractors/RineCloudExtractor.kt
@@ -29,19 +29,21 @@ class RineCloudExtractor(private val client: OkHttpClient, private val headers:
                 ?: return emptyList()
         }
 
-        return script.substringAfter("sources:").substringBefore("]")
-            .split("{")
-            .drop(1)
-            .flatMap {
-                val videoUrl = it.substringAfter("\"file\"").substringAfter('"').substringBefore('"')
-                val quality = it.substringAfter("\"label\"").substringAfter('"').substringBefore('"').ifBlank { "Unknown" }
-
-                when {
-                    arrayOf("googlevideo", ".mp4").any(videoUrl) -> listOf(Video(videoUrl, "Rinecloud - $quality", videoUrl, headers))
-                    else -> playlistUtils.extractFromHls(videoUrl, videoNameGen = { "Rinecloud - ${if (it == "Video") quality else it}" })
+        return if ("googlevideo" in script) {
+            script.substringAfter("sources:").substringBefore("]")
+                .split("{")
+                .drop(1)
+                .map {
+                    val videoUrl = it.substringAfter("file\":\"").substringBefore('"')
+                    val quality = it.substringAfter("label\":\"").substringBefore('"')
+                    Video(videoUrl, "Rinecloud - $quality", videoUrl, headers)
                 }
-            }
-    }
+        } else {
+            val masterPlaylistUrl = script.substringAfter("sources:")
+                .substringAfter("file\":\"")
+                .substringBefore('"')
 
-    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
+            playlistUtils.extractFromHls(masterPlaylistUrl, videoNameGen = { "Rinecloud - $it" })
+        }
+    }
 }
diff --git a/src/pt/vizer/build.gradle b/src/pt/vizer/build.gradle
index 48d8f03c..937aaa17 100644
--- a/src/pt/vizer/build.gradle
+++ b/src/pt/vizer/build.gradle
@@ -1,16 +1,13 @@
 ext {
     extName = 'Vizer.tv'
     extClass = '.Vizer'
-    extVersionCode = 20
+    extVersionCode = 16
     isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib:fireplayer-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
-    implementation(project(':lib:playlist-utils'))
     implementation(project(':lib:streamtape-extractor'))
-    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
index 6491bd8a..fc2ef35b 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.SearchItemDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.SearchResultDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.VideoDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.VideoListDto
-import eu.kanade.tachiyomi.animeextension.pt.vizer.interceptor.WebViewResolver
+import eu.kanade.tachiyomi.animeextension.pt.vizer.extractors.WarezExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -18,7 +18,6 @@ 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.fireplayerextractor.FireplayerExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -42,7 +41,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val name = "Vizer.tv"
 
-    override val baseUrl = "https://novizer.com"
+    override val baseUrl = "https://vizertv.in"
     private val apiUrl = "$baseUrl/includes/ajax"
 
     override val lang = "pt-BR"
@@ -59,8 +58,6 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    private val webViewResolver by lazy { WebViewResolver(headers) }
-
     // ============================== Popular ===============================
     override fun popularAnimeRequest(page: Int): Request {
         val pageType = preferences.getString(PREF_POPULAR_PAGE_KEY, PREF_POPULAR_PAGE_DEFAULT)!!
@@ -179,7 +176,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         val response = episodesClient.newCall(apiRequest("getEpisodes=$id")).execute()
         val episodes = response.parseAs<EpisodeListDto>().episodes
             .values
-            .filter { it.released === true }
+            .filter { it.released }
             .map {
                 SEpisode.create().apply {
                     name = "$sname: Ep ${it.name}".run {
@@ -246,7 +243,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val mixdropExtractor by lazy { MixDropExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
-    private val fireplayerExtractor by lazy { FireplayerExtractor(client) }
+    private val warezExtractor by lazy { WarezExtractor(client, headers) }
 
     private fun getVideosFromObject(videoObj: VideoDto): List<Video> {
         val hosters = videoObj.hosters ?: return emptyList()
@@ -254,16 +251,12 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         val langPrefix = if (videoObj.lang == "1") "LEG" else "DUB"
 
         return hosters.iterator().flatMap { (name, status) ->
-            // Always try the warezcdn
-            if (status != 3 && name != "warezcdn") return@flatMap emptyList()
+            if (status != 3) return@flatMap emptyList()
             val url = getPlayerUrl(videoObj.id, name)
-            if (url.isNullOrBlank()) {
-                return emptyList()
-            }
             when (name) {
                 "mixdrop" -> mixdropExtractor.videosFromUrl(url, langPrefix)
                 "streamtape" -> streamtapeExtractor.videosFromUrl(url, "StreamTape($langPrefix)")
-                "warezcdn" -> fireplayerExtractor.videosFromUrl(url, videoNameGen = { "WarezCDN($langPrefix) - $it" })
+                "warezcdn" -> warezExtractor.videosFromUrl(url, langPrefix)
                 else -> emptyList()
             }
         }
@@ -302,8 +295,17 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
     // ============================= Utilities ==============================
     private val noRedirectClient = client.newBuilder().followRedirects(false).build()
 
-    private fun getPlayerUrl(id: String, name: String): String? {
-        return webViewResolver.getUrl("$baseUrl/embed/getEmbed.php?id=$id&sv=$name", "$baseUrl/termos")
+    private fun getPlayerUrl(id: String, name: String): String {
+        val req = GET("$baseUrl/embed/getPlay.php?id=$id&sv=$name", headers)
+        return if (name == "warezcdn") {
+            val res = noRedirectClient.newCall(req).execute()
+            res.close()
+            res.headers["location"]!!
+        } else {
+            val res = client.newCall(req).execute()
+            val body = res.body.string()
+            body.substringAfter("location.href=\"", "").substringBefore("\";", "")
+        }
     }
 
     private fun apiRequest(body: String): Request {
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt
index f8bf3c96..d6b9dc40 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt
@@ -83,7 +83,7 @@ class HostersDto(
 object BooleanSerializer : JsonTransformingSerializer<Boolean>(Boolean.serializer()) {
     override fun transformDeserialize(element: JsonElement): JsonElement {
         require(element is JsonPrimitive)
-        return if (element.jsonPrimitive.isString && element.jsonPrimitive.content == "true") {
+        return if (element.jsonPrimitive.isString) {
             JsonPrimitive(true)
         } else {
             JsonPrimitive(element.jsonPrimitive.booleanOrNull ?: false)
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt
new file mode 100644
index 00000000..50a23f84
--- /dev/null
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt
@@ -0,0 +1,52 @@
+package eu.kanade.tachiyomi.animeextension.pt.vizer.extractors
+
+import android.util.Base64
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+
+class WarezExtractor(private val client: OkHttpClient, private val headers: Headers) {
+
+    fun videosFromUrl(url: String, lang: String): List<Video> {
+        val doc = client.newCall(GET(url, headers)).execute().asJsoup()
+        val httpUrl = doc.location().toHttpUrl()
+        val videoId = httpUrl.queryParameter("id") ?: return emptyList()
+        val script = doc.selectFirst("script:containsData(allowanceKey)")?.data()
+            ?: return emptyList()
+        val key = script.substringAfter("allowanceKey").substringAfter('"').substringBefore('"')
+        val cdn = script.substringAfter("cdnListing").substringAfter('[').substringBefore(']')
+            .split(',')
+            .random()
+
+        val body = FormBody.Builder()
+            .add("getVideo", videoId)
+            .add("key", key)
+            .build()
+
+        val host = "https://" + httpUrl.host
+        val reqHeaders = headers.newBuilder()
+            .set("Origin", host)
+            .set("Referer", url)
+            .set("X-Requested-With", "XMLHttpRequest")
+            .build()
+
+        val req = client.newCall(POST("$host/player/functions.php", reqHeaders, body)).execute()
+        val id = req.body.string().substringAfter("id\":\"", "").substringBefore('"', "")
+            .ifBlank { return emptyList() }
+        val decrypted = decryptorium(id)
+        val videoUrl = "https://workerproxy.warezcdn.workers.dev/?url=https://cloclo$cdn.cloud.mail.ru/weblink/view/$decrypted"
+        return listOf(Video(videoUrl, "WarezCDN - $lang", videoUrl, headers))
+    }
+
+    private fun decryptorium(enc: String): String {
+        val b64dec = String(Base64.decode(enc, Base64.DEFAULT)).trim()
+        val start = b64dec.reversed().dropLast(5)
+        val end = b64dec.substring(0, 5)
+        return start + end
+    }
+}
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt
deleted file mode 100644
index 177f2704..00000000
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.vizer.interceptor
-
-import android.annotation.SuppressLint
-import android.app.Application
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.webkit.WebResourceRequest
-import android.webkit.WebResourceResponse
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import okhttp3.Headers
-import uy.kohesive.injekt.injectLazy
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-class WebViewResolver(private val globalHeaders: Headers) {
-    private val context: Application by injectLazy()
-    private val handler by lazy { Handler(Looper.getMainLooper()) }
-    private val tag by lazy { javaClass.simpleName }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    fun getUrl(origRequestUrl: String, baseUrl: String): String? {
-        val latch = CountDownLatch(1)
-        var webView: WebView? = null
-        var result: String? = null
-
-        handler.post {
-            val webview = WebView(context)
-            webView = webview
-            with(webview.settings) {
-                javaScriptEnabled = true
-                domStorageEnabled = true
-                databaseEnabled = true
-                useWideViewPort = false
-                loadWithOverviewMode = false
-                userAgentString = globalHeaders["User-Agent"]
-            }
-            webview.webViewClient = object : WebViewClient() {
-                override fun shouldInterceptRequest(
-                    view: WebView,
-                    request: WebResourceRequest,
-                ): WebResourceResponse? {
-                    val url = request.url.toString()
-                    Log.d(tag, "Checking url $url")
-                    if (VIDEO_REGEX.containsMatchIn(url)) {
-                        result = url
-                        latch.countDown()
-                    }
-                    return super.shouldInterceptRequest(view, request)
-                }
-
-                override fun onPageFinished(view: WebView?, url: String?) {
-                    Log.d(tag, "onPageFinished $url")
-                    super.onPageFinished(view, url)
-
-                    view?.evaluateJavascript("document.body.innerHTML += '<iframe src=\"" + origRequestUrl + "\" scrolling=\"no\" frameborder=\"0\" allowfullscreen=\"\" webkitallowfullscreen=\"\" mozallowfullscreen=\"\"></iframe>'") {}
-                }
-            }
-
-            webView?.loadUrl(baseUrl)
-        }
-
-        latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
-
-        handler.post {
-            webView?.stopLoading()
-            webView?.destroy()
-            webView = null
-        }
-        return result
-    }
-
-    companion object {
-        const val TIMEOUT_SEC: Long = 25
-        private val VIDEO_REGEX by lazy { Regex("//(mixdrop|streamtape|warezcdn)|/video/") }
-    }
-}
diff --git a/src/tr/hentaizm/build.gradle b/src/tr/hentaizm/build.gradle
index 5d16803f..5bb30fba 100644
--- a/src/tr/hentaizm/build.gradle
+++ b/src/tr/hentaizm/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiZM'
     extClass = '.HentaiZM'
-    extVersionCode = 5
+    extVersionCode = 6
     isNsfw = true
 }
 
diff --git a/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt b/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt
index 30de4fc5..c7014c8a 100644
--- a/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt
+++ b/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt
@@ -30,7 +30,7 @@ class HentaiZM : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     override val name = "HentaiZM"
 
-    override val baseUrl = "https://www.hentaizm.cam"
+    override val baseUrl = "https://www.hentaizm1.online/"
 
     override val lang = "tr"
 
diff --git a/src/tr/tranimeizle/build.gradle b/src/tr/tranimeizle/build.gradle
index 75f30735..22ab0c85 100644
--- a/src/tr/tranimeizle/build.gradle
+++ b/src/tr/tranimeizle/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'TR Anime Izle'
     extClass = '.TRAnimeIzle'
-    extVersionCode = 19
+    extVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/zh/anime1/build.gradle b/src/zh/anime1/build.gradle
deleted file mode 100644
index ce26ab4b..00000000
--- a/src/zh/anime1/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-ext {
-    extName = 'Anime1.me'
-    extClass = '.Anime1'
-    extVersionCode = 1
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/zh/anime1/res/mipmap-hdpi/ic_launcher.png b/src/zh/anime1/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 98585735..00000000
Binary files a/src/zh/anime1/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/anime1/res/mipmap-mdpi/ic_launcher.png b/src/zh/anime1/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 186328d5..00000000
Binary files a/src/zh/anime1/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/anime1/res/mipmap-xhdpi/ic_launcher.png b/src/zh/anime1/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 195d9a27..00000000
Binary files a/src/zh/anime1/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/anime1/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/anime1/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 599affaf..00000000
Binary files a/src/zh/anime1/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/anime1/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/anime1/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 20dda2b2..00000000
Binary files a/src/zh/anime1/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/anime1/src/eu/kanade/tachiyomi/animeextension/zh/anime1/Anime1.kt b/src/zh/anime1/src/eu/kanade/tachiyomi/animeextension/zh/anime1/Anime1.kt
deleted file mode 100644
index 7608d038..00000000
--- a/src/zh/anime1/src/eu/kanade/tachiyomi/animeextension/zh/anime1/Anime1.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.anime1
-
-import android.webkit.CookieManager
-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.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.awaitSuccess
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.contentOrNull
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-class Anime1 : AnimeHttpSource() {
-    override val baseUrl: String
-        get() = "https://anime1.me"
-    override val lang: String
-        get() = "zh-hant"
-    override val name: String
-        get() = "Anime1.me"
-    override val supportsLatest: Boolean
-        get() = true
-
-    override fun headersBuilder() = super.headersBuilder().add("referer", "$baseUrl/")
-
-    private val videoApiUrl = "https://v.anime1.me/api"
-    private val dataUrl = "https://d1zquzjgwo9yb.cloudfront.net"
-    private val uploadDateFormat: SimpleDateFormat by lazy {
-        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault())
-    }
-    private lateinit var data: JsonArray
-    private val cookieManager
-        get() = CookieManager.getInstance()
-
-    override fun animeDetailsParse(response: Response) = throw UnsupportedOperationException()
-    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
-        return SAnime.create().apply {
-            thumbnail_url = FIX_COVER
-        }
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        var document: Document? = response.asJsoup()
-        val episodes = mutableListOf<SEpisode>()
-        val requestUrl = response.request.url.toString()
-        while (document != null) {
-            val items = document.select("article.post").map {
-                SEpisode.create().apply {
-                    name = it.select(".entry-title").text()
-                    val url = it.selectFirst(".entry-title a")?.attr("href") ?: requestUrl
-                    setUrlWithoutDomain(url)
-                    date_upload = it.select("time.updated").attr("datetime").let { date ->
-                        runCatching { uploadDateFormat.parse(date)?.time }.getOrNull() ?: 0L
-                    }
-                }
-            }
-            episodes.addAll(items)
-            val previousUrl = document.select(".nav-previous a").attr("href")
-            document = if (previousUrl.isBlank()) {
-                null
-            } else {
-                client.newCall(GET(previousUrl)).execute().asJsoup()
-            }
-        }
-        return episodes
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val req = document.select("video").attr("data-apireq")
-        val videoResponse: VideoResponse = client.newCall(
-            POST(
-                videoApiUrl,
-                body = "d=$req".toRequestBody("application/x-www-form-urlencoded".toMediaTypeOrNull()),
-            ),
-        ).execute().parseAs()
-        return videoResponse.s.map {
-            val videoUrl = "https:${it.src}"
-            val newHeaders = cookieManager.getCookie(videoUrl)?.let { cookie ->
-                headers.newBuilder().add("cookie", cookie).build()
-            }
-            Video(videoUrl, it.type, videoUrl, headers = newHeaders)
-        }
-    }
-
-    override suspend fun getLatestUpdates(page: Int): AnimesPage {
-        if (!this::data.isInitialized) {
-            data = client.newCall(GET("$dataUrl/?_=${System.currentTimeMillis()}")).awaitSuccess()
-                .parseAs()
-        }
-        val items = data.subList((page - 1) * PAGE_SIZE, (page * PAGE_SIZE).coerceAtMost(data.size))
-        return AnimesPage(
-            items.map {
-                SAnime.create().apply {
-                    val array = it.jsonArray
-                    val id = array.getContent(0)!!
-                    url = "?cat=$id"
-                    title = array.getContent(1)!!
-                    if (id == "0" || title.contains("</a>")) {
-                        val doc = Jsoup.parse(title)
-                        doc.selectFirst("a")?.let { link ->
-                            url = link.attr("href")
-                        }
-                        title = doc.text()
-                    }
-                    status = if (array.getContent(2)?.contains("連載中") == true) {
-                        SAnime.ONGOING
-                    } else {
-                        SAnime.COMPLETED
-                    }
-                    genre = listOfNotNull(
-                        array.getContent(3),
-                        array.getContent(4),
-                        array.getContent(5),
-                    ).joinToString()
-                    thumbnail_url = FIX_COVER
-                }
-            },
-            items.size == PAGE_SIZE,
-        )
-    }
-
-    override suspend fun getPopularAnime(page: Int): AnimesPage {
-        return getLatestUpdates(page)
-    }
-
-    override fun latestUpdatesParse(response: Response) = throw UnsupportedOperationException()
-    override fun latestUpdatesRequest(page: Int) = throw UnsupportedOperationException()
-    override fun popularAnimeParse(response: Response) = throw UnsupportedOperationException()
-    override fun popularAnimeRequest(page: Int) = throw UnsupportedOperationException()
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        // The search result is episode
-        val document = response.asJsoup()
-        val items = document.select("article.post .entry-title a").map {
-            SAnime.create().apply {
-                setUrlWithoutDomain(it.attr("href"))
-                title = it.ownText()
-                thumbnail_url = FIX_COVER
-            }
-        }
-        val previous = document.select(".nav-previous")
-        return AnimesPage(items, previous.isNotEmpty())
-    }
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val url = baseUrl.toHttpUrl().newBuilder()
-        if (page > 1) {
-            url.addPathSegments("page/$page")
-        }
-        url.addQueryParameter("s", query)
-        return GET(url.build())
-    }
-
-    private fun JsonArray.getContent(index: Int): String? {
-        return getOrNull(index)?.jsonPrimitive?.contentOrNull
-    }
-
-    companion object {
-        const val PAGE_SIZE = 20
-        const val FIX_COVER = "https://sta.anicdn.com/playerImg/8.jpg"
-    }
-}
-
-@Serializable
-data class VideoSource(val src: String, val type: String)
-
-@Serializable
-data class VideoResponse(val s: List<VideoSource>)
diff --git a/src/zh/hanime1/build.gradle b/src/zh/hanime1/build.gradle
deleted file mode 100644
index 9026207b..00000000
--- a/src/zh/hanime1/build.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-ext {
-    extName = 'Hanime1'
-    extClass = '.Hanime1'
-    extVersionCode = 2
-    isNsfw = true
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/zh/hanime1/res/mipmap-hdpi/ic_launcher.png b/src/zh/hanime1/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 23ff9b30..00000000
Binary files a/src/zh/hanime1/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/hanime1/res/mipmap-mdpi/ic_launcher.png b/src/zh/hanime1/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index b073f635..00000000
Binary files a/src/zh/hanime1/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/hanime1/res/mipmap-xhdpi/ic_launcher.png b/src/zh/hanime1/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 293906df..00000000
Binary files a/src/zh/hanime1/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/hanime1/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/hanime1/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 8a563b36..00000000
Binary files a/src/zh/hanime1/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/hanime1/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/hanime1/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index c0fc67b6..00000000
Binary files a/src/zh/hanime1/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Filters.kt b/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Filters.kt
deleted file mode 100644
index 5b3765f3..00000000
--- a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Filters.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.hanime1
-
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-
-open class QueryFilter(name: String, val key: String, values: Array<String>) :
-    AnimeFilter.Select<String>(name, values) {
-    val selected: String
-        get() = if (state == 0) {
-            ""
-        } else {
-            values[state]
-        }
-}
-
-open class TagFilter(val key: String, name: String, state: Boolean = false) :
-    AnimeFilter.CheckBox(name, state)
-
-class GenreFilter(values: Array<String>) :
-    QueryFilter(
-        "影片類型",
-        "genre",
-        values.ifEmpty { arrayOf("全部", "裏番", "泡面番", "Motion Anime") },
-    )
-
-class SortFilter(values: Array<String>) :
-    QueryFilter(
-        "排序方式",
-        "sort",
-        values.ifEmpty { arrayOf("最新上市", "最新上傳", "本日排行", "本週排行", "本月排行") },
-    )
-
-object HotFilter : TagFilter("sort", "本周排行", true)
-
-class YearFilter(values: Array<String>) :
-    QueryFilter("發佈年份", "year", values.ifEmpty { arrayOf("全部年份") })
-
-class MonthFilter(values: Array<String>) :
-    QueryFilter("發佈月份", "month", values.ifEmpty { arrayOf("全部月份") })
-
-class DateFilter(yearFilter: YearFilter, monthFilter: MonthFilter) :
-    AnimeFilter.Group<QueryFilter>("發佈日期", listOf(yearFilter, monthFilter))
-
-class CategoryFilter(name: String, filters: List<TagFilter>) :
-    AnimeFilter.Group<TagFilter>(name, filters)
-
-class BroadMatchFilter : TagFilter("broad", "廣泛配對")
-
-class TagsFilter(filters: List<AnimeFilter<out Any>>) :
-    AnimeFilter.Group<AnimeFilter<out Any>>("標籤", filters)
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
deleted file mode 100644
index 49f297c0..00000000
--- a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
+++ /dev/null
@@ -1,308 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.hanime1
-
-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.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.network.GET
-import eu.kanade.tachiyomi.network.awaitSuccess
-import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Interceptor
-import okhttp3.Request
-import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-enum class FilterUpdateState {
-    NONE,
-    UPDATING,
-    COMPLETED,
-    FAILED,
-}
-
-class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
-    override val baseUrl: String
-        get() = "https://hanime1.me"
-    override val lang: String
-        get() = "zh"
-    override val name: String
-        get() = "Hanime1.me"
-    override val supportsLatest: Boolean
-        get() = true
-
-    override val client =
-        network.client.newBuilder().addInterceptor(::checkFiltersInterceptor).build()
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-    private val json by injectLazy<Json>()
-    private var filterUpdateState = FilterUpdateState.NONE
-    private val uploadDateFormat: SimpleDateFormat by lazy {
-        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault())
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val jsoup = response.asJsoup()
-        return SAnime.create().apply {
-            genre = jsoup.select(".single-video-tag").not("[data-toggle]").eachText().joinToString()
-            author = jsoup.select("#video-artist-name").text()
-            jsoup.select("script[type=application/ld+json]").first()?.data()?.let {
-                val info = json.decodeFromString<JsonElement>(it).jsonObject
-                title = info["name"]!!.jsonPrimitive.content
-                description = info["description"]!!.jsonPrimitive.content
-            }
-        }
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val jsoup = response.asJsoup()
-        val nodes = jsoup.select("#playlist-scroll").first()!!.select(">div")
-        return nodes.mapIndexed { index, element ->
-            SEpisode.create().apply {
-                val href = element.select("a.overlay").attr("href")
-                setUrlWithoutDomain(href)
-                episode_number = (nodes.size - index).toFloat()
-                name = element.select("div.card-mobile-title").text()
-                if (href == response.request.url.toString()) {
-                    // current video
-                    jsoup.select("script[type=application/ld+json]").first()?.data()?.let {
-                        val info = json.decodeFromString<JsonElement>(it).jsonObject
-                        info["uploadDate"]?.jsonPrimitive?.content?.let { date ->
-                            date_upload =
-                                runCatching { uploadDateFormat.parse(date)?.time }.getOrNull() ?: 0L
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        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)
-        }.sortedByDescending { preferQuality == it.quality }
-    }
-
-    override fun latestUpdatesParse(response: Response): AnimesPage = searchAnimeParse(response)
-
-    override fun latestUpdatesRequest(page: Int) = searchAnimeRequest(page, "", AnimeFilterList())
-
-    override fun popularAnimeParse(response: Response): AnimesPage = searchAnimeParse(response)
-
-    override fun popularAnimeRequest(page: Int) =
-        searchAnimeRequest(page, "", AnimeFilterList(HotFilter))
-
-    private fun String.appendInvisibleChar(): String {
-        // The search result title will be same as one episode name of anime.
-        // Adding extra char makes them has different title
-        return "${this}\u200B"
-    }
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        val jsoup = response.asJsoup()
-        val nodes = jsoup.select("div.search-doujin-videos.hidden-xs")
-        val list = if (nodes.isNotEmpty()) {
-            nodes.map {
-                SAnime.create().apply {
-                    setUrlWithoutDomain(it.select("a[class=overlay]").attr("href"))
-                    thumbnail_url = it.select("img + img").attr("src")
-                    title = it.select("div.card-mobile-title").text().appendInvisibleChar()
-                    author = it.select(".card-mobile-user").text()
-                }
-            }
-        } else {
-            jsoup.select(".search-videos").map {
-                SAnime.create().apply {
-                    setUrlWithoutDomain(it.parent()!!.attr("href"))
-                    thumbnail_url = it.select("img").attr("src")
-                    title = it.select(".home-rows-videos-title").text().appendInvisibleChar()
-                }
-            }
-        }
-        val nextPage = jsoup.select("li.page-item a.page-link[rel=next]")
-        return AnimesPage(list, nextPage.isNotEmpty())
-    }
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val searchUrl = baseUrl.toHttpUrl().newBuilder().addPathSegment("search")
-        if (query.isNotEmpty()) {
-            searchUrl.addQueryParameter("query", query)
-        }
-        filters.list.flatMap {
-            when (it) {
-                is TagsFilter -> {
-                    it.state.flatMap { inner ->
-                        if (inner is CategoryFilter) {
-                            inner.state
-                        } else {
-                            listOf(inner)
-                        }
-                    }
-                }
-
-                is AnimeFilter.Group<*> -> it.state
-                else -> listOf(it)
-            }
-        }.forEach {
-            when (it) {
-                is QueryFilter -> {
-                    if (it.selected.isNotEmpty()) {
-                        searchUrl.addQueryParameter(it.key, it.selected)
-                    }
-                }
-
-                is BroadMatchFilter -> {
-                    if (it.state) {
-                        searchUrl.addQueryParameter(it.key, "on")
-                    }
-                }
-
-                is TagFilter -> {
-                    if (it.state) {
-                        searchUrl.addQueryParameter(it.key, it.name)
-                    }
-                }
-
-                else -> {}
-            }
-        }
-        if (page > 1) {
-            searchUrl.addQueryParameter("page", "$page")
-        }
-        return GET(searchUrl.build())
-    }
-
-    private fun checkFiltersInterceptor(chain: Interceptor.Chain): Response {
-        if (filterUpdateState == FilterUpdateState.NONE) {
-            updateFilters()
-        }
-        return chain.proceed(chain.request())
-    }
-
-    private fun updateFilters() {
-        filterUpdateState = FilterUpdateState.UPDATING
-        val exceptionHandler =
-            CoroutineExceptionHandler { _, _ -> filterUpdateState = FilterUpdateState.FAILED }
-        CoroutineScope(Dispatchers.IO + exceptionHandler).launch {
-            val jsoup = client.newCall(GET("$baseUrl/search")).awaitSuccess().asJsoup()
-            val genreList = jsoup.select("div.genre-option div.hentai-sort-options").eachText()
-            val sortList =
-                jsoup.select("div.hentai-sort-options-wrapper div.hentai-sort-options").eachText()
-            val yearList = jsoup.select("select#year option").eachAttr("value")
-                .map { it.ifEmpty { "全部年份" } }
-            val monthList = jsoup.select("select#month option").eachAttr("value")
-                .map { it.ifEmpty { "全部月份" } }
-            val categoryDict = mutableMapOf<String, MutableList<String>>()
-            var currentKey = ""
-            jsoup.select("div#tags div.modal-body").first()?.children()?.forEach {
-                if (it.tagName() == "h5") {
-                    currentKey = it.text()
-                }
-                if (it.tagName() == "label") {
-                    if (currentKey in categoryDict) {
-                        categoryDict[currentKey]
-                    } else {
-                        categoryDict[currentKey] = mutableListOf()
-                        categoryDict[currentKey]
-                    }!!.add(it.select("input[name]").attr("value"))
-                }
-            }
-            preferences.edit().putString(PREF_KEY_GENRE_LIST, genreList.joinToString())
-                .putString(PREF_KEY_SORT_LIST, sortList.joinToString())
-                .putString(PREF_KEY_YEAR_LIST, yearList.joinToString())
-                .putString(PREF_KEY_MONTH_LIST, monthList.joinToString())
-                .putString(PREF_KEY_CATEGORY_LIST, json.encodeToString(categoryDict)).apply()
-            filterUpdateState = FilterUpdateState.COMPLETED
-        }
-    }
-
-    private fun <T : QueryFilter> createFilter(prefKey: String, block: (Array<String>) -> T): T {
-        val savedOptions = preferences.getString(prefKey, "")
-        if (savedOptions.isNullOrEmpty()) {
-            return block(emptyArray())
-        }
-        return block(savedOptions.split(", ").toTypedArray())
-    }
-
-    private fun createCategoryFilters(): List<AnimeFilter<out Any>> {
-        val result = mutableListOf<AnimeFilter<out Any>>(
-            BroadMatchFilter(),
-        )
-        val savedCategories = preferences.getString(PREF_KEY_CATEGORY_LIST, "")
-        if (savedCategories.isNullOrEmpty()) {
-            return result
-        }
-        json.decodeFromString<Map<String, List<String>>>(savedCategories).forEach {
-            result.add(CategoryFilter(it.key, it.value.map { value -> TagFilter("tags[]", value) }))
-        }
-        return result
-    }
-
-    override fun getFilterList(): AnimeFilterList {
-        return AnimeFilterList(
-            createFilter(PREF_KEY_GENRE_LIST) { GenreFilter(it) },
-            createFilter(PREF_KEY_SORT_LIST) { SortFilter(it) },
-            DateFilter(
-                createFilter(PREF_KEY_YEAR_LIST) { YearFilter(it) },
-                createFilter(PREF_KEY_MONTH_LIST) { MonthFilter(it) },
-            ),
-            TagsFilter(createCategoryFilters()),
-        )
-    }
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        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_GENRE_LIST = "PREF_KEY_GENRE_LIST"
-        const val PREF_KEY_SORT_LIST = "PREF_KEY_SORT_LIST"
-        const val PREF_KEY_YEAR_LIST = "PREF_KEY_YEAR_LIST"
-        const val PREF_KEY_MONTH_LIST = "PREF_KEY_MONTH_LIST"
-        const val PREF_KEY_CATEGORY_LIST = "PREF_KEY_CATEGORY_LIST"
-
-        const val DEFAULT_QUALITY = "1080P"
-    }
-}
diff --git a/src/zh/xfani/build.gradle b/src/zh/xfani/build.gradle
deleted file mode 100644
index 71047c71..00000000
--- a/src/zh/xfani/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-ext {
-    extName = 'Xfani'
-    extClass = '.Xfani'
-    extVersionCode = 3
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/zh/xfani/res/mipmap-hdpi/ic_launcher.png b/src/zh/xfani/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 73206bc4..00000000
Binary files a/src/zh/xfani/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xfani/res/mipmap-mdpi/ic_launcher.png b/src/zh/xfani/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 6175f3a9..00000000
Binary files a/src/zh/xfani/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xfani/res/mipmap-xhdpi/ic_launcher.png b/src/zh/xfani/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index c73e72b3..00000000
Binary files a/src/zh/xfani/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xfani/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/xfani/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 606c02d5..00000000
Binary files a/src/zh/xfani/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xfani/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/xfani/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index ae7a4dda..00000000
Binary files a/src/zh/xfani/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Filters.kt b/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Filters.kt
deleted file mode 100644
index 4072b453..00000000
--- a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Filters.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.xfani
-
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-
-abstract class SelectFilter(name: String, private val options: Array<Pair<String, String>>) :
-    AnimeFilter.Select<String>(name, options.map { it.first }.toTypedArray()) {
-    val selected
-        get() = options[state].second
-}
-
-abstract class TagFilter(name: String, values: Array<String>) :
-    SelectFilter(
-        name,
-        values.mapIndexed { index, s ->
-            if (index == 0) {
-                s to ""
-            } else {
-                s to s
-            }
-        }.toTypedArray(),
-    )
-
-class TypeFilter(
-    kv: Array<Pair<String, String>> = arrayOf(
-        "连载新番" to "1",
-        "完结旧番" to "2",
-        "剧场版" to "3",
-    ),
-) : SelectFilter("频道", kv)
-
-class ClassFilter(
-    tags: Array<String> = arrayOf(
-        "全部",
-        "搞笑",
-        "原创",
-        "轻小说改",
-        "恋爱",
-        "百合",
-        "漫改",
-    ),
-) : TagFilter("类型", tags)
-
-class VersionFilter(
-    tags: Array<String> = arrayOf(
-        "全部",
-        "BD",
-        "OVA",
-        "SP",
-        "OAD",
-    ),
-) : TagFilter("版本", tags)
-
-class LetterFilter(
-    tags: Array<String> = "ABCDEFGHIJKLMNOPQRSTUYWXYZ".map { it.toString() }.toMutableList()
-        .also {
-            it.add(0, "全部")
-            it.add("0-9")
-        }.toTypedArray(),
-) : TagFilter("字母", tags)
-
-class SortFilter(
-    kv: Array<Pair<String, String>> = arrayOf(
-        "按最新" to "time",
-        "按热门" to "hits",
-        "按评分" to "score",
-    ),
-) : SelectFilter("排序", kv)
-
-class YearFilter(tags: Array<String>) : TagFilter("年份", tags)
diff --git a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Signature.kt b/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Signature.kt
deleted file mode 100644
index 421af488..00000000
--- a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Signature.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.xfani
-
-import java.security.MessageDigest
-
-private const val UID = "DCC147D11943AF75"
-
-internal fun generateKey(time: Long): String {
-    return "DS${time}$UID".md5()
-}
-
-internal fun String.md5(): String {
-    val md = MessageDigest.getInstance("MD5")
-    val digest = md.digest(this.toByteArray())
-    return digest.joinToString(separator = "") { eachByte -> "%02x".format(eachByte) }
-}
diff --git a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt b/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt
deleted file mode 100644
index c0f5041c..00000000
--- a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt
+++ /dev/null
@@ -1,378 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.xfani
-
-import android.annotation.SuppressLint
-import android.app.Application
-import android.content.SharedPreferences
-import android.widget.Toast
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import androidx.preference.SwitchPreferenceCompat
-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.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.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.awaitSuccess
-import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Interceptor
-import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import java.security.SecureRandom
-import java.security.cert.X509Certificate
-import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLHandshakeException
-import javax.net.ssl.TrustManager
-import javax.net.ssl.X509TrustManager
-
-enum class FilterUpdateState {
-    NONE,
-    UPDATING,
-    UPDATED,
-    FAILED,
-}
-
-class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
-    override val baseUrl: String
-        get() = "https://dick.xfani.com"
-    override val lang: String
-        get() = "zh"
-    override val name: String
-        get() = "稀饭动漫"
-    override val supportsLatest: Boolean
-        get() = true
-
-    private val json by injectLazy<Json>()
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-    private val numberRegex = Regex("\\d+")
-    private var filterState = FilterUpdateState.NONE
-
-    private fun OkHttpClient.Builder.ignoreAllSSLErrors(): OkHttpClient.Builder {
-        val naiveTrustManager =
-            @SuppressLint("CustomX509TrustManager")
-            object : X509TrustManager {
-                override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
-                override fun checkClientTrusted(certs: Array<X509Certificate>, authType: String) =
-                    Unit
-
-                override fun checkServerTrusted(certs: Array<X509Certificate>, authType: String) =
-                    Unit
-            }
-
-        val insecureSocketFactory = SSLContext.getInstance("TLSv1.2").apply {
-            val trustAllCerts = arrayOf<TrustManager>(naiveTrustManager)
-            init(null, trustAllCerts, SecureRandom())
-        }.socketFactory
-
-        sslSocketFactory(insecureSocketFactory, naiveTrustManager)
-        hostnameVerifier { _, _ -> true }
-        return this
-    }
-
-    override val client: OkHttpClient by lazy {
-        if (preferences.getBoolean(PREF_KEY_IGNORE_SSL_ERROR, false)) {
-            network.client.newBuilder().ignoreAllSSLErrors()
-        } else {
-            network.client.newBuilder().addInterceptor(::checkSSLErrorInterceptor)
-        }.addInterceptor(::updateFiltersInterceptor).build()
-    }
-
-    private val selectedVideoSource
-        get() = preferences.getString(PREF_KEY_VIDEO_SOURCE, DEFAULT_VIDEO_SOURCE)!!.toInt()
-
-    private fun checkSSLErrorInterceptor(chain: Interceptor.Chain): Response {
-        try {
-            return chain.proceed(chain.request())
-        } catch (e: SSLHandshakeException) {
-            throw SSLHandshakeException("SSL证书验证异常，可以尝试在设置中忽略SSL验证问题。")
-        }
-    }
-
-    private fun updateFiltersInterceptor(chain: Interceptor.Chain): Response {
-        if (filterState == FilterUpdateState.NONE) {
-            updateFilter()
-        }
-        return chain.proceed(chain.request())
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val jsoup = response.asJsoup()
-        return SAnime.create().apply {
-            description = jsoup.select("#height_limit.text").text()
-            title = jsoup.select(".slide-info-title").text()
-        }
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val jsoup = response.asJsoup()
-        val result = jsoup.select("ul.anthology-list-play.size")
-        val episodeList = if (result.size > selectedVideoSource) {
-            result[selectedVideoSource]
-        } else {
-            result[0]
-        }.select("li > a")
-        return episodeList.map {
-            SEpisode.create().apply {
-                name = it.text()
-                url = it.attr("href")
-                episode_number = numberRegex.find(name)?.value?.toFloat() ?: -1F
-            }
-        }.sortedByDescending { it.episode_number }
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val requestUrl = response.request.url
-        val currentPath = requestUrl.encodedPath
-        val currentAnthology = response.request.url.pathSegments.last()
-        val document = response.asJsoup()
-        val videoUrl = findVideoUrl(document)
-        val sourceList =
-            document.select(".player-anthology .anthology-list .anthology-list-box")
-                .map { element ->
-                    element.select(".anthology-list-play li a").eachAttr("href")
-                        .first { it.endsWith(currentAnthology) }
-                }
-        val sourceNameList = document.select(".anthology-tab .swiper-wrapper a").map {
-            it.ownText().trim()
-        }
-        return sourceList.zip(sourceNameList) { url, name ->
-            if (url.endsWith(currentPath)) {
-                Video("$baseUrl$url", name, videoUrl = videoUrl)
-            } else {
-                Video("$baseUrl$url", name, videoUrl = null)
-            }
-        }.sortedByDescending { it.videoUrl != null }
-    }
-
-    override fun videoUrlParse(response: Response): String {
-        return findVideoUrl(response.asJsoup())
-    }
-
-    private fun findVideoUrl(document: Document): String {
-        val script = document.select("script:containsData(player_aaaa)").first()!!.data()
-        val info = script.substringAfter("player_aaaa=").let { json.parseToJsonElement(it) }
-        return info.jsonObject["url"]!!.jsonPrimitive.content
-    }
-
-    override fun latestUpdatesParse(response: Response): AnimesPage {
-        return vodListToAnimePageList(response)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request =
-        searchAnimeRequest(page, "", AnimeFilterList())
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        return vodListToAnimePageList(response)
-    }
-
-    override fun popularAnimeRequest(page: Int): Request =
-        searchAnimeRequest(page, "", AnimeFilterList(SortFilter().apply { state = 1 }))
-
-    private fun vodListToAnimePageList(response: Response): AnimesPage {
-        val vodResponse = json.decodeFromString<VodResponse>(response.body.string())
-        val animeList = vodResponse.list.map {
-            SAnime.create().apply {
-                url = "/bangumi/${it.vodId}.html"
-                thumbnail_url = it.vodPicThumb.ifEmpty { it.vodPic }
-                title = it.vodName
-                author = it.vodActor.replace(",,,", "")
-                description = it.vodBlurb
-                genre = it.vodClass.replace(",", ", ")
-            }
-        }
-        return AnimesPage(
-            animeList,
-            animeList.isNotEmpty() && vodResponse.page * vodResponse.limit < vodResponse.total,
-        )
-    }
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        if (response.request.url.toString().contains("api/vod")) {
-            return vodListToAnimePageList(response)
-        }
-        val jsoup = response.asJsoup()
-        val items = jsoup.select("div.public-list-box.search-box.flex.rel")
-        val animeList = items.map { item ->
-            SAnime.create().apply {
-                title = item.select(".thumb-txt").text()
-                url = item.select("div.left.public-list-bj a.public-list-exp").attr("href")
-                thumbnail_url =
-                    item.select("div.left.public-list-bj img[data-src]").attr("data-src")
-                author = item.select("div.thumb-actor").text().removeSuffix("/")
-                artist = item.select("div.thumb-director").text().removeSuffix("/")
-                description = item.select(".thumb-blurb").text()
-                genre = item.select("div.thumb-else").text()
-                val statusString = item.select("div.left.public-list-bj .public-list-prb").text()
-                status = STATUS_STR_MAPPING.getOrElse(statusString) { SAnime.ONGOING }
-            }
-        }
-        val tip = jsoup.select("div.pages div.page-tip").text()
-        return AnimesPage(animeList, tip.isNotEmpty() && hasMorePage(tip))
-    }
-
-    private fun hasMorePage(tip: String): Boolean {
-        val pageIndicator = tip.substringAfter("当前").substringBefore("页")
-        val numbers = pageIndicator.split("/")
-        return numbers.size == 2 && numbers[0] != numbers[1]
-    }
-
-    private fun updateFilter() {
-        filterState = FilterUpdateState.UPDATING
-        val handler = CoroutineExceptionHandler { _, _ ->
-            filterState = FilterUpdateState.FAILED
-        }
-        CoroutineScope(Dispatchers.IO + handler).launch {
-            val jsoup = client.newCall(GET("$baseUrl/show/1/html")).awaitSuccess().asJsoup()
-            // update class and year filter type
-            val classList = jsoup.select("li[data-type=class]").eachAttr("data-val")
-            val yearList = jsoup.select("li[data-type=year]").eachAttr("data-val")
-            preferences.edit()
-                .putString(PREF_KEY_FILTER_CLASS, classList.joinToString())
-                .putString(PREF_KEY_FILTER_YEAR, yearList.joinToString())
-                .apply()
-            filterState = FilterUpdateState.UPDATED
-        }
-    }
-
-    private fun SharedPreferences.createTagFilter(
-        key: String,
-        block: (tags: Array<String>) -> TagFilter?,
-    ): TagFilter? {
-        val savedTags = getString(key, "")!!
-        if (savedTags.isBlank()) {
-            return block(emptyArray())
-        }
-        val tags = savedTags.split(", ").toMutableList()
-        if (tags[0].isBlank()) {
-            tags[0] = "全部"
-        }
-        return block(tags.toTypedArray())
-    }
-
-    override fun getFilterList(): AnimeFilterList {
-        return AnimeFilterList(
-            listOfNotNull(
-                AnimeFilter.Header("以下筛选对搜索结果无效"),
-                TypeFilter(),
-                preferences.createTagFilter(PREF_KEY_FILTER_CLASS) {
-                    if (it.isEmpty()) {
-                        ClassFilter()
-                    } else {
-                        ClassFilter(it)
-                    }
-                },
-                preferences.createTagFilter(PREF_KEY_FILTER_YEAR) {
-                    if (it.isEmpty()) {
-                        null
-                    } else {
-                        YearFilter(it)
-                    }
-                },
-                VersionFilter(),
-                LetterFilter(),
-                SortFilter(),
-            ),
-        )
-    }
-
-    private fun doSearch(page: Int, query: String): Request {
-        val url = baseUrl.toHttpUrl().newBuilder()
-        if (page <= 1) {
-            url.addPathSegment("search.html").addQueryParameter("wd", query)
-        } else {
-            url.addPathSegments("search/wd/").addPathSegment(query)
-                .addPathSegments("page/$page.html")
-        }
-        return GET(url.build())
-    }
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        if (query.isNotBlank()) {
-            return doSearch(page, query)
-        }
-        val url = baseUrl.toHttpUrl().newBuilder().addPathSegments("index.php/api/vod").build()
-        val time = System.currentTimeMillis() / 1000
-        val formBody =
-            MultipartBody.Builder().setType(MultipartBody.FORM).addFormDataPart("page", "$page")
-                .addFormDataPart("time", "$time").addFormDataPart("key", generateKey(time))
-        filters.forEach { filter ->
-            when (filter) {
-                is TypeFilter -> formBody.addFormDataPart("type", filter.selected)
-                is ClassFilter -> formBody.addFormDataPart("class", filter.selected)
-                is YearFilter -> formBody.addFormDataPart("year", filter.selected)
-                is VersionFilter -> formBody.addFormDataPart("version", filter.selected)
-                is LetterFilter -> formBody.addFormDataPart("letter", filter.selected)
-                is SortFilter -> formBody.addFormDataPart("by", filter.selected)
-                else -> {}
-            }
-        }
-        if (filters.filterIsInstance<TypeFilter>().isEmpty()) {
-            formBody.addFormDataPart("type", "1")
-        }
-        return POST(url.toString(), body = formBody.build())
-    }
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.apply {
-            addPreference(
-                ListPreference(screen.context).apply {
-                    key = PREF_KEY_VIDEO_SOURCE
-                    title = "请设置首选视频源线路"
-                    entries = arrayOf("主线-1", "主线-2", "备用-1")
-                    entryValues = arrayOf("0", "1", "2")
-                    setDefaultValue(DEFAULT_VIDEO_SOURCE)
-                    summary = "当前选择：${entries[selectedVideoSource]}"
-                    setOnPreferenceChangeListener { _, newValue ->
-                        summary = "当前选择：${entries[(newValue as String).toInt()]}"
-                        true
-                    }
-                },
-            )
-            addPreference(
-                SwitchPreferenceCompat(screen.context).apply {
-                    key = PREF_KEY_IGNORE_SSL_ERROR
-                    title = "忽略SSL证书校验"
-                    setDefaultValue(false)
-                    setOnPreferenceChangeListener { _, _ ->
-                        Toast.makeText(screen.context, "重启应用后生效", Toast.LENGTH_SHORT).show()
-                        true
-                    }
-                },
-            )
-        }
-    }
-
-    companion object {
-        const val PREF_KEY_VIDEO_SOURCE = "PREF_KEY_VIDEO_SOURCE"
-        const val PREF_KEY_IGNORE_SSL_ERROR = "PREF_KEY_IGNORE_SSL_ERROR"
-
-        const val PREF_KEY_FILTER_CLASS = "PREF_KEY_FILTER_CLASS"
-        const val PREF_KEY_FILTER_YEAR = "PREF_KEY_FILTER_YEAR"
-
-        const val DEFAULT_VIDEO_SOURCE = "0"
-
-        val STATUS_STR_MAPPING = mapOf(
-            "已完结" to SAnime.COMPLETED,
-        )
-    }
-}
diff --git a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/XfaniDTO.kt b/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/XfaniDTO.kt
deleted file mode 100644
index e5cdfd8f..00000000
--- a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/XfaniDTO.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.xfani
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class VodInfo(
-    @SerialName("vod_id")
-    val vodId: Int,
-    @SerialName("vod_level")
-    val vodLevel: Int = 0,
-    @SerialName("vod_name")
-    val vodName: String,
-    @SerialName("vod_pic")
-    val vodPic: String,
-    @SerialName("vod_pic_thumb")
-    val vodPicThumb: String = "",
-    @SerialName("vod_tag")
-    val vodTag: String = "",
-    @SerialName("vod_class")
-    val vodClass: String,
-    @SerialName("vod_remarks")
-    val vodRemarks: String,
-    @SerialName("vod_serial")
-    val vodSerial: String,
-    @SerialName("vod_sub")
-    val vodSub: String,
-    @SerialName("vod_actor")
-    val vodActor: String,
-    @SerialName("vod_blurb")
-    val vodBlurb: String,
-)
-
-@Serializable
-data class VodResponse(
-    val page: Int,
-    @SerialName("pagecount")
-    val pageCount: Int,
-    val limit: Int,
-    val total: Int,
-    val list: List<VodInfo>,
-)
diff --git a/src/zh/xiaoxintv/build.gradle b/src/zh/xiaoxintv/build.gradle
deleted file mode 100644
index 67d7a839..00000000
--- a/src/zh/xiaoxintv/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-ext {
-    extName = 'Xiaoxintv'
-    extClass = '.Xiaoxintv'
-    extVersionCode = 1
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/zh/xiaoxintv/res/mipmap-hdpi/ic_launcher.png b/src/zh/xiaoxintv/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 3f719488..00000000
Binary files a/src/zh/xiaoxintv/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xiaoxintv/res/mipmap-mdpi/ic_launcher.png b/src/zh/xiaoxintv/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index a0c08099..00000000
Binary files a/src/zh/xiaoxintv/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xiaoxintv/res/mipmap-xhdpi/ic_launcher.png b/src/zh/xiaoxintv/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 57026442..00000000
Binary files a/src/zh/xiaoxintv/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xiaoxintv/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/xiaoxintv/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index f1e07f13..00000000
Binary files a/src/zh/xiaoxintv/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xiaoxintv/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/xiaoxintv/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 149a7bee..00000000
Binary files a/src/zh/xiaoxintv/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/zh/xiaoxintv/src/eu/kanade/tachiyomi/animeextension/zh/xiaoxintv/Filters.kt b/src/zh/xiaoxintv/src/eu/kanade/tachiyomi/animeextension/zh/xiaoxintv/Filters.kt
deleted file mode 100644
index 68930c85..00000000
--- a/src/zh/xiaoxintv/src/eu/kanade/tachiyomi/animeextension/zh/xiaoxintv/Filters.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-@file:Suppress("LocalVariableName", "PropertyName")
-
-package eu.kanade.tachiyomi.animeextension.zh.xiaoxintv
-
-import android.content.SharedPreferences
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-
-private const val PREF_KEY_FILTER_CONFIG_PREFIX = "STORED_SEARCH_CONFIG"
-
-open class PathFilter(name: String, private val beans: Array<out SearchBean>) :
-    AnimeFilter.Select<String>(name, beans.map { it.name }.toTypedArray()) {
-    val selected
-        get() = beans[state]
-}
-
-class GroupFilter(name: String, filters: List<PathFilter>) :
-    AnimeFilter.Group<PathFilter>(name, filters)
-
-internal enum class FilterType(val title: String) {
-    TYPE("类型"),
-    CLASS("分类"),
-    YEAR("年份"),
-    LANG("语言"),
-    SORT("排序"),
-    REGION("地区"),
-}
-
-interface SearchBean {
-    val name: String
-    val ignore: Boolean
-    fun toPath(): String
-}
-
-@Serializable
-data class SearchType(
-    override val name: String,
-    val id: String,
-    override val ignore: Boolean = false,
-) : SearchBean {
-    constructor(name: String, id: Int) : this(name, "$id")
-
-    override fun toPath() = "/id/$id"
-}
-
-internal fun SearchType.toFilter(): PathFilter {
-    return PathFilter(name, arrayOf(this))
-}
-
-@Serializable
-data class SearchSort(
-    override val name: String,
-    val by: String,
-    override val ignore: Boolean = false,
-) : SearchBean {
-    override fun toPath() = "/by/$by"
-}
-
-@Serializable
-data class SearchYear(override val name: String, override val ignore: Boolean = false) :
-    SearchBean {
-    override fun toPath() = "/year/$name"
-}
-
-@Serializable
-data class SearchLang(override val name: String, override val ignore: Boolean = false) :
-    SearchBean {
-    override fun toPath() = "/lang/$name"
-}
-
-@Serializable
-data class SearchClass(override val name: String, override val ignore: Boolean = false) :
-    SearchBean {
-    override fun toPath() = "/class/$name"
-}
-
-@Serializable
-data class SearchRegion(override val name: String, override val ignore: Boolean = false) :
-    SearchBean {
-    override fun toPath() = "/area/$name"
-}
-
-@Serializable
-data class SearchFilterConfig(
-    val type: List<SearchType>,
-    val category: List<SearchClass> = emptyList(),
-    val year: List<SearchYear> = emptyList(),
-    val lang: List<SearchLang> = emptyList(),
-    val region: List<SearchRegion> = emptyList(),
-) {
-    fun isEmpty() =
-        type.isEmpty() && category.isEmpty() && year.isEmpty() && lang.isEmpty() && region.isEmpty()
-}
-
-private inline fun <reified T> c(): Class<T> {
-    return T::class.java
-}
-
-private val searchPriority = arrayOf(
-    c<SearchRegion>(),
-    c<SearchSort>(),
-    c<SearchClass>(),
-    c<SearchType>(),
-    c<SearchLang>(),
-    c<SearchYear>(),
-)
-
-internal fun Iterable<SearchBean>.toPath(): String {
-    return this.asSequence().filterNot { it.ignore }
-        .groupBy { it::class.java }.flatMap { it.value.subList(it.value.size - 1, it.value.size) }
-        .sortedBy {
-            searchPriority.indexOf(it::class.java)
-        }
-        .joinToString(separator = "") { it.toPath() }.removePrefix("/")
-}
-
-private val defaultLangList =
-    listOf(
-        SearchLang("全部", ignore = true),
-        SearchLang("国语"),
-        SearchLang("粤语"),
-        SearchLang("英语"),
-        SearchLang("其他"),
-    )
-
-private val typeAll = SearchType("全部", "-1", ignore = true)
-private val categoryAll = SearchClass("全部", ignore = true)
-private val yearAll = SearchYear("全部", ignore = true)
-private val regionAll = SearchRegion("全部", ignore = true)
-
-private val defaultSearchFilterConfig = mapOf(
-    // anime
-    "5" to SearchFilterConfig(
-        type = listOf(typeAll, SearchType("国产动漫", 51), SearchType("日本动漫", 52)),
-        category = listOf(
-            categoryAll,
-            SearchClass("热血"),
-            SearchClass("格斗"),
-            SearchClass("其他"),
-        ),
-        year = listOf(yearAll),
-        lang = defaultLangList,
-    ),
-    // movie
-    "7" to SearchFilterConfig(
-        type = listOf(typeAll),
-        region = listOf(regionAll),
-        year = listOf(yearAll),
-        lang = defaultLangList,
-    ),
-    // tv
-    "6" to SearchFilterConfig(
-        type = listOf(typeAll),
-        category = listOf(categoryAll),
-        year = listOf(yearAll),
-        lang = defaultLangList,
-    ),
-    // variety show
-    "3" to SearchFilterConfig(
-        type = listOf(typeAll),
-        category = listOf(categoryAll),
-        year = listOf(yearAll),
-        lang = defaultLangList,
-    ),
-    // documentary
-    "21" to SearchFilterConfig(
-        type = emptyList(),
-        region = listOf(regionAll),
-        year = listOf(yearAll),
-        lang = defaultLangList,
-    ),
-    // short show
-    "64" to SearchFilterConfig(
-        type = listOf(typeAll),
-    ),
-)
-
-private fun findDefaultSearchFilterConfig(majorTypeId: String): SearchFilterConfig {
-    return defaultSearchFilterConfig.getOrElse(majorTypeId) {
-        SearchFilterConfig(
-            listOf(typeAll),
-        )
-    }
-}
-
-private fun genFilterConfigKey(majorTypeId: String): String {
-    return PREF_KEY_FILTER_CONFIG_PREFIX + "_$majorTypeId"
-}
-
-internal val defaultMajorSearchTypeSet = arrayOf(
-    SearchType("动漫", 5),
-    SearchType("电影", 7),
-    SearchType("电视剧", 6),
-    SearchType("综艺", 3),
-    SearchType("纪录片", 21),
-    SearchType("短剧", 64),
-)
-
-internal val defaultSortTypeSet =
-    arrayOf(
-        SearchSort("时间", "time", ignore = true),
-        SearchSort("人气", "hits"),
-        SearchSort("评分", "score"),
-    )
-
-fun SharedPreferences.findSearchFilterConfig(majorTypeId: String, json: Json): SearchFilterConfig {
-    // check shared preferences
-    return getString(genFilterConfigKey(majorTypeId), null)?.let { json.decodeFromString(it) }
-        ?: findDefaultSearchFilterConfig(majorTypeId)
-}
-
-fun SharedPreferences.saveSearchFilterConfig(
-    majorTypeId: String,
-    searchFilterConfig: SearchFilterConfig,
-    json: Json,
-) {
-    edit().putString(genFilterConfigKey(majorTypeId), json.encodeToString(searchFilterConfig))
-        .apply()
-}
diff --git a/src/zh/xiaoxintv/src/eu/kanade/tachiyomi/animeextension/zh/xiaoxintv/Xiaoxintv.kt b/src/zh/xiaoxintv/src/eu/kanade/tachiyomi/animeextension/zh/xiaoxintv/Xiaoxintv.kt
deleted file mode 100644
index 01d5e151..00000000
--- a/src/zh/xiaoxintv/src/eu/kanade/tachiyomi/animeextension/zh/xiaoxintv/Xiaoxintv.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.xiaoxintv
-
-import android.app.Application
-import android.content.SharedPreferences
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-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.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-
-private object HotSortFilter :
-    PathFilter(FilterType.SORT.title, arrayOf(SearchSort("人气", "hits")))
-
-class Xiaoxintv : AnimeHttpSource() {
-    override val baseUrl: String
-        get() = "https://xiaoxintv.cc"
-    override val lang: String
-        get() = "zh"
-    override val name: String
-        get() = "小宝影院"
-    override val supportsLatest: Boolean
-        get() = true
-
-    private val majorSearchTypeSet: Array<SearchType>
-        get() = defaultMajorSearchTypeSet
-    private val searchSortTypeSet: Array<SearchSort>
-        get() = defaultSortTypeSet
-    private val filterUpdateRecord by lazy {
-        majorSearchTypeSet.associateWith {
-            false
-        }.toMutableMap()
-    }
-    private val json by injectLazy<Json>()
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val document = response.asJsoup()
-        return SAnime.create().apply {
-            thumbnail_url =
-                document.select(".myui-vodlist__thumb.picture img").attr("data-original")
-            url = document.select(".myui-vodlist__thumb.picture").attr("href")
-            title = document.select(".myui-content__detail .title").text()
-            author = document.selectFirst("p.data:contains(主演：)")?.text()
-            artist = document.selectFirst("p.data:contains(导演：)")?.text()
-            description = document.selectFirst("p.data:contains(简介：)")?.ownText()
-        }
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.asJsoup()
-        return document.select("#playlist1 ul li").mapIndexed { index, element ->
-            SEpisode.create().apply {
-                url = element.select("a").attr("href")
-                name = element.attr("title")
-                episode_number = index.toFloat()
-            }
-        }.reversed()
-    }
-
-    private fun findVideoUrl(document: Document): String {
-        val script = document.select("script:containsData(player_aaaa)").first()!!.data()
-        val info = script.substringAfter("player_aaaa=").let { json.parseToJsonElement(it) }
-        return info.jsonObject["url"]!!.jsonPrimitive.content
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val videoUrl = findVideoUrl(document)
-        return listOf(Video(videoUrl, "小宝影院", videoUrl))
-    }
-
-    override fun latestUpdatesParse(response: Response): AnimesPage {
-        return searchFilterParse(response)
-    }
-
-    override fun latestUpdatesRequest(page: Int) = searchAnimeRequest(
-        page,
-        "",
-        AnimeFilterList(
-            majorSearchTypeSet[0].toFilter(),
-        ),
-    )
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        return searchFilterParse(response)
-    }
-
-    override fun popularAnimeRequest(page: Int) = searchAnimeRequest(
-        page,
-        "",
-        AnimeFilterList(
-            majorSearchTypeSet[0].toFilter(),
-            HotSortFilter,
-        ),
-    )
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        val requestUrl = response.request.url.toString()
-        if (requestUrl.contains("/vod/search")) {
-            return searchKeywordParse(response)
-        }
-        return searchFilterParse(response)
-    }
-
-    private fun searchFilterParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        tryUpdateFilters(response.request, document)
-        val items = document.select(".myui-vodlist__box").map {
-            SAnime.create().apply {
-                val thumbNode = it.select(".myui-vodlist__thumb")
-                url = thumbNode.attr("href")
-                thumbnail_url = thumbNode.attr("data-original")
-                title = thumbNode.attr("title")
-            }
-        }
-        val nextPageUrl = document.select(".myui-page a:contains(下一页)").attr("href")
-        return AnimesPage(items, !response.request.url.toString().endsWith(nextPageUrl))
-    }
-
-    private fun tryUpdateFilters(request: Request, document: Document) {
-        val requestUrl = request.url.toString()
-        val match = filterUpdateRecord.firstNotNullOfOrNull {
-            if (requestUrl.endsWith(it.key.toPath())) {
-                it.key
-            } else {
-                null
-            }
-        }
-        if (match == null || filterUpdateRecord[match] == true) {
-            return
-        }
-        filterUpdateRecord[match] = true
-        var typeList: List<SearchType> = emptyList()
-        var langList: List<SearchLang> = emptyList()
-        var yearList: List<SearchYear> = emptyList()
-        var regionList: List<SearchRegion> = emptyList()
-        var classList: List<SearchClass> = emptyList()
-        document.select(".myui-panel_bd .myui-screen__list").forEach {
-            val li = it.select("li a")
-            val key = li[0].text()
-            val options = li.drop(1)
-            when (key) {
-                FilterType.TYPE.title -> {
-                    typeList = options.mapIndexed { index, element ->
-                        SearchType(
-                            element.text(),
-                            element.attr("href").substringAfter("id/")
-                                .substringBefore("/").removeSuffix(".html"),
-                            ignore = index == 0,
-                        )
-                    }
-                }
-
-                FilterType.LANG.title -> {
-                    langList = options.mapIndexed { index, element ->
-                        SearchLang(element.text(), ignore = index == 0)
-                    }
-                }
-
-                FilterType.YEAR.title -> {
-                    yearList = options.mapIndexed { index, element ->
-                        SearchYear(element.text(), ignore = index == 0)
-                    }
-                }
-
-                FilterType.REGION.title -> {
-                    regionList = options.mapIndexed { index, element ->
-                        SearchRegion(element.text(), ignore = index == 0)
-                    }
-                }
-
-                FilterType.CLASS.title -> {
-                    classList = options.mapIndexed { index, element ->
-                        SearchClass(element.text(), ignore = index == 0)
-                    }
-                }
-
-                else -> {}
-            }
-        }
-        val config = SearchFilterConfig(typeList, classList, yearList, langList, regionList)
-        if (config.isEmpty()) {
-            return
-        }
-        preferences.saveSearchFilterConfig(match.id, config, json)
-    }
-
-    private fun searchKeywordParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val items = document.select("#searchList li").map {
-            SAnime.create().apply {
-                val thumbNode = it.select("a.myui-vodlist__thumb")
-                url = thumbNode.attr("href")
-                thumbnail_url = thumbNode.attr("data-original")
-                title = thumbNode.attr("title")
-            }
-        }
-        val nextPageUrl = document.select(".myui-page a:contains(下一页)").attr("href")
-        return AnimesPage(items, !response.request.url.toString().endsWith(nextPageUrl))
-    }
-
-    private fun keywordQuery(page: Int, query: String): Request {
-        val searchUrl = baseUrl.toHttpUrl().newBuilder()
-            .addPathSegments("index.php/vod/search")
-        if (page > 1) {
-            searchUrl.addPathSegments("page/$page/wd/$query")
-        } else {
-            searchUrl.addQueryParameter("wd", query)
-        }
-        return GET(searchUrl.build())
-    }
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        if (query.isNotBlank()) {
-            return keywordQuery(page, query)
-        }
-        val searchUrl = baseUrl.toHttpUrl().newBuilder().addPathSegments("index.php/vod/show")
-        val filterPath = filters.flatMap {
-            if (it is GroupFilter) {
-                it.state
-            } else {
-                listOf(it)
-            }
-        }.filterIsInstance<PathFilter>().map { it.selected }.toPath()
-        if (filterPath.isEmpty()) {
-            searchUrl.addPathSegments(majorSearchTypeSet[0].toPath().removePrefix("/"))
-        } else {
-            searchUrl.addPathSegments(filterPath)
-        }
-        if (page > 1) {
-            searchUrl.addPathSegments("page/$page")
-        }
-        return GET(searchUrl.build())
-    }
-
-    private fun List<SearchBean>.toFilter(name: String): PathFilter? {
-        if (isEmpty()) {
-            return null
-        }
-        return PathFilter(name, toTypedArray())
-    }
-
-    override fun getFilterList(): AnimeFilterList {
-        val groupFilters = majorSearchTypeSet.map { majorType ->
-            val config = preferences.findSearchFilterConfig(majorType.id, json)
-            val filters = listOfNotNull(
-                config.type.toFilter(FilterType.TYPE.title),
-                config.region.toFilter(FilterType.REGION.title),
-                config.category.toFilter(FilterType.CLASS.title),
-                config.year.toFilter(FilterType.YEAR.title),
-                config.lang.toFilter(FilterType.LANG.title),
-            )
-            GroupFilter(majorType.name, filters)
-        }.toTypedArray()
-        return AnimeFilterList(
-            PathFilter("主分类", majorSearchTypeSet),
-            PathFilter(FilterType.SORT.title, searchSortTypeSet),
-            AnimeFilter.Header("展开下方与主分类对应分组可进行更多设置"),
-            *groupFilters,
-        )
-    }
-}