diff --git a/lib/bangumi-scraper/build.gradle.kts b/lib/bangumi-scraper/build.gradle.kts
deleted file mode 100644
index c49026e4..00000000
--- a/lib/bangumi-scraper/build.gradle.kts
+++ /dev/null
@@ -1,7 +0,0 @@
-plugins {
-    id("lib-android")
-}
-
-dependencies {
-    compileOnly(libs.aniyomi.lib)
-}
\ No newline at end of file
diff --git a/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiDTO.kt b/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiDTO.kt
deleted file mode 100644
index 1f130ad2..00000000
--- a/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiDTO.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-@file:UseSerializers(BoxItemSerializer::class)
-package eu.kanade.tachiyomi.lib.bangumiscraper
-
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Serializer
-import kotlinx.serialization.UseSerializers
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.contentOrNull
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-
-@Serializable
-internal data class Images(
-    val large: String,
-    val common: String,
-    val medium: String,
-    val small: String,
-)
-
-@Serializable
-internal data class BoxItem(
-    val key: String,
-    val value: String,
-)
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializer(forClass = BoxItem::class)
-internal object BoxItemSerializer : KSerializer<BoxItem> {
-    override fun deserialize(decoder: Decoder): BoxItem {
-        val item = (decoder as JsonDecoder).decodeJsonElement().jsonObject
-        val key = item["key"]!!.jsonPrimitive.content
-        val value = (item["value"] as? JsonPrimitive)?.contentOrNull ?: ""
-        return BoxItem(key, value)
-    }
-}
-
-@Serializable
-internal data class Subject(
-    val name: String,
-    @SerialName("name_cn")
-    val nameCN: String,
-    val summary: String,
-    val images: Images,
-    @SerialName("meta_tags")
-    val metaTags: List<String>,
-    @SerialName("infobox")
-    val infoBox: List<BoxItem>,
-) {
-    fun findAuthor(): String? {
-        return findInfo("导演", "原作")
-    }
-
-    fun findArtist(): String? {
-        return findInfo("美术监督", "总作画监督", "动画制作")
-    }
-
-    fun findInfo(vararg keys: String): String? {
-        keys.forEach { key ->
-            return infoBox.find { item ->
-                item.key == key
-            }?.value ?: return@forEach
-        }
-        return null
-    }
-}
-
-@Serializable
-internal data class SearchItem(
-    val id: Int,
-    val name: String,
-    @SerialName("name_cn")
-    val nameCN: String,
-    val summary: String,
-    val images: Images,
-)
-
-@Serializable
-internal data class SearchResponse(val results: Int, val list: List<SearchItem>)
diff --git a/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiScraper.kt b/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiScraper.kt
deleted file mode 100644
index 3653314e..00000000
--- a/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiScraper.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-package eu.kanade.tachiyomi.lib.bangumiscraper
-
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.awaitSuccess
-import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.contentOrNull
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-
-enum class BangumiSubjectType(val value: Int) {
-    BOOK(1),
-    ANIME(2),
-    MUSIC(3),
-    GAME(4),
-    REAL(6),
-}
-
-enum class BangumiFetchType {
-    /**
-     * Give cover and summary info.
-     */
-    SHORT,
-
-    /**
-     * Give all require info include genre and author info.
-     */
-    ALL,
-}
-
-/**
- * A helper class to fetch anime details from Bangumi
- */
-object BangumiScraper {
-    private const val SEARCH_URL = "https://api.bgm.tv/search/subject"
-    private const val SUBJECTS_URL = "https://api.bgm.tv/v0/subjects"
-
-    /**
-     * Fetch anime details info from Bangumi
-     * @param fetchType check [BangumiFetchType] to get detail
-     * @param subjectType check [BangumiSubjectType] to get detail
-     * @param requestProducer used to custom request
-     */
-    suspend fun fetchDetail(
-        client: OkHttpClient,
-        keyword: String,
-        fetchType: BangumiFetchType = BangumiFetchType.SHORT,
-        subjectType: BangumiSubjectType = BangumiSubjectType.ANIME,
-        requestProducer: (url: HttpUrl) -> Request = { url -> GET(url) },
-    ): SAnime {
-        val httpUrl = SEARCH_URL.toHttpUrl().newBuilder()
-            .addPathSegment(keyword)
-            .addQueryParameter(
-                "responseGroup",
-                if (fetchType == BangumiFetchType.ALL) {
-                    "small"
-                } else {
-                    "medium"
-                },
-            )
-            .addQueryParameter("type", "${subjectType.value}")
-            .addQueryParameter("start", "0")
-            .addQueryParameter("max_results", "1")
-            .build()
-        val searchResponse = client.newCall(requestProducer(httpUrl)).awaitSuccess()
-            .checkErrorMessage().parseAs<SearchResponse>()
-        return if (searchResponse.list.isEmpty()) {
-            SAnime.create()
-        } else {
-            val item = searchResponse.list[0]
-            if (fetchType == BangumiFetchType.ALL) {
-                fetchSubject(client, "${item.id}", requestProducer)
-            } else {
-                SAnime.create().apply {
-                    thumbnail_url = item.images.large
-                    description = item.summary
-                }
-            }
-        }
-    }
-
-    private suspend fun fetchSubject(
-        client: OkHttpClient,
-        id: String,
-        requestProducer: (url: HttpUrl) -> Request,
-    ): SAnime {
-        val httpUrl = SUBJECTS_URL.toHttpUrl().newBuilder().addPathSegment(id).build()
-        val subject = client.newCall(requestProducer(httpUrl)).awaitSuccess()
-            .checkErrorMessage().parseAs<Subject>()
-        return SAnime.create().apply {
-            thumbnail_url = subject.images.large
-            description = subject.summary
-            genre = buildList {
-                addAll(subject.metaTags)
-                subject.findInfo("动画制作")?.let { add(it) }
-                subject.findInfo("放送开始")?.let { add(it) }
-            }.joinToString()
-            author = subject.findAuthor()
-            artist = subject.findArtist()
-            if (subject.findInfo("播放结束") != null) {
-                status = SAnime.COMPLETED
-            } else if (subject.findInfo("放送开始") != null) {
-                status = SAnime.ONGOING
-            }
-        }
-    }
-
-    private fun Response.checkErrorMessage(): String {
-        val responseStr = body.string()
-        val errorMessage =
-            responseStr.parseAs<JsonElement>().jsonObject["error"]?.jsonPrimitive?.contentOrNull
-        if (errorMessage != null) {
-            throw BangumiScraperException(errorMessage)
-        }
-        return responseStr
-    }
-}
-
-
-
diff --git a/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiScraperException.kt b/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiScraperException.kt
deleted file mode 100644
index 08d1e308..00000000
--- a/lib/bangumi-scraper/src/main/java/eu/kanade/tachiyomi/lib/bangumiscraper/BangumiScraperException.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package eu.kanade.tachiyomi.lib.bangumiscraper
-
-class BangumiScraperException(message: String) : Exception(message)
diff --git a/src/all/jable/build.gradle b/src/all/jable/build.gradle
new file mode 100644
index 00000000..f9304496
--- /dev/null
+++ b/src/all/jable/build.gradle
@@ -0,0 +1,8 @@
+ext {
+    extName = 'Jable'
+    extClass = '.JableFactory'
+    extVersionCode = 1
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/all/jable/res/mipmap-hdpi/ic_launcher.png b/src/all/jable/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..dc1e7326
Binary files /dev/null and b/src/all/jable/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/all/jable/res/mipmap-mdpi/ic_launcher.png b/src/all/jable/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..6d68c4e1
Binary files /dev/null and b/src/all/jable/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/all/jable/res/mipmap-xhdpi/ic_launcher.png b/src/all/jable/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..f46a5539
Binary files /dev/null and b/src/all/jable/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/all/jable/res/mipmap-xxhdpi/ic_launcher.png b/src/all/jable/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..78f0ad3b
Binary files /dev/null and b/src/all/jable/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/all/jable/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/jable/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..5b55e575
Binary files /dev/null and b/src/all/jable/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt
new file mode 100644
index 00000000..d8b3bc20
--- /dev/null
+++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt
@@ -0,0 +1,248 @@
+package eu.kanade.tachiyomi.animeextension.all.jable
+
+import android.app.Application
+import android.content.SharedPreferences
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimeUpdateStrategy
+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.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+
+class Jable(override val lang: String) : AnimeHttpSource() {
+    override val baseUrl: String
+        get() = "https://jable.tv"
+    override val name: String
+        get() = "Jable"
+    override val supportsLatest: Boolean
+        get() = true
+
+    private val preferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+    private val json by injectLazy<Json>()
+    private var tagsUpdated = false
+
+    override fun animeDetailsRequest(anime: SAnime): Request {
+        return GET("$baseUrl${anime.url}?lang=$lang", headers)
+    }
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val doc = response.asJsoup()
+        return SAnime.create().apply {
+            val info = doc.select(".info-header")
+            title = info.select(".header-left h4").text()
+            author = info.select(".header-left .model")
+                .joinToString { it.select("span[title]").attr("title") }
+            genre = doc.select(".tags a").joinToString { it.text() }
+            update_strategy = AnimeUpdateStrategy.ONLY_FETCH_ONCE
+            status = SAnime.COMPLETED
+            description = info.select(".header-right").text()
+        }
+    }
+
+    override fun episodeListParse(response: Response) = throw UnsupportedOperationException()
+
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
+        return listOf(
+            SEpisode.create().apply {
+                name = "Episode"
+                url = anime.url
+            },
+        )
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val doc = response.asJsoup()
+        val videoUrl = doc.selectFirst("script:containsData(var hlsUrl)")!!.data()
+            .substringAfter("var hlsUrl = '").substringBefore("'")
+        return listOf(Video(videoUrl, "Default", videoUrl))
+    }
+
+    override fun latestUpdatesParse(response: Response): AnimesPage {
+        val doc = response.asJsoup()
+        if (!tagsUpdated) {
+            tagsUpdated = preferences.saveTags(
+                doc.select("a.tag").associate {
+                    it.ownText() to it.attr("href").substringAfter(baseUrl).removePrefix("/")
+                        .removeSuffix("/")
+                },
+            )
+        }
+        return AnimesPage(
+            doc.select(".container .video-img-box").map {
+                SAnime.create().apply {
+                    setUrlWithoutDomain(it.select(".img-box a").attr("href"))
+                    thumbnail_url = it.select(".img-box img").attr("data-src")
+                    title = it.select(".detail .title").text()
+                }
+            },
+            doc.select(".container .pagination .page-item .page-link.disabled").isNullOrEmpty(),
+        )
+    }
+
+    override fun latestUpdatesRequest(page: Int) =
+        searchRequest("latest-updates", page, latestFilter)
+
+    override fun popularAnimeParse(response: Response): AnimesPage = latestUpdatesParse(response)
+
+    override fun popularAnimeRequest(page: Int) =
+        searchRequest("hot", page, popularFilter)
+
+    override fun searchAnimeParse(response: Response) = latestUpdatesParse(response)
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        return if (query.isNotEmpty()) {
+            searchRequest(
+                "search/$query",
+                page,
+                AnimeFilterList(filters.list + defaultSearchFunctionFilter),
+                query = query,
+            )
+        } else {
+            val path = filters.list.filterIsInstance<TagFilter>()
+                .firstOrNull()?.selected?.second?.takeUnless { it.isEmpty() } ?: "hot"
+            searchRequest(path, page, AnimeFilterList(filters.list + commonVideoListFuncFilter))
+        }
+    }
+
+    private fun searchRequest(
+        path: String,
+        page: Int,
+        filters: AnimeFilterList = AnimeFilterList(),
+        query: String = "",
+    ): Request {
+        val urlBuilder = baseUrl.toHttpUrl().newBuilder()
+            .addPathSegments("$path/")
+            .addQueryParameter("lang", lang)
+        if (tagsUpdated) {
+            // load whole page for update filter tags info
+            urlBuilder.addQueryParameter("mode", "async")
+        }
+        filters.list.forEach {
+            when (it) {
+                is BlockFunctionFilter -> {
+                    urlBuilder.addQueryParameter("function", it.selected.functionName)
+                        .addQueryParameter("block_id", it.selected.blockId)
+                }
+
+                is SortFilter -> {
+                    if (it.selected.second.isNotEmpty()) {
+                        urlBuilder.addQueryParameter("sort_by", it.selected.second)
+                    }
+                }
+
+                else -> {}
+            }
+        }
+        if (query.isNotEmpty()) {
+            urlBuilder.addQueryParameter("q", query)
+        }
+        urlBuilder.addQueryParameter("from", "%02d".format(page))
+            .addQueryParameter("_", System.currentTimeMillis().toString())
+        return GET(urlBuilder.build())
+    }
+
+    override fun getFilterList(): AnimeFilterList {
+        return AnimeFilterList(
+            SortFilter(
+                intl.filterPopularSortTitle,
+                arrayOf(
+                    "" to "",
+                    intl.hotMonth to "video_viewed_month",
+                    intl.hotWeek to "video_viewed_week",
+                    intl.hotDay to "video_viewed_today",
+                    intl.hotAll to "video_viewed",
+                ),
+            ),
+            TagFilter(
+                intl.filterTagTitle,
+                buildList {
+                    add("" to "")
+                    preferences.getTags()?.forEach {
+                        add(it.key to it.value)
+                    }
+                }.toTypedArray(),
+            ),
+            SortFilter(
+                intl.filterTagsSortTitle,
+                arrayOf(
+                    "" to "",
+                    intl.sortLatestUpdate to "post_date",
+                    intl.sortMostView to "video_viewed",
+                    intl.sortMostFavorite to "most_favourited",
+                    intl.sortRecentBest to "post_date_and_popularity",
+                ),
+            ),
+        )
+    }
+
+    private fun SharedPreferences.getTags(): Map<String, String>? {
+        val savedStr = getString("${lang}_$PREF_KEY_TAGS", null)
+        if (savedStr.isNullOrEmpty()) {
+            return null
+        }
+        return json.decodeFromString<Map<String, String>>(savedStr)
+    }
+
+    private fun SharedPreferences.saveTags(tags: Map<String, String>): Boolean {
+        if (tags.isNotEmpty()) {
+            edit().putString("${lang}_$PREF_KEY_TAGS", json.encodeToString(tags)).apply()
+            return true
+        }
+        return false
+    }
+
+    private val intl by lazy {
+        JableIntl(lang)
+    }
+
+    private val commonVideoListFuncFilter by lazy {
+        BlockFunctionFilter(
+            intl.popular,
+            arrayOf(BlockFunction(intl.popular, "list_videos_common_videos_list")),
+        )
+    }
+
+    private val defaultSearchFunctionFilter by lazy {
+        BlockFunctionFilter("", arrayOf(BlockFunction("", "list_videos_videos_list_search_result")))
+    }
+
+    private val popularFilter by lazy {
+        AnimeFilterList(
+            commonVideoListFuncFilter,
+            SortFilter(
+                intl.hotWeek,
+                arrayOf(intl.hotWeek to "video_viewed_week"),
+            ),
+        )
+    }
+
+    private val latestFilter by lazy {
+        AnimeFilterList(
+            BlockFunctionFilter(
+                intl.latestUpdate,
+                arrayOf(BlockFunction(intl.latestUpdate, "list_videos_latest_videos_list")),
+            ),
+            SortFilter(
+                intl.sortLatestUpdate,
+                arrayOf(intl.sortLatestUpdate to "post_date"),
+            ),
+        )
+    }
+
+    companion object {
+        const val PREF_KEY_TAGS = "pref_key_tags"
+    }
+}
diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt
new file mode 100644
index 00000000..6faa9a12
--- /dev/null
+++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt
@@ -0,0 +1,14 @@
+package eu.kanade.tachiyomi.animeextension.all.jable
+
+import eu.kanade.tachiyomi.animesource.AnimeSource
+import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
+
+class JableFactory : AnimeSourceFactory {
+    override fun createSources(): List<AnimeSource> {
+        return listOf(
+            Jable("zh"),
+            Jable("en"),
+            Jable("jp"),
+        )
+    }
+}
diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFilters.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFilters.kt
new file mode 100644
index 00000000..133731b0
--- /dev/null
+++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFilters.kt
@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.animeextension.all.jable
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+
+data class BlockFunction(
+    val name: String,
+    val blockId: String,
+    val functionName: String = "get_block",
+)
+
+class BlockFunctionFilter(name: String, private val functions: Array<BlockFunction>) :
+    AnimeFilter.Select<String>(name, functions.map { it.name }.toTypedArray()) {
+    val selected
+        get() = functions[state]
+}
+
+open class UriPartFilter(name: String, private val pairs: Array<Pair<String, String>>) :
+    AnimeFilter.Select<String>(name, pairs.map { it.first }.toTypedArray()) {
+    val selected
+        get() = pairs[state]
+}
+
+class SortFilter(name: String, pairs: Array<Pair<String, String>>) : UriPartFilter(name, pairs)
+
+class TagFilter(name: String, pairs: Array<Pair<String, String>>) : UriPartFilter(name, pairs)
diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt
new file mode 100644
index 00000000..9fe6f869
--- /dev/null
+++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt
@@ -0,0 +1,76 @@
+package eu.kanade.tachiyomi.animeextension.all.jable
+
+internal interface Intl {
+    val popular: String
+    val latestUpdate: String
+    val sortLatestUpdate: String
+    val sortMostView: String
+    val sortMostFavorite: String
+    val sortRecentBest: String
+    val hotDay: String
+    val hotWeek: String
+    val hotMonth: String
+    val hotAll: String
+    val filterPopularSortTitle: String
+    val filterTagsSortTitle: String
+    val filterTagTitle: String
+}
+
+internal class JableIntl private constructor(delegate: Intl) : Intl by delegate {
+    constructor(lang: String) : this(
+        when (lang) {
+            "zh" -> ZH()
+            "jp" -> JP()
+            "en" -> EN()
+            else -> ZH()
+        },
+    )
+}
+
+internal class ZH : Intl {
+    override val popular: String = "熱度優先"
+    override val latestUpdate: String = "新片優先"
+    override val sortLatestUpdate: String = "最近更新"
+    override val sortMostView: String = "最多觀看"
+    override val sortMostFavorite: String = "最高收藏"
+    override val sortRecentBest: String = "近期最佳"
+    override val hotDay: String = "今日熱門"
+    override val hotWeek: String = "本周熱門"
+    override val hotMonth: String = "本月熱門"
+    override val hotAll: String = "所有時間"
+    override val filterPopularSortTitle: String = "熱門排序"
+    override val filterTagsSortTitle: String = "通用排序"
+    override val filterTagTitle: String = "標籤"
+}
+
+internal class JP : Intl {
+    override val popular: String = "人気優先"
+    override val latestUpdate: String = "新作優先"
+    override val sortLatestUpdate: String = "最近更新"
+    override val sortMostView: String = "最も見ら"
+    override val sortMostFavorite: String = "最もお気に入"
+    override val sortRecentBest: String = "最近ベスト"
+    override val hotDay: String = "今日のヒット"
+    override val hotWeek: String = "今週のヒット"
+    override val hotMonth: String = "今月のヒット"
+    override val hotAll: String = "全ての時間"
+    override val filterPopularSortTitle: String = "人気ソート"
+    override val filterTagsSortTitle: String = "一般ソート"
+    override val filterTagTitle: String = "タグ"
+}
+
+internal class EN : Intl {
+    override val popular: String = "Hot"
+    override val latestUpdate: String = "Newest"
+    override val sortLatestUpdate: String = "Recent Update"
+    override val sortMostView: String = "Most Viewed"
+    override val sortMostFavorite: String = "Most Favorite"
+    override val sortRecentBest: String = "Best Recently"
+    override val hotDay: String = "Today"
+    override val hotWeek: String = "This Week"
+    override val hotMonth: String = "This Month"
+    override val hotAll: String = "All Time"
+    override val filterPopularSortTitle: String = "Popular Sorting"
+    override val filterTagsSortTitle: String = "General Sorting"
+    override val filterTagTitle: String = "Tag"
+}
diff --git a/src/all/javgg/build.gradle b/src/all/javgg/build.gradle
deleted file mode 100644
index 0eb8e1f5..00000000
--- a/src/all/javgg/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-ext {
-    extName = 'JavGG'
-    extClass = '.Javgg'
-    extVersionCode = 1
-    isNsfw = true
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib:yourupload-extractor'))
-}
\ No newline at end of file
diff --git a/src/all/javgg/res/mipmap-hdpi/ic_launcher.png b/src/all/javgg/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8c9e788a..00000000
Binary files a/src/all/javgg/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/javgg/res/mipmap-mdpi/ic_launcher.png b/src/all/javgg/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e4305bfd..00000000
Binary files a/src/all/javgg/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/javgg/res/mipmap-xhdpi/ic_launcher.png b/src/all/javgg/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 7f0bb954..00000000
Binary files a/src/all/javgg/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/javgg/res/mipmap-xxhdpi/ic_launcher.png b/src/all/javgg/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 2d9fd339..00000000
Binary files a/src/all/javgg/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/javgg/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/javgg/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 9c632b88..00000000
Binary files a/src/all/javgg/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/javgg/src/eu/kanade/tachiyomi/animeextension/all/javgg/Javgg.kt b/src/all/javgg/src/eu/kanade/tachiyomi/animeextension/all/javgg/Javgg.kt
deleted file mode 100644
index 20179da6..00000000
--- a/src/all/javgg/src/eu/kanade/tachiyomi/animeextension/all/javgg/Javgg.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.all.javgg
-
-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.streamhidevidextractor.StreamHideVidExtractor
-import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
-import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
-import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
-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
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-
-class Javgg : ConfigurableAnimeSource, AnimeHttpSource() {
-
-    override val name = "JavGG"
-
-    override val baseUrl = "https://javgg.net"
-
-    override val lang = "all"
-
-    override val supportsLatest = true
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    companion object {
-        private const val PREF_QUALITY_KEY = "preferred_quality"
-        private const val PREF_QUALITY_DEFAULT = "1080"
-        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
-
-        private const val PREF_SERVER_KEY = "preferred_server"
-        private const val PREF_SERVER_DEFAULT = "StreamWish"
-        private val SERVER_LIST = arrayOf(
-            "StreamWish",
-            "Voe",
-            "Okru",
-            "YourUpload",
-            "FileLions",
-            "StreamHideVid",
-            "TurboPlay",
-        )
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val document = response.asJsoup()
-        val animeDetails = SAnime.create().apply {
-            status = SAnime.COMPLETED
-            description = document.selectFirst("#cover")?.text()
-        }
-
-        document.select(".data .boxye2").forEach { element ->
-            val category = element.select("[id*=owye2]").text().trim()
-            val tags = element.select(".sgeneros3 a").joinToString { it.text() }
-            when {
-                category.contains("Genres:") -> animeDetails.genre = tags
-                category.contains("Cast:") -> animeDetails.artist = tags
-                category.contains("Maker:") -> animeDetails.author = tags
-            }
-        }
-
-        return animeDetails
-    }
-
-    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/trending/page/$page", headers)
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val elements = document.select("article[id*=post-]")
-        val nextPage = document.select("#nextpagination").any()
-        val animeList = elements.map { element ->
-            SAnime.create().apply {
-                setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href"))
-                title = element.selectFirst(".data h3")!!.text()
-                thumbnail_url = element.selectFirst(".poster")?.getImageUrl()
-            }
-        }
-        return AnimesPage(animeList, nextPage)
-    }
-
-    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
-
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/new-post/page/$page", headers)
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        return when {
-            query.isNotBlank() -> GET("$baseUrl/jav/page/$page?s=$query", headers)
-            else -> popularAnimeRequest(page)
-        }
-    }
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val elements = document.select(".result-item article")
-        val nextPage = document.select("#nextpagination").any()
-        val animeList = elements.map { element ->
-            SAnime.create().apply {
-                setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href"))
-                title = element.selectFirst(".details .title")!!.text()
-                thumbnail_url = element.selectFirst(".image")?.getImageUrl()
-            }
-        }
-        return AnimesPage(animeList, nextPage)
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.asJsoup()
-        return if (document.select(".dooplay_player_option").any()) {
-            listOf(
-                SEpisode.create().apply {
-                    name = "Episode 1"
-                    episode_number = 1F
-                    setUrlWithoutDomain(document.location())
-                },
-            )
-        } else {
-            emptyList()
-        }
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        return document.select("[id*=source-player] iframe").parallelCatchingFlatMapBlocking {
-            val numOpt = it.closest(".source-box")?.attr("id")?.replace("source-player-", "")
-            val serverName = document.select("[data-nume=\"$numOpt\"] .server").text()
-            serverVideoResolver(serverName, it.attr("src"))
-        }
-    }
-
-    private fun serverVideoResolver(server: String, url: String): List<Video> {
-        val embedUrl = server.lowercase()
-        return when {
-            embedUrl.contains("ok.ru") || embedUrl.contains("okru") -> OkruExtractor(client).videosFromUrl(url)
-            embedUrl.contains("filelions") || embedUrl.contains("lion") -> StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" })
-            embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish") -> {
-                val docHeaders = headers.newBuilder()
-                    .add("Origin", "https://streamwish.to")
-                    .add("Referer", "https://streamwish.to/")
-                    .build()
-                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
-            }
-            embedUrl.contains("vidhide") || embedUrl.contains("streamhide") ||
-                embedUrl.contains("guccihide") || embedUrl.contains("streamvid") -> StreamHideVidExtractor(client).videosFromUrl(url)
-            embedUrl.contains("voe") -> VoeExtractor(client).videosFromUrl(url)
-            embedUrl.contains("yourupload") || embedUrl.contains("upload") -> YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            embedUrl.contains("turboplay") -> {
-                val turboDocument = client.newCall(GET(url)).execute().asJsoup()
-                val masterUrl = turboDocument.select("#video_player").attr("data-hash")
-                val customHeaders = headers.newBuilder().apply {
-                    add("Accept", "*/*")
-                    add("Origin", "https://${turboDocument.location().toHttpUrl().host}")
-                    add("Referer", "https://${turboDocument.location().toHttpUrl().host}/")
-                }.build()
-
-                listOf(Video(masterUrl, "TurboPlay", masterUrl, customHeaders))
-            }
-            else -> emptyList()
-        }
-    }
-
-    private fun org.jsoup.nodes.Element.getImageUrl(): String? {
-        val imageLinkRegex = """https?://[^\s]+\.(jpg|png)""".toRegex()
-
-        for (link in this.select("[href], [src]")) {
-            val href = link.attr("href")
-            val src = link.attr("src")
-            if (imageLinkRegex.matches(href)) {
-                return href
-            }
-            if (imageLinkRegex.matches(src)) {
-                return src
-            }
-        }
-
-        val textMatches = imageLinkRegex.find(this.text())
-        val htmlMatches = imageLinkRegex.find(this.outerHtml())
-        return textMatches?.value ?: htmlMatches?.value
-    }
-
-    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 = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }.also(screen::addPreference)
-
-        ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
-            entries = QUALITY_LIST
-            entryValues = QUALITY_LIST
-            setDefaultValue(PREF_QUALITY_DEFAULT)
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }.also(screen::addPreference)
-    }
-}
diff --git a/src/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/tr/hentaizm/build.gradle b/src/tr/hentaizm/build.gradle
index 5bb30fba..5d16803f 100644
--- a/src/tr/hentaizm/build.gradle
+++ b/src/tr/hentaizm/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiZM'
     extClass = '.HentaiZM'
-    extVersionCode = 6
+    extVersionCode = 5
     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 c7014c8a..30de4fc5 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.hentaizm1.online/"
+    override val baseUrl = "https://www.hentaizm.cam"
 
     override val lang = "tr"
 
diff --git a/src/zh/anime1/build.gradle b/src/zh/anime1/build.gradle
deleted file mode 100644
index 96c45c2d..00000000
--- a/src/zh/anime1/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-ext {
-    extName = 'Anime1.me'
-    extClass = '.Anime1'
-    extVersionCode = 3
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(":lib:bangumi-scraper"))
-    //noinspection UseTomlInstead
-    implementation "com.github.houbb:opencc4j:1.8.1"
-}
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 59014492..00000000
--- a/src/zh/anime1/src/eu/kanade/tachiyomi/animeextension/zh/anime1/Anime1.kt
+++ /dev/null
@@ -1,272 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.zh.anime1
-
-import android.app.Application
-import android.content.SharedPreferences
-import android.webkit.CookieManager
-import androidx.preference.CheckBoxPreference
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import com.github.houbb.opencc4j.util.ZhTwConverterUtil
-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.bangumiscraper.BangumiFetchType
-import eu.kanade.tachiyomi.lib.bangumiscraper.BangumiScraper
-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 uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-class Anime1 : AnimeHttpSource(), ConfigurableAnimeSource {
-    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()
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    override fun animeDetailsParse(response: Response) = throw UnsupportedOperationException()
-
-    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
-        return if (bangumiEnable) {
-            BangumiScraper.fetchDetail(
-                client,
-                ZhTwConverterUtil.toSimple(anime.title.removeSuffixMark()),
-                fetchType = bangumiFetchType,
-            )
-        } else {
-            anime.thumbnail_url = FIX_COVER
-            anime
-        }
-    }
-
-    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())
-    }
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val bangumiScraper = CheckBoxPreference(screen.context).apply {
-            key = PREF_KEY_BANGUMI
-            title = "啟用Bangumi刮削"
-        }
-        val bangumiFetchType = ListPreference(screen.context).apply {
-            key = PREF_KEY_BANGUMI_FETCH_TYPE
-            title = "詳情拉取設置"
-            setVisible(bangumiEnable)
-            entries = arrayOf("拉取部分數據", "拉取完整數據")
-            entryValues = arrayOf(BangumiFetchType.SHORT.name, BangumiFetchType.ALL.name)
-            setDefaultValue(entryValues[0])
-            summary = when (bangumiFetchType) {
-                BangumiFetchType.SHORT -> entries[0]
-                BangumiFetchType.ALL -> entries[1]
-                else -> entries[0]
-            }
-            setOnPreferenceChangeListener { _, value ->
-                summary = when (value) {
-                    BangumiFetchType.SHORT.name -> entries[0]
-                    BangumiFetchType.ALL.name -> entries[1]
-                    else -> entries[0]
-                }
-                true
-            }
-        }
-        bangumiScraper.setOnPreferenceChangeListener { _, value ->
-            bangumiFetchType.setVisible(value as Boolean)
-            true
-        }
-        screen.apply {
-            addPreference(bangumiScraper)
-            addPreference(bangumiFetchType)
-        }
-    }
-
-    private val bangumiEnable: Boolean
-        get() = preferences.getBoolean(PREF_KEY_BANGUMI, false)
-    private val bangumiFetchType: BangumiFetchType
-        get() {
-            val fetchTypeName =
-                preferences.getString(PREF_KEY_BANGUMI_FETCH_TYPE, BangumiFetchType.SHORT.name)
-            return when (fetchTypeName) {
-                BangumiFetchType.SHORT.name -> BangumiFetchType.SHORT
-                BangumiFetchType.ALL.name -> BangumiFetchType.ALL
-                else -> BangumiFetchType.SHORT
-            }
-        }
-
-    private fun JsonArray.getContent(index: Int): String? {
-        return getOrNull(index)?.jsonPrimitive?.contentOrNull
-    }
-
-    private fun String.removeSuffixMark(): String {
-        return removeBracket("(", ")").removeBracket("[", "]").trim()
-    }
-
-    private fun String.removeBracket(start: String, end: String): String {
-        val seasonStart = indexOf(start)
-        val seasonEnd = indexOf(end)
-        if (seasonEnd > seasonStart) {
-            return removeRange(seasonStart, seasonEnd + 1)
-        }
-        return this
-    }
-
-    companion object {
-        const val PAGE_SIZE = 20
-        const val FIX_COVER = "https://sta.anicdn.com/playerImg/8.jpg"
-
-        const val PREF_KEY_BANGUMI = "PREF_KEY_BANGUMI"
-        const val PREF_KEY_BANGUMI_FETCH_TYPE = "PREF_KEY_BANGUMI_FETCH_TYPE"
-    }
-}
-
-@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
index 9026207b..9f76db85 100644
--- a/src/zh/hanime1/build.gradle
+++ b/src/zh/hanime1/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hanime1'
     extClass = '.Hanime1'
-    extVersionCode = 2
+    extVersionCode = 1
     isNsfw = true
 }
 
diff --git a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt b/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
index 49f297c0..473b29e7 100644
--- a/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
+++ b/src/zh/hanime1/src/eu/kanade/tachiyomi/animeextension/zh/hanime1/Hanime1.kt
@@ -154,22 +154,7 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
         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 {
+        filters.list.forEach {
             when (it) {
                 is QueryFilter -> {
                     if (it.selected.isNotEmpty()) {
@@ -177,18 +162,7 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
                     }
                 }
 
-                is BroadMatchFilter -> {
-                    if (it.state) {
-                        searchUrl.addQueryParameter(it.key, "on")
-                    }
-                }
-
-                is TagFilter -> {
-                    if (it.state) {
-                        searchUrl.addQueryParameter(it.key, it.name)
-                    }
-                }
-
+                is TagFilter -> searchUrl.addQueryParameter(it.key, it.name)
                 else -> {}
             }
         }
@@ -284,8 +258,7 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
                 entries = arrayOf("1080P", "720P", "480P")
                 entryValues = entries
                 setDefaultValue(DEFAULT_QUALITY)
-                summary =
-                    "當前選擇：${preferences.getString(PREF_KEY_VIDEO_QUALITY, DEFAULT_QUALITY)}"
+                summary = "當前選擇：${preferences.getString(PREF_KEY_VIDEO_QUALITY, DEFAULT_QUALITY)}"
                 setOnPreferenceChangeListener { _, newValue ->
                     summary = "當前選擇：${newValue as String}"
                     true
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,
-        )
-    }
-}