From 821cbc1d59eb646b14134f45726ed975840ca8b5 Mon Sep 17 00:00:00 2001
From: V3u47ZoN <V3u47ZoN.PTht@oxmail.homes>
Date: Thu, 1 May 2025 10:16:57 +0000
Subject: [PATCH] Fix hikari (#963)

* add hikari

* mass bump due for extractor changes
---
 lib/buzzheavier-extractor/build.gradle.kts    |   3 +
 .../BuzzheavierExtractor.kt                   |  52 +++
 .../lib/chillxextractor/ChillxExtractor.kt    |  66 +--
 .../lib/chillxextractor/WebViewResolver.kt    | 124 ++++++
 .../filemoonextractor/FilemoonExtractor.kt    |  44 +-
 lib/savefile-extractor/build.gradle.kts       |   7 +
 .../savefileextractor/SavefileExtractor.kt    |  67 +++
 .../StreamWishExtractor.kt                    |  25 +-
 src/all/chineseanime/build.gradle             |   2 +-
 src/all/hikari/build.gradle                   |   7 +-
 .../animeextension/all/hikari/Dto.kt          |  92 ++++
 .../animeextension/all/hikari/Filters.kt      | 182 ++------
 .../animeextension/all/hikari/Hikari.kt       | 402 ++++++------------
 src/all/javgg/build.gradle                    |   2 +-
 src/all/javguru/build.gradle                  |   2 +-
 src/all/lmanime/build.gradle                  |   2 +-
 src/all/supjav/build.gradle                   |   2 +-
 src/ar/anime4up/build.gradle                  |   2 +-
 src/ar/animerco/build.gradle                  |   2 +-
 src/ar/arabseed/build.gradle                  |   2 +-
 src/ar/asia2tv/build.gradle                   |   2 +-
 src/ar/egydead/build.gradle                   |   2 +-
 src/de/animebase/build.gradle                 |   2 +-
 src/de/animetoast/build.gradle                |   2 +-
 src/de/cinemathek/build.gradle                |   2 +-
 src/de/einfach/build.gradle                   |   2 +-
 src/de/kool/build.gradle                      |   2 +-
 src/de/moflixstream/build.gradle              |   2 +-
 src/en/allanime/build.gradle                  |   2 +-
 src/en/allanimechi/build.gradle               |   2 +-
 src/en/animekhor/build.gradle                 |   2 +-
 src/en/animenosub/build.gradle                |   2 +-
 src/en/animetake/build.gradle                 |   2 +-
 src/en/asiaflix/build.gradle                  |   2 +-
 src/en/luciferdonghua/build.gradle            |   2 +-
 src/en/tokuzilla/build.gradle                 |   2 +-
 src/es/animebum/build.gradle                  |   2 +-
 src/es/animefenix/build.gradle                |   2 +-
 src/es/animeflv/build.gradle                  |   2 +-
 src/es/animeid/build.gradle                   |   2 +-
 src/es/animejl/build.gradle                   |   2 +-
 src/es/animelatinohd/build.gradle             |   2 +-
 src/es/animemovil/build.gradle                |   2 +-
 src/es/animenix/build.gradle                  |   2 +-
 src/es/animeonlineninja/build.gradle          |   2 +-
 src/es/animeytes/build.gradle                 |   2 +-
 src/es/asialiveaction/build.gradle            |   2 +-
 src/es/cine24h/build.gradle                   |   2 +-
 src/es/cinecalidad/build.gradle               |   2 +-
 src/es/cineplus123/build.gradle               |   2 +-
 src/es/cuevana/build.gradle                   |   2 +-
 src/es/detodopeliculas/build.gradle           |   2 +-
 src/es/doramasflix/build.gradle               |   2 +-
 src/es/doramasyt/build.gradle                 |   2 +-
 src/es/estrenosdoramas/build.gradle           |   2 +-
 src/es/flixlatam/build.gradle                 |   2 +-
 src/es/gnula/build.gradle                     |   2 +-
 src/es/hackstore/build.gradle                 |   2 +-
 src/es/hentaila/build.gradle                  |   2 +-
 src/es/hentaitk/build.gradle                  |   2 +-
 src/es/homecine/build.gradle                  |   2 +-
 src/es/jkanime/build.gradle                   |   2 +-
 src/es/katanime/build.gradle                  |   2 +-
 src/es/lacartoons/build.gradle                |   2 +-
 src/es/legionanime/build.gradle               |   2 +-
 src/es/metroseries/build.gradle               |   2 +-
 src/es/mhdflix/build.gradle                   |   2 +-
 src/es/monoschinos/build.gradle               |   2 +-
 src/es/mundodonghua/build.gradle              |   2 +-
 src/es/otakuverso/build.gradle                |   2 +-
 src/es/pelisforte/build.gradle                |   2 +-
 src/es/pelisplushd/build.gradle               |   2 +-
 src/es/serieskao/build.gradle                 |   2 +-
 src/es/sololatino/build.gradle                |   2 +-
 src/es/veranimes/build.gradle                 |   2 +-
 src/es/verseriesonline/build.gradle           |   2 +-
 src/es/zeroanime/build.gradle                 |   2 +-
 src/es/zonaleros/build.gradle                 |   2 +-
 src/fr/anisama/build.gradle                   |   2 +-
 src/fr/hds/build.gradle                       |   2 +-
 src/fr/otakufr/build.gradle                   |   2 +-
 src/hi/animesaga/build.gradle                 |   2 +-
 src/id/otakudesu/build.gradle                 |   2 +-
 src/pt/animesgratis/build.gradle              |   2 +-
 src/sr/animesrbija/build.gradle               |   2 +-
 src/tr/animeler/build.gradle                  |   2 +-
 src/tr/anizm/build.gradle                     |   2 +-
 src/tr/tranimeizle/build.gradle               |   2 +-
 src/tr/turkanime/build.gradle                 |   2 +-
 89 files changed, 668 insertions(+), 557 deletions(-)
 create mode 100644 lib/buzzheavier-extractor/build.gradle.kts
 create mode 100644 lib/buzzheavier-extractor/src/main/java/eu/kanade/tachiyomi/lib/buzzheavierextractor/BuzzheavierExtractor.kt
 create mode 100644 lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/WebViewResolver.kt
 create mode 100644 lib/savefile-extractor/build.gradle.kts
 create mode 100644 lib/savefile-extractor/src/main/java/eu/kanade/tachiyomi/lib/savefileextractor/SavefileExtractor.kt
 create mode 100644 src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Dto.kt

diff --git a/lib/buzzheavier-extractor/build.gradle.kts b/lib/buzzheavier-extractor/build.gradle.kts
new file mode 100644
index 00000000..c26cbc8a
--- /dev/null
+++ b/lib/buzzheavier-extractor/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+    id("lib-android")
+}
diff --git a/lib/buzzheavier-extractor/src/main/java/eu/kanade/tachiyomi/lib/buzzheavierextractor/BuzzheavierExtractor.kt b/lib/buzzheavier-extractor/src/main/java/eu/kanade/tachiyomi/lib/buzzheavierextractor/BuzzheavierExtractor.kt
new file mode 100644
index 00000000..38131740
--- /dev/null
+++ b/lib/buzzheavier-extractor/src/main/java/eu/kanade/tachiyomi/lib/buzzheavierextractor/BuzzheavierExtractor.kt
@@ -0,0 +1,52 @@
+package eu.kanade.tachiyomi.lib.buzzheavierextractor
+
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.internal.EMPTY_HEADERS
+
+class BuzzheavierExtractor(
+    private val client: OkHttpClient,
+    private val headers: Headers,
+) {
+
+    @OptIn(ExperimentalSerializationApi::class)
+    fun videosFromUrl(url: String, prefix: String = "Buzzheavier - ", proxyUrl: String? = null): List<Video> {
+        val httpUrl = url.toHttpUrl()
+        val id = httpUrl.pathSegments.first()
+
+        val dlHeaders = headers.newBuilder().apply {
+            add("Accept", "*/*")
+            add("Host", httpUrl.host)
+            add("HX-Current-URL", url)
+            add("HX-Request", "true")
+            add("Referer", url)
+        }.build()
+
+        val videoHeaders = headers.newBuilder().apply {
+            add("Referer", url)
+        }.build()
+
+        val path = client.newCall(GET("$url/download", dlHeaders)).execute().headers["hx-redirect"].orEmpty()
+
+        return if (path.isNotEmpty()) {
+            val videoUrl = if (path.startsWith("http")) path else "https://${httpUrl.host}$path"
+            listOf(Video(videoUrl, "${prefix}Video", videoUrl, videoHeaders))
+        } else if (proxyUrl?.isNotEmpty() == true) {
+            val videoUrl = client.newCall(GET(proxyUrl + id)).execute().parseAs<UrlDto>().url
+            listOf(Video(videoUrl, "${prefix}Video", videoUrl, videoHeaders))
+        } else {
+            emptyList()
+        }
+    }
+
+    @Serializable
+    data class UrlDto(val url: String)
+}
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 747db057..5d10181e 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
@@ -1,73 +1,53 @@
 package eu.kanade.tachiyomi.lib.chillxextractor
 
-import android.util.Log
 import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.OkHttpClient
-import uy.kohesive.injekt.injectLazy
 
 class ChillxExtractor(private val client: OkHttpClient, private val headers: Headers) {
-    private val json: Json by injectLazy()
     private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+    private val webViewResolver by lazy { WebViewResolver(client, headers) }
 
     companion object {
-        private val REGEX_MASTER_JS = Regex("""\s*=\s*'([^']+)""")
         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 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()
+    fun videoFromUrl(url: String, prefix: String = "Chillx - "): List<Video> {
+        val data = webViewResolver.getDecryptedData(url) ?: return emptyList()
 
-        val body = client.newCall(GET(url, newHeaders)).execute().body.string()
-
-        val master = REGEX_MASTER_JS.find(body)?.groupValues?.get(1) ?: return emptyList()
-        val aesJson = json.decodeFromString<CryptoInfo>(master)
-        val key = fetchKey() ?: throw ErrorLoadingException("Unable to get key")
-        val decryptedScript = CryptoAES.decryptWithSalt(aesJson.ciphertext, aesJson.salt, key)
-            .replace("\\n", "\n")
-            .replace("\\", "")
-
-        val masterUrl = REGEX_SOURCES.find(decryptedScript)?.groupValues?.get(1)
-            ?: REGEX_FILE.find(decryptedScript)?.groupValues?.get(1)
-            ?: REGEX_SOURCE.find(decryptedScript)?.groupValues?.get(1)
+        val masterUrl = REGEX_SOURCES.find(data)?.groupValues?.get(1)
+            ?: REGEX_FILE.find(data)?.groupValues?.get(1)
+            ?: REGEX_SOURCE.find(data)?.groupValues?.get(1)
             ?: return emptyList()
 
         val subtitleList = buildList {
-            val subtitles = REGEX_SUBS.findAll(decryptedScript)
+            val subtitles = REGEX_SUBS.findAll(data)
             subtitles.forEach {
-                Log.d("ChillxExtractor", "Found subtitle: ${it.groupValues}")
                 add(Track(it.groupValues[1], decodeUnicodeEscape(it.groupValues[2])))
             }
         }
 
-        return playlistUtils.extractFromHls(
+        val videoList = playlistUtils.extractFromHls(
             playlistUrl = masterUrl,
             referer = url,
             videoNameGen = { "$prefix$it" },
             subtitleList = subtitleList,
         )
-    }
 
-    @OptIn(ExperimentalSerializationApi::class)
-    private fun fetchKey(): String? {
-        return client.newCall(GET(KEY_SOURCE)).execute().parseAs<KeysData>().keys.firstOrNull()
+        return videoList.map {
+            Video(
+                url = it.url,
+                quality = it.quality,
+                videoUrl = it.videoUrl,
+                audioTracks = it.audioTracks,
+                subtitleTracks = playlistUtils.fixSubtitles(it.subtitleTracks),
+            )
+        }
     }
 
     private fun decodeUnicodeEscape(input: String): String {
@@ -76,16 +56,4 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
             it.groupValues[1].toInt(16).toChar().toString()
         }
     }
-
-    @Serializable
-    data class CryptoInfo(
-        @SerialName("ct") val ciphertext: String,
-        @SerialName("s") val salt: String,
-    )
-
-    @Serializable
-    data class KeysData(
-        @SerialName("chillx") val keys: List<String>
-    )
 }
-class ErrorLoadingException(message: String) : Exception(message)
diff --git a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/WebViewResolver.kt b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/WebViewResolver.kt
new file mode 100644
index 00000000..ced513b1
--- /dev/null
+++ b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/WebViewResolver.kt
@@ -0,0 +1,124 @@
+package eu.kanade.tachiyomi.lib.chillxextractor
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.os.Handler
+import android.os.Looper
+import android.webkit.JavascriptInterface
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
+import java.io.ByteArrayInputStream
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class WebViewResolver(
+    private val client: OkHttpClient,
+    private val globalHeaders: Headers,
+) {
+    private val context: Application by injectLazy()
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+
+    class JsInterface(private val latch: CountDownLatch) {
+        var result: String? = null
+
+        @JavascriptInterface
+        fun passPayload(payload: String) {
+            result = payload
+            latch.countDown()
+        }
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    fun getDecryptedData(embedUrl: String): String? {
+        val latch = CountDownLatch(1)
+        var webView: WebView? = null
+        val jsi = JsInterface(latch)
+        val interfaceName = randomString()
+
+        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.addJavascriptInterface(jsi, interfaceName)
+            webview.webViewClient = object : WebViewClient() {
+                override fun shouldInterceptRequest(
+                    view: WebView?,
+                    request: WebResourceRequest?
+                ): WebResourceResponse? {
+                    if (request?.url.toString().contains("assets/js/library")) {
+                        return patchScript(request!!.url.toString(), interfaceName)
+                            ?: super.shouldInterceptRequest(view, request)
+                    }
+
+                    return super.shouldInterceptRequest(view, request)
+                }
+            }
+
+            webView?.loadUrl(embedUrl)
+        }
+
+        latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+            webView = null
+        }
+
+        return jsi.result
+    }
+
+    companion object {
+        const val TIMEOUT_SEC: Long = 30
+    }
+
+    private fun randomString(length: Int = 10): String {
+        val charPool = ('a'..'z') + ('A'..'Z')
+        return List(length) { charPool.random() }.joinToString("")
+    }
+
+    private fun patchScript(scriptUrl: String, interfaceName: String): WebResourceResponse? {
+        val scriptBody = client.newCall(GET(scriptUrl)).execute().body.string()
+
+        val oldFunc = randomString()
+        val newBody = buildString {
+            append(
+                """
+                    const $oldFunc = Function;
+                    window.Function = function (...args) {
+                      if (args.length == 1) {
+                        window.$interfaceName.passPayload(args[0]);
+                      }
+                      return $oldFunc(...args);
+                    };
+                """.trimIndent()
+            )
+            append(scriptBody)
+        }
+
+
+        return WebResourceResponse(
+            "application/javascript",
+            "utf-8",
+            200,
+            "ok",
+            mapOf("server" to "cloudflare"),
+            ByteArrayInputStream(newBody.toByteArray()),
+        )
+    }
+}
diff --git a/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt b/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt
index 567bf3bb..70250a71 100644
--- a/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt
+++ b/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt
@@ -1,5 +1,8 @@
 package eu.kanade.tachiyomi.lib.filemoonextractor
 
+import android.content.SharedPreferences
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceScreen
 import dev.datlag.jsunpacker.JsUnpacker
 import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
@@ -13,20 +16,28 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import uy.kohesive.injekt.injectLazy
 
-class FilemoonExtractor(private val client: OkHttpClient) {
+class FilemoonExtractor(
+    private val client: OkHttpClient,
+    private val preferences: SharedPreferences? = null,
+) {
 
     private val playlistUtils by lazy { PlaylistUtils(client) }
     private val json: Json by injectLazy()
 
     fun videosFromUrl(url: String, prefix: String = "Filemoon - ", headers: Headers? = null): List<Video> {
-        val httpUrl = url.toHttpUrl()
+        var httpUrl = url.toHttpUrl()
         val videoHeaders = (headers?.newBuilder() ?: Headers.Builder())
             .set("Referer", url)
             .set("Origin", "https://${httpUrl.host}")
             .build()
 
         val doc = client.newCall(GET(url, videoHeaders)).execute().asJsoup()
-        val jsEval = doc.selectFirst("script:containsData(eval):containsData(m3u8)")!!.data()
+        val jsEval = doc.selectFirst("script:containsData(eval):containsData(m3u8)")?.data() ?: run {
+            val iframeUrl = doc.selectFirst("iframe[src]")!!.attr("src")
+            httpUrl = iframeUrl.toHttpUrl()
+            val iframeDoc = client.newCall(GET(iframeUrl, videoHeaders)).execute().asJsoup()
+            iframeDoc.selectFirst("script:containsData(eval):containsData(m3u8)")!!.data()
+        }
         val unpacked = JsUnpacker.unpackAndCombine(jsEval).orEmpty()
         val masterUrl = unpacked.takeIf(String::isNotBlank)
             ?.substringAfter("{file:\"", "")
@@ -50,14 +61,39 @@ class FilemoonExtractor(private val client: OkHttpClient) {
             }
         }
 
-        return playlistUtils.extractFromHls(
+        val videoList = playlistUtils.extractFromHls(
             masterUrl,
             subtitleList = subtitleTracks,
             referer = "https://${httpUrl.host}/",
             videoNameGen = { "$prefix$it" },
         )
+
+        val subPref = preferences?.getString(PREF_SUBTITLE_KEY, PREF_SUBTITLE_DEFAULT).orEmpty()
+        return videoList.map {
+            Video(
+                url = it.url,
+                quality = it.quality,
+                videoUrl = it.videoUrl,
+                audioTracks = it.audioTracks,
+                subtitleTracks = it.subtitleTracks.filter { tracks -> tracks.lang.contains(subPref, true) }
+            )
+        }
     }
 
     @Serializable
     data class SubtitleDto(val file: String, val label: String)
+
+    companion object {
+        fun addSubtitlePref(screen: PreferenceScreen) {
+            EditTextPreference(screen.context).apply {
+                key = PREF_SUBTITLE_KEY
+                title = "Filemoon subtitle preference"
+                summary = "Leave blank to use all subs"
+                setDefaultValue(PREF_SUBTITLE_DEFAULT)
+            }.also(screen::addPreference)
+        }
+
+        private const val PREF_SUBTITLE_KEY = "pref_filemoon_sub_lang_key"
+        private const val PREF_SUBTITLE_DEFAULT = "eng"
+    }
 }
diff --git a/lib/savefile-extractor/build.gradle.kts b/lib/savefile-extractor/build.gradle.kts
new file mode 100644
index 00000000..d31dd9ff
--- /dev/null
+++ b/lib/savefile-extractor/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("lib-android")
+}
+
+dependencies {
+    implementation(project(":lib:playlist-utils"))
+}
diff --git a/lib/savefile-extractor/src/main/java/eu/kanade/tachiyomi/lib/savefileextractor/SavefileExtractor.kt b/lib/savefile-extractor/src/main/java/eu/kanade/tachiyomi/lib/savefileextractor/SavefileExtractor.kt
new file mode 100644
index 00000000..d2abbf54
--- /dev/null
+++ b/lib/savefile-extractor/src/main/java/eu/kanade/tachiyomi/lib/savefileextractor/SavefileExtractor.kt
@@ -0,0 +1,67 @@
+package eu.kanade.tachiyomi.lib.savefileextractor
+
+import android.content.SharedPreferences
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+
+class SavefileExtractor(
+    private val client: OkHttpClient,
+    private val preferences: SharedPreferences,
+) {
+
+    private val playlistUtils by lazy { PlaylistUtils(client) }
+
+    fun videosFromUrl(url: String, prefix: String = "Savefile - ", headers: Headers? = null): List<Video> {
+        val httpUrl = url.toHttpUrl()
+        val videoHeaders = (headers?.newBuilder() ?: Headers.Builder())
+            .set("Referer", url)
+            .set("Origin", "https://${httpUrl.host}")
+            .build()
+
+        val doc = client.newCall(GET(url, videoHeaders)).execute().asJsoup()
+        val js = doc.selectFirst("script:containsData(m3u8)")!!.data()
+        val masterUrl = js.takeIf(String::isNotBlank)
+            ?.substringAfter("{file:\"", "")
+            ?.substringBefore("\"}", "")
+            ?.takeIf(String::isNotBlank)
+            ?: return emptyList()
+
+        val videoList = playlistUtils.extractFromHls(
+            masterUrl,
+            referer = "https://${httpUrl.host}/",
+            videoNameGen = { "$prefix$it" },
+        )
+
+        val subPref = preferences.getString(PREF_SUBTITLE_KEY, PREF_SUBTITLE_DEFAULT).orEmpty()
+        return videoList.map {
+            Video(
+                url = it.url,
+                quality = it.quality,
+                videoUrl = it.videoUrl,
+                audioTracks = it.audioTracks,
+                subtitleTracks = it.subtitleTracks.filter { tracks -> tracks.lang.contains(subPref, true) }
+            )
+        }
+    }
+
+    companion object {
+        fun addSubtitlePref(screen: PreferenceScreen) {
+            EditTextPreference(screen.context).apply {
+                key = PREF_SUBTITLE_KEY
+                title = "Savefile subtitle preference"
+                summary = "Leave blank to use all subs"
+                setDefaultValue(PREF_SUBTITLE_DEFAULT)
+            }.also(screen::addPreference)
+        }
+
+        private const val PREF_SUBTITLE_KEY = "pref_savefile_sub_lang_key"
+        private const val PREF_SUBTITLE_DEFAULT = "eng"
+    }
+}
diff --git a/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt b/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
index d5d7ecee..9896ba26 100644
--- a/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
+++ b/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
@@ -10,6 +10,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 
 class StreamWishExtractor(private val client: OkHttpClient, private val headers: Headers) {
@@ -30,16 +31,19 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
                     script
                 }
             }
-        val masterUrl = scriptBody
-            ?.substringAfter("source", "")
-            ?.substringAfter("file:\"", "")
-            ?.substringBefore("\"", "")
-            ?.takeIf(String::isNotBlank)
+        val masterUrl = scriptBody?.let {
+            M3U8_REGEX.find(it)?.value
+        }
             ?: return emptyList()
 
         val subtitleList = extractSubtitles(scriptBody)
 
-        return playlistUtils.extractFromHls(masterUrl, url, videoNameGen = videoNameGen, subtitleList = subtitleList)
+        return playlistUtils.extractFromHls(
+            playlistUrl = masterUrl,
+            referer = "https://${url.toHttpUrl().host}/",
+            videoNameGen = videoNameGen,
+            subtitleList = playlistUtils.fixSubtitles(subtitleList),
+        )
     }
 
     private fun getEmbedUrl(url: String): String {
@@ -57,7 +61,11 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
                 .substringAfter("tracks")
                 .substringAfter("[")
                 .substringBefore("]")
-            json.decodeFromString<List<TrackDto>>("[$subtitleStr]")
+            val fixedSubtitleStr = FIX_TRACKS_REGEX.replace(subtitleStr) { match ->
+                "\"${match.value}\""
+            }
+
+            json.decodeFromString<List<TrackDto>>("[$fixedSubtitleStr]")
                 .filter { it.kind.equals("captions", true) }
                 .map { Track(it.file, it.label ?: "") }
         } catch (e: SerializationException) {
@@ -67,4 +75,7 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
 
     @Serializable
     private data class TrackDto(val file: String, val kind: String, val label: String? = null)
+
+    private val M3U8_REGEX = Regex("""https[^"]*m3u8[^"]*""")
+    private val FIX_TRACKS_REGEX = Regex("""(?<!["])(file|kind|label)(?!["])""")
 }
diff --git a/src/all/chineseanime/build.gradle b/src/all/chineseanime/build.gradle
index 7c30f6a7..7f7d471a 100644
--- a/src/all/chineseanime/build.gradle
+++ b/src/all/chineseanime/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.ChineseAnime'
     themePkg = 'animestream'
     baseUrl = 'https://www.chineseanime.vip'
-    overrideVersionCode = 13
+    overrideVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/hikari/build.gradle b/src/all/hikari/build.gradle
index 28dd06bc..1943c12f 100644
--- a/src/all/hikari/build.gradle
+++ b/src/all/hikari/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hikari'
     extClass = '.Hikari'
-    extVersionCode = 16
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
@@ -9,6 +9,7 @@ apply from: "$rootDir/common.gradle"
 dependencies {
     implementation(project(':lib:chillx-extractor'))
     implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:savefile-extractor'))
+    implementation(project(':lib:buzzheavier-extractor'))
     implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib:vidhide-extractor'))
-}
\ No newline at end of file
+}
diff --git a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Dto.kt b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Dto.kt
new file mode 100644
index 00000000..51b0e9de
--- /dev/null
+++ b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Dto.kt
@@ -0,0 +1,92 @@
+package eu.kanade.tachiyomi.animeextension.all.hikari
+
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CatalogResponseDto<T>(
+    val next: String? = null,
+    val results: List<T>,
+)
+
+@Serializable
+data class AnimeDto(
+    val uid: String,
+
+    @SerialName("ani_ename")
+    val aniEName: String? = null,
+    @SerialName("ani_name")
+    val aniName: String,
+    @SerialName("ani_poster")
+    val aniPoster: String? = null,
+    @SerialName("ani_synopsis")
+    val aniSynopsis: String? = null,
+    @SerialName("ani_synonyms")
+    val aniSynonyms: String? = null,
+    @SerialName("ani_genre")
+    val aniGenre: String? = null,
+    @SerialName("ani_studio")
+    val aniStudio: String? = null,
+    @SerialName("ani_stats")
+    val aniStats: Int? = null,
+) {
+    fun toSAnime(preferEnglish: Boolean): SAnime = SAnime.create().apply {
+        url = uid
+        title = if (preferEnglish) aniEName?.takeUnless(String::isBlank) ?: aniName else aniName
+        thumbnail_url = aniPoster
+        genre = aniGenre?.split(",")?.joinToString(transform = String::trim)
+        author = aniStudio
+        description = buildString {
+            aniSynopsis?.trim()?.let(::append)
+            append("\n\n")
+            aniSynonyms?.let { append("Synonyms: $it") }
+        }.trim()
+
+        status = when (aniStats) {
+            1 -> SAnime.ONGOING
+            2 -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+}
+
+@Serializable
+data class LatestEpisodeDto(
+    val uid: Int,
+    val title: String,
+    @SerialName("title_en")
+    val titleEn: String? = null,
+    val imageUrl: String,
+) {
+    fun toSAnime(preferEnglish: Boolean): SAnime = SAnime.create().apply {
+        url = uid.toString()
+        title = if (preferEnglish) titleEn?.takeUnless(String::isBlank) ?: this@LatestEpisodeDto.title else this@LatestEpisodeDto.title
+        thumbnail_url = imageUrl
+    }
+}
+
+@Serializable
+data class EpisodeDto(
+    @SerialName("ep_id_name")
+    val epId: String,
+    @SerialName("ep_name")
+    val epName: String? = null,
+) {
+    fun toSEpisode(uid: String): SEpisode = SEpisode.create().apply {
+        url = "$uid-$epId"
+        name = epName?.let { "Ep. $epId - $it" } ?: "Episode $epId"
+        episode_number = epId.toFloatOrNull() ?: 1f
+    }
+}
+
+@Serializable
+data class EmbedDto(
+    @SerialName("embed_type")
+    val embedType: String,
+    @SerialName("embed_name")
+    val embedName: String,
+    @SerialName("embed_frame")
+    val embedFrame: String,
+)
diff --git a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Filters.kt b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Filters.kt
index 7f29c05f..8c9cf7a5 100644
--- a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Filters.kt
+++ b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Filters.kt
@@ -5,7 +5,7 @@ import okhttp3.HttpUrl
 import java.util.Calendar
 
 interface UriFilter {
-    fun addToUri(url: HttpUrl.Builder)
+    fun addToUri(builder: HttpUrl.Builder)
 }
 
 sealed class UriPartFilter(
@@ -20,7 +20,10 @@ sealed class UriPartFilter(
 ),
     UriFilter {
     override fun addToUri(builder: HttpUrl.Builder) {
-        builder.addQueryParameter(param, vals[state].second)
+        val value = vals[state].second
+        if (value.isNotEmpty()) {
+            builder.addQueryParameter(param, value)
+        }
     }
 }
 
@@ -33,13 +36,15 @@ sealed class UriMultiSelectFilter(
 ) : AnimeFilter.Group<UriMultiSelectOption>(name, vals.map { UriMultiSelectOption(it.first, it.second) }), UriFilter {
     override fun addToUri(builder: HttpUrl.Builder) {
         val checked = state.filter { it.state }
-        builder.addQueryParameter(param, checked.joinToString(",") { it.value })
+        if (checked.isNotEmpty()) {
+            builder.addQueryParameter(param, checked.joinToString(",") { it.value })
+        }
     }
 }
 
 class TypeFilter : UriPartFilter(
     "Type",
-    "type",
+    "ani_type",
     arrayOf(
         Pair("All", ""),
         Pair("TV", "1"),
@@ -50,165 +55,53 @@ class TypeFilter : UriPartFilter(
     ),
 )
 
-class CountryFilter : UriPartFilter(
-    "Country",
-    "country",
-    arrayOf(
-        Pair("All", ""),
-        Pair("Japanese", "1"),
-        Pair("Chinese", "2"),
-    ),
-)
-
 class StatusFilter : UriPartFilter(
     "Status",
-    "stats",
+    "ani_stats",
     arrayOf(
         Pair("All", ""),
-        Pair("Currently Airing", "1"),
-        Pair("Finished Airing", "2"),
-        Pair("Not yet Aired", "3"),
-    ),
-)
-
-class RatingFilter : UriPartFilter(
-    "Rating",
-    "rate",
-    arrayOf(
-        Pair("All", ""),
-        Pair("G", "1"),
-        Pair("PG", "2"),
-        Pair("PG-13", "3"),
-        Pair("R-17+", "4"),
-        Pair("R+", "5"),
-        Pair("Rx", "6"),
-    ),
-)
-
-class SourceFilter : UriPartFilter(
-    "Source",
-    "source",
-    arrayOf(
-        Pair("All", ""),
-        Pair("LightNovel", "1"),
-        Pair("Manga", "2"),
-        Pair("Original", "3"),
+        Pair("Ongoing", "1"),
+        Pair("Completed", "2"),
+        Pair("Upcoming", "3"),
     ),
 )
 
 class SeasonFilter : UriPartFilter(
     "Season",
-    "season",
+    "ani_release_season",
     arrayOf(
         Pair("All", ""),
-        Pair("Spring", "1"),
-        Pair("Summer", "2"),
-        Pair("Fall", "3"),
-        Pair("Winter", "4"),
+        Pair("Winter", "1"),
+        Pair("Spring", "2"),
+        Pair("Summer", "3"),
+        Pair("Fall", "4"),
     ),
 )
 
-class LanguageFilter : UriPartFilter(
-    "Language",
-    "language",
-    arrayOf(
-        Pair("All", ""),
-        Pair("Raw", "1"),
-        Pair("Sub", "2"),
-        Pair("Dub", "3"),
-        Pair("Turk", "4"),
-    ),
-)
-
-class SortFilter : UriPartFilter(
-    "Sort",
-    "sort",
-    arrayOf(
-        Pair("Default", "default"),
-        Pair("Recently Added", "recently_added"),
-        Pair("Recently Updated", "recently_updated"),
-        Pair("Score", "score"),
-        Pair("Name A-Z", "name_az"),
-        Pair("Released Date", "released_date"),
-        Pair("Most Watched", "most_watched"),
-    ),
-)
-
-class YearFilter(name: String, param: String) : UriPartFilter(
-    name,
-    param,
+class YearFilter : UriPartFilter(
+    "Release Year",
+    "ani_release",
     YEARS,
 ) {
     companion object {
-        private val NEXT_YEAR by lazy {
-            Calendar.getInstance()[Calendar.YEAR] + 1
+        private val CURRENT_YEAR by lazy {
+            Calendar.getInstance()[Calendar.YEAR]
         }
 
-        private val YEARS = Array(NEXT_YEAR - 1917) { year ->
-            if (year == 0) {
-                Pair("Any", "")
-            } else {
-                (NEXT_YEAR - year).toString().let { Pair(it, it) }
-            }
-        }
-    }
-}
-
-class MonthFilter(name: String, param: String) : UriPartFilter(
-    name,
-    param,
-    MONTHS,
-) {
-    companion object {
-        private val MONTHS = Array(13) { months ->
-            if (months == 0) {
-                Pair("Any", "")
-            } else {
-                val monthStr = "%02d".format(months)
-                Pair(monthStr, monthStr)
-            }
-        }
-    }
-}
-
-class DayFilter(name: String, param: String) : UriPartFilter(
-    name,
-    param,
-    DAYS,
-) {
-    companion object {
-        private val DAYS = Array(32) { day ->
-            if (day == 0) {
-                Pair("Any", "")
-            } else {
-                val dayStr = "%02d".format(day)
-                Pair(dayStr, dayStr)
-            }
-        }
-    }
-}
-
-class AiringDateFilter(
-    private val values: List<UriPartFilter> = PARTS,
-) : AnimeFilter.Group<UriPartFilter>("Airing Date", values), UriFilter {
-    override fun addToUri(builder: HttpUrl.Builder) {
-        values.forEach {
-            it.addToUri(builder)
-        }
-    }
-
-    companion object {
-        private val PARTS = listOf(
-            YearFilter("Year", "aired_year"),
-            MonthFilter("Month", "aired_month"),
-            DayFilter("Day", "aired_day"),
-        )
+        private val YEARS = buildList {
+            add(Pair("Any", ""))
+            addAll(
+                (1990..CURRENT_YEAR).map {
+                    Pair(it.toString(), it.toString())
+                },
+            )
+        }.toTypedArray()
     }
 }
 
 class GenreFilter : UriMultiSelectFilter(
     "Genre",
-    "genres",
+    "ani_genre",
     arrayOf(
         Pair("Action", "Action"),
         Pair("Adventure", "Adventure"),
@@ -233,7 +126,7 @@ class GenreFilter : UriMultiSelectFilter(
         Pair("Music", "Music"),
         Pair("Mystery", "Mystery"),
         Pair("Parody", "Parody"),
-        Pair("Police", "Police"),
+        Pair("Policy", "Policy"),
         Pair("Psychological", "Psychological"),
         Pair("Romance", "Romance"),
         Pair("Samurai", "Samurai"),
@@ -253,3 +146,12 @@ class GenreFilter : UriMultiSelectFilter(
         Pair("Vampire", "Vampire"),
     ),
 )
+
+class LanguageFilter : UriPartFilter(
+    "Language",
+    "ani_genre",
+    arrayOf(
+        Pair("Any", ""),
+        Pair("Portuguese", "Portuguese"),
+    ),
+)
diff --git a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
index 26b65154..536aa70d 100644
--- a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
+++ b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
@@ -1,42 +1,43 @@
 package eu.kanade.tachiyomi.animeextension.all.hikari
 
 import android.app.Application
-import android.util.Log
+import android.content.SharedPreferences
 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.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.buzzheavierextractor.BuzzheavierExtractor
 import eu.kanade.tachiyomi.lib.chillxextractor.ChillxExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.savefileextractor.SavefileExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
-import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.Serializable
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
-class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
+class Hikari : AnimeHttpSource(), ConfigurableAnimeSource {
 
     override val name = "Hikari"
 
-    override val baseUrl = "https://watch.hikaritv.xyz"
+    private val proxyUrl = "https://hikari.gg/hiki-proxy/extract/"
+    private val apiUrl = "https://api.hikari.gg/api"
+    override val baseUrl = "https://hikari.gg"
 
     override val lang = "all"
 
+    override val versionId = 2
+
     override val supportsLatest = true
 
     override fun headersBuilder() = super.headersBuilder().apply {
@@ -50,75 +51,40 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     // ============================== Popular ===============================
 
-    override fun popularAnimeRequest(page: Int): Request {
-        val url = "$baseUrl/ajax/getfilter?type=&country=&stats=&rate=&source=&season=&language=&aired_year=&aired_month=&aired_day=&sort=score&genres=&page=$page"
-        val headers = headersBuilder().set("Referer", "$baseUrl/filter").build()
-        return GET(url, headers)
-    }
+    override fun popularAnimeRequest(page: Int) = searchAnimeRequest(page, "", AnimeFilterList())
 
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val parsed = response.parseAs<HtmlResponseDto>()
-
-        val hasNextPage = response.request.url.queryParameter("page")!!.toInt() < parsed.page!!.totalPages
-        val animeList = parsed.toHtml(baseUrl).select(popularAnimeSelector())
-            .map(::popularAnimeFromElement)
-
-        return AnimesPage(animeList, hasNextPage)
-    }
-
-    override fun popularAnimeSelector(): String = ".flw-item"
-
-    override fun popularAnimeFromElement(element: Element): SAnime = SAnime.create().apply {
-        setUrlWithoutDomain(element.selectFirst("a[data-id]")!!.attr("abs:href"))
-        thumbnail_url = element.selectFirst("img")!!.attr("abs:src")
-        title = element.selectFirst(".film-name")!!.text()
-    }
-
-    override fun popularAnimeNextPageSelector(): String? = null
+    override fun popularAnimeParse(response: Response) = searchAnimeParse(response)
 
     // =============================== Latest ===============================
 
     override fun latestUpdatesRequest(page: Int): Request {
-        val url = "$baseUrl/ajax/getfilter?type=&country=&stats=&rate=&source=&season=&language=&aired_year=&aired_month=&aired_day=&sort=recently_updated&genres=&page=$page"
-        val headers = headersBuilder().set("Referer", "$baseUrl/filter").build()
+        val url = "$apiUrl/episode/new/".toHttpUrl().newBuilder().apply {
+            addQueryParameter("limit", "100")
+            addQueryParameter("language", "EN")
+        }.build()
         return GET(url, headers)
     }
 
-    override fun latestUpdatesParse(response: Response): AnimesPage =
-        popularAnimeParse(response)
+    override fun latestUpdatesParse(response: Response): AnimesPage {
+        val data = response.parseAs<CatalogResponseDto<LatestEpisodeDto>>()
+        val preferEnglish = preferences.getTitleLang
 
-    override fun latestUpdatesSelector(): String =
-        throw UnsupportedOperationException()
-
-    override fun latestUpdatesFromElement(element: Element): SAnime =
-        throw UnsupportedOperationException()
-
-    override fun latestUpdatesNextPageSelector(): String =
-        throw UnsupportedOperationException()
+        val animeList = data.results.distinctBy { it.uid }.map { it.toSAnime(preferEnglish) }
+        return AnimesPage(animeList, false)
+    }
 
     // =============================== Search ===============================
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val url = baseUrl.toHttpUrl().newBuilder().apply {
-            if (query.isNotEmpty()) {
-                addPathSegment("search")
-                addQueryParameter("keyword", query)
-                addQueryParameter("page", page.toString())
-            } else {
-                addPathSegment("ajax")
-                addPathSegment("getfilter")
-                filters.filterIsInstance<UriFilter>().forEach {
-                    it.addToUri(this)
-                }
-                addQueryParameter("page", page.toString())
+        val url = "$apiUrl/anime/".toHttpUrl().newBuilder().apply {
+            addQueryParameter("sort", "created_at")
+            addQueryParameter("order", "asc")
+            addQueryParameter("page", page.toString())
+            filters.filterIsInstance<UriFilter>().forEach {
+                it.addToUri(this)
             }
-        }.build()
-
-        val headers = headersBuilder().apply {
             if (query.isNotEmpty()) {
-                set("Referer", url.toString().substringBeforeLast("&page"))
-            } else {
-                set("Referer", "$baseUrl/filter")
+                addQueryParameter("search", query)
             }
         }.build()
 
@@ -126,280 +92,148 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     override fun searchAnimeParse(response: Response): AnimesPage {
-        return if (response.request.url.encodedPath.startsWith("/search")) {
-            super.searchAnimeParse(response)
-        } else {
-            popularAnimeParse(response)
-        }
+        val data = response.parseAs<CatalogResponseDto<AnimeDto>>()
+        val preferEnglish = preferences.getTitleLang
+
+        val animeList = data.results.map { it.toSAnime(preferEnglish) }
+        val hasNextPage = data.next != null
+
+        return AnimesPage(animeList, hasNextPage)
     }
 
-    override fun searchAnimeSelector(): String = popularAnimeSelector()
-
-    override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
-
-    override fun searchAnimeNextPageSelector(): String = "ul.pagination > li.active + li"
-
     // ============================== Filters ===============================
 
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
-        AnimeFilter.Header("Note: text search ignores filters"),
-        AnimeFilter.Separator(),
         TypeFilter(),
-        CountryFilter(),
         StatusFilter(),
-        RatingFilter(),
-        SourceFilter(),
         SeasonFilter(),
-        LanguageFilter(),
-        SortFilter(),
-        AiringDateFilter(),
+        YearFilter(),
         GenreFilter(),
+        LanguageFilter(),
     )
 
     // =========================== Anime Details ============================
 
-    override fun animeDetailsParse(document: Document): SAnime = SAnime.create().apply {
-        with(document.selectFirst("#ani_detail")!!) {
-            title = selectFirst(".film-name")!!.text()
-            thumbnail_url = selectFirst(".film-poster img")!!.attr("abs:src")
-            description = selectFirst(".film-description > .text")?.text()
-            genre = select(".item-list:has(span:contains(Genres)) > a").joinToString { it.text() }
-            author = select(".item:has(span:contains(Studio)) > a").joinToString { it.text() }
-            status = selectFirst(".item:has(span:contains(Status)) > .name").parseStatus()
-        }
+    override fun getAnimeUrl(anime: SAnime): String {
+        return "$baseUrl/info/${anime.url}"
     }
 
-    private fun Element?.parseStatus(): Int = when (this?.text()?.lowercase()) {
-        "currently airing" -> SAnime.ONGOING
-        "finished" -> SAnime.COMPLETED
-        else -> SAnime.UNKNOWN
+    override fun animeDetailsRequest(anime: SAnime): Request {
+        return GET("$apiUrl/anime/uid/${anime.url}/", headers)
+    }
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        return response.parseAs<AnimeDto>().toSAnime(preferences.getTitleLang)
     }
 
     // ============================== Episodes ==============================
 
-    private val specialCharRegex = Regex("""(?![\-_])\W{1,}""")
-
     override fun episodeListRequest(anime: SAnime): Request {
-        val animeId = anime.url.split("/")[2]
-
-        val sanitized = anime.title.replace(" ", "_")
-
-        val refererUrl = baseUrl.toHttpUrl().newBuilder().apply {
-            addPathSegment("watch")
-            addQueryParameter("anime", specialCharRegex.replace(sanitized, ""))
-            addQueryParameter("uid", animeId)
-            addQueryParameter("eps", "1")
-        }.build()
-
-        val headers = headersBuilder()
-            .set("Referer", refererUrl.toString())
-            .build()
-
-        return GET("$baseUrl/ajax/episodelist/$animeId", headers)
+        return GET("$apiUrl/episode/uid/${anime.url}/", headers)
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> {
-        return response.parseAs<HtmlResponseDto>().toHtml(baseUrl)
-            .select(episodeListSelector())
-            .map(::episodeFromElement)
-            .reversed()
-    }
+        val guid = response.request.url.pathSegments[3]
 
-    override fun episodeListSelector() = "a[class~=ep-item]"
-
-    override fun episodeFromElement(element: Element): SEpisode {
-        val epText = element.selectFirst(".ssli-order")?.text()?.trim()
-            ?: element.attr("data-number").trim()
-        val ep = epText.toFloatOrNull() ?: 0F
-
-        val nameText = element.selectFirst(".ep-name")?.text()?.trim()
-            ?: element.attr("title").replace("Episode-", "Ep. ") ?: ""
-
-        return SEpisode.create().apply {
-            setUrlWithoutDomain(element.attr("abs:href"))
-            episode_number = ep
-            name = "Ep. $ep - $nameText"
-        }
+        return response.parseAs<List<EpisodeDto>>().map { it.toSEpisode(guid) }.reversed()
     }
 
     // ============================ Video Links =============================
 
-    private val filemoonExtractor by lazy { FilemoonExtractor(client) }
-    private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
+    private val filemoonExtractor by lazy { FilemoonExtractor(client, preferences) }
+    private val savefileExtractor by lazy { SavefileExtractor(client, preferences) }
+    private val buzzheavierExtractor by lazy { BuzzheavierExtractor(client, headers) }
     private val chillxExtractor by lazy { ChillxExtractor(client, headers) }
     private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val embedRegex = Regex("""getEmbed\(\s*(\d+)\s*,\s*(\d+)\s*,\s*'(\d+)'""")
+
+    private fun getEmbedTypeName(type: String): String {
+        return when (type) {
+            "2" -> "[SUB] "
+            "3" -> "[DUB] "
+            "4" -> "[MULTI AUDIO] "
+            "8" -> "[HARD-SUB] "
+            else -> ""
+        }
+    }
 
     override fun videoListRequest(episode: SEpisode): Request {
-        val url = (baseUrl + episode.url).toHttpUrl()
-        val animeId = url.queryParameter("uid")!!
-        val episodeNum = url.queryParameter("eps")!!
-
-        val headers = headersBuilder()
-            .set("Referer", baseUrl + episode.url)
-            .build()
-
-        return GET("$baseUrl/ajax/embedserver/$animeId/$episodeNum", headers)
+        val (guid, epId) = episode.url.split("-")
+        return GET("$apiUrl/embed/$guid/$epId/", headers)
     }
 
     override fun videoListParse(response: Response): List<Video> {
-        val html = response.parseAs<HtmlResponseDto>().toHtml(baseUrl)
-        Log.d("Hikari", html.toString())
+        val data = response.parseAs<List<EmbedDto>>()
 
-        val headers = headersBuilder()
-            .set("Referer", response.request.url.toString())
-            .build()
+        return data.parallelCatchingFlatMapBlocking { embed ->
+            val prefix = getEmbedTypeName(embed.embedType) + embed.embedName
+            val embedName = embed.embedName.lowercase()
 
-        val subEmbedUrls = html.select(".servers-sub div.item.server-item").flatMap { item ->
-            val name = item.text().trim() + " (Sub)"
-            val onClick = item.selectFirst("a")?.attr("onclick")
-            if (onClick == null) {
-                Log.e("Hikari", "onClick attribute is null for item: $item")
-                return@flatMap emptyList<Pair<String, String>>()
-            }
-
-            val match = embedRegex.find(onClick)?.groupValues
-            if (match == null) {
-                Log.e("Hikari", "No match found for onClick: $onClick")
-                return@flatMap emptyList<Pair<String, String>>()
-            }
-
-            val url = "$baseUrl/ajax/embed/${match[1]}/${match[2]}/${match[3]}"
-            val iframeList = client.newCall(
-                GET(url, headers),
-            ).execute().parseAs<List<String>>()
-
-            iframeList.map {
-                val iframeSrc = Jsoup.parseBodyFragment(it).selectFirst("iframe")?.attr("src")
-                if (iframeSrc == null) {
-                    Log.e("Hikari", "iframe src is null for URL: $url")
-                    return@map Pair("", "")
-                }
-                Pair(iframeSrc, name)
-            }.filter { it.first.isNotEmpty() }
-        }
-        val dubEmbedUrls = html.select(".servers-dub div.item.server-item").flatMap { item ->
-            val name = item.text().trim() + " (Dub)"
-            val onClick = item.selectFirst("a")?.attr("onclick")
-            if (onClick == null) {
-                Log.e("Hikari", "onClick attribute is null for item: $item")
-                return@flatMap emptyList<Pair<String, String>>()
-            }
-
-            val match = embedRegex.find(onClick)?.groupValues
-            if (match == null) {
-                Log.e("Hikari", "No match found for onClick: $onClick")
-                return@flatMap emptyList<Pair<String, String>>()
-            }
-
-            val url = "$baseUrl/ajax/embed/${match[1]}/${match[2]}/${match[3]}"
-            val iframeList = client.newCall(
-                GET(url, headers),
-            ).execute().parseAs<List<String>>()
-
-            iframeList.map {
-                val iframeSrc = Jsoup.parseBodyFragment(it).selectFirst("iframe")?.attr("src")
-                if (iframeSrc == null) {
-                    Log.e("Hikari", "iframe src is null for URL: $url")
-                    return@map Pair("", "")
-                }
-                Pair(iframeSrc, name)
-            }.filter { it.first.isNotEmpty() }
-        }
-
-        val sdEmbedUrls = html.select(".servers-sub.\\&.dub div.item.server-item").flatMap { item ->
-            val name = item.text().trim() + " (Sub + Dub)"
-            val onClick = item.selectFirst("a")?.attr("onclick")
-            if (onClick == null) {
-                Log.e("Hikari", "onClick attribute is null for item: $item")
-                return@flatMap emptyList<Pair<String, String>>()
-            }
-
-            val match = embedRegex.find(onClick)?.groupValues
-            if (match == null) {
-                Log.e("Hikari", "No match found for onClick: $onClick")
-                return@flatMap emptyList<Pair<String, String>>()
-            }
-
-            val url = "$baseUrl/ajax/embed/${match[1]}/${match[2]}/${match[3]}"
-            val iframeList = client.newCall(
-                GET(url, headers),
-            ).execute().parseAs<List<String>>()
-
-            iframeList.map {
-                val iframeSrc = Jsoup.parseBodyFragment(it).selectFirst("iframe")?.attr("src")
-                if (iframeSrc == null) {
-                    Log.e("Hikari", "iframe src is null for URL: $url")
-                    return@map Pair("", "")
-                }
-                Pair(iframeSrc, name)
-            }.filter { it.first.isNotEmpty() }
-        }
-
-        return sdEmbedUrls.parallelCatchingFlatMapBlocking {
-            getVideosFromEmbed(it.first, it.second)
-        }.ifEmpty {
-            (subEmbedUrls + dubEmbedUrls).parallelCatchingFlatMapBlocking {
-                getVideosFromEmbed(it.first, it.second)
+            when (embedName) {
+                "streamwish" -> streamwishExtractor.videosFromUrl(embed.embedFrame, videoNameGen = { "$prefix - $it" })
+                "filemoon" -> filemoonExtractor.videosFromUrl(embed.embedFrame, "$prefix - ")
+                "sv" -> savefileExtractor.videosFromUrl(embed.embedFrame, "$prefix - ")
+                "playerx" -> chillxExtractor.videoFromUrl(embed.embedFrame, "$prefix - ")
+                "hiki" -> buzzheavierExtractor.videosFromUrl(embed.embedFrame, "$prefix - ", proxyUrl)
+                else -> emptyList()
             }
         }
     }
 
-    private fun getVideosFromEmbed(embedUrl: String, name: String): List<Video> = when {
-        name.contains("vidhide", true) -> vidHideExtractor.videosFromUrl(embedUrl, videoNameGen = { s -> "$name - $s" })
-        embedUrl.contains("filemoon", true) -> filemoonExtractor.videosFromUrl(embedUrl, prefix = "$name - ", headers = headers)
-        name.contains("streamwish", true) -> streamwishExtractor.videosFromUrl(embedUrl, prefix = "$name - ")
-        else -> chillxExtractor.videoFromUrl(embedUrl, referer = baseUrl, prefix = "$name - ")
-    }
-
-    override fun videoListSelector() = ".server-item:has(a[onclick~=getEmbed])"
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val type = preferences.getString(PREF_TYPE_KEY, PREF_TYPE_DEFAULT)!!
+        val hoster = preferences.getString(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
 
         return sortedWith(
             compareBy(
+                { it.quality.startsWith(type) },
                 { it.quality.contains(quality) },
                 { QUALITY_REGEX.find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+                { it.quality.contains(hoster, true) },
             ),
         ).reversed()
     }
 
-    override fun videoFromElement(element: Element): Video =
-        throw UnsupportedOperationException()
-
-    override fun videoUrlParse(document: Document): String =
-        throw UnsupportedOperationException()
-
     // ============================= Utilities ==============================
 
-    @Serializable
-    class HtmlResponseDto(
-        val html: String,
-        val page: PageDto? = null,
-    ) {
-        fun toHtml(baseUrl: String): Document = Jsoup.parseBodyFragment(html, baseUrl)
-
-        @Serializable
-        class PageDto(
-            val totalPages: Int,
-        )
-    }
-
     companion object {
         private val QUALITY_REGEX = Regex("""(\d+)p""")
 
+        private const val PREF_ENGLISH_TITLE_KEY = "preferred_title_lang"
+        private const val PREF_ENGLISH_TITLE_DEFAULT = true
+
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_DEFAULT = "1080"
         private val PREF_QUALITY_VALUES = arrayOf("1080", "720", "480", "360")
         private val PREF_QUALITY_ENTRIES = PREF_QUALITY_VALUES.map {
             "${it}p"
         }.toTypedArray()
+
+        private val TYPE_LIST = arrayOf("[SUB] ", "[DUB] ", "[MULTI AUDIO] ", "[HARD-SUB] ")
+        private const val PREF_TYPE_KEY = "pref_type"
+        private const val PREF_TYPE_DEFAULT = ""
+        private val PREF_TYPE_VALUES = arrayOf("") + TYPE_LIST
+        private val PREF_TYPE_ENTRIES = arrayOf("Any") + TYPE_LIST
+
+        private val HOSTER_LIST = arrayOf("Streamwish", "Filemoon", "SV", "PlayerX", "Hiki")
+        private const val PREF_HOSTER_KEY = "pref_hoster"
+        private const val PREF_HOSTER_DEFAULT = ""
+        private val PREF_HOSTER_VALUES = arrayOf("") + HOSTER_LIST
+        private val PREF_HOSTER_ENTRIES = arrayOf("Any") + HOSTER_LIST
     }
 
     // ============================== Settings ==============================
 
+    private val SharedPreferences.getTitleLang
+        get() = getBoolean(PREF_ENGLISH_TITLE_KEY, PREF_ENGLISH_TITLE_DEFAULT)
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        SwitchPreferenceCompat(screen.context).apply {
+            key = PREF_ENGLISH_TITLE_KEY
+            title = "Prefer english titles"
+            setDefaultValue(PREF_ENGLISH_TITLE_DEFAULT)
+        }.also(screen::addPreference)
+
         ListPreference(screen.context).apply {
             key = PREF_QUALITY_KEY
             title = "Preferred quality"
@@ -407,13 +241,27 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
             entryValues = PREF_QUALITY_VALUES
             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)
+
+        ListPreference(screen.context).apply {
+            key = PREF_TYPE_KEY
+            title = "Preferred type"
+            entries = PREF_TYPE_ENTRIES
+            entryValues = PREF_TYPE_VALUES
+            setDefaultValue(PREF_TYPE_DEFAULT)
+            summary = "%s"
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_HOSTER_KEY
+            title = "Preferred hoster"
+            entries = PREF_HOSTER_ENTRIES
+            entryValues = PREF_HOSTER_VALUES
+            setDefaultValue(PREF_HOSTER_DEFAULT)
+            summary = "%s"
+        }.also(screen::addPreference)
+
+        FilemoonExtractor.addSubtitlePref(screen)
+        SavefileExtractor.addSubtitlePref(screen)
     }
 }
diff --git a/src/all/javgg/build.gradle b/src/all/javgg/build.gradle
index c339dcad..c461fe33 100644
--- a/src/all/javgg/build.gradle
+++ b/src/all/javgg/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'JavGG'
     extClass = '.Javgg'
-    extVersionCode = 5
+    extVersionCode = 6
     isNsfw = true
 }
 
diff --git a/src/all/javguru/build.gradle b/src/all/javguru/build.gradle
index e25b3386..f92eb6ef 100644
--- a/src/all/javguru/build.gradle
+++ b/src/all/javguru/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Jav Guru'
     extClass = '.JavGuru'
-    extVersionCode = 26
+    extVersionCode = 27
     isNsfw = true
 }
 
diff --git a/src/all/lmanime/build.gradle b/src/all/lmanime/build.gradle
index 2fda6918..5f173845 100644
--- a/src/all/lmanime/build.gradle
+++ b/src/all/lmanime/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.LMAnime'
     themePkg = 'animestream'
     baseUrl = 'https://lmanime.com'
-    overrideVersionCode = 9
+    overrideVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/supjav/build.gradle b/src/all/supjav/build.gradle
index 21cbb8f9..1a5109f1 100644
--- a/src/all/supjav/build.gradle
+++ b/src/all/supjav/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'SupJav'
     extClass = '.SupJavFactory'
-    extVersionCode = 14
+    extVersionCode = 15
     isNsfw = true
 }
 
diff --git a/src/ar/anime4up/build.gradle b/src/ar/anime4up/build.gradle
index b6223b2b..2b41cf5b 100644
--- a/src/ar/anime4up/build.gradle
+++ b/src/ar/anime4up/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anime4up'
     extClass = '.Anime4Up'
-    extVersionCode = 62
+    extVersionCode = 63
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/animerco/build.gradle b/src/ar/animerco/build.gradle
index 5d6cf123..e84490a0 100644
--- a/src/ar/animerco/build.gradle
+++ b/src/ar/animerco/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Animerco'
     extClass = '.Animerco'
-    extVersionCode = 41
+    extVersionCode = 42
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/arabseed/build.gradle b/src/ar/arabseed/build.gradle
index 7a932843..436b0229 100644
--- a/src/ar/arabseed/build.gradle
+++ b/src/ar/arabseed/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Arab Seed'
     extClass = '.ArabSeed'
-    extVersionCode = 17
+    extVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/asia2tv/build.gradle b/src/ar/asia2tv/build.gradle
index 52ee7f8a..b58e4985 100644
--- a/src/ar/asia2tv/build.gradle
+++ b/src/ar/asia2tv/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'asia2tv'
     extClass = '.Asia2TV'
-    extVersionCode = 22
+    extVersionCode = 23
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/egydead/build.gradle b/src/ar/egydead/build.gradle
index 42a1e788..af253b22 100644
--- a/src/ar/egydead/build.gradle
+++ b/src/ar/egydead/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Egy Dead'
     extClass = '.EgyDead'
-    extVersionCode = 17
+    extVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animebase/build.gradle b/src/de/animebase/build.gradle
index cb6418d0..3af5f126 100644
--- a/src/de/animebase/build.gradle
+++ b/src/de/animebase/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anime-Base'
     extClass = '.AnimeBase'
-    extVersionCode = 31
+    extVersionCode = 32
     isNsfw = true
 }
 
diff --git a/src/de/animetoast/build.gradle b/src/de/animetoast/build.gradle
index 27df90c6..53646546 100644
--- a/src/de/animetoast/build.gradle
+++ b/src/de/animetoast/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeToast'
     extClass = '.AnimeToast'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/cinemathek/build.gradle b/src/de/cinemathek/build.gradle
index 783562c0..6f5cc3c7 100644
--- a/src/de/cinemathek/build.gradle
+++ b/src/de/cinemathek/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Cinemathek'
     themePkg = 'dooplay'
     baseUrl = 'https://cinemathek.net'
-    overrideVersionCode = 24
+    overrideVersionCode = 25
     isNsfw = true
 }
 
diff --git a/src/de/einfach/build.gradle b/src/de/einfach/build.gradle
index 71a83273..d3f338bf 100644
--- a/src/de/einfach/build.gradle
+++ b/src/de/einfach/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Einfach'
     extClass = '.Einfach'
-    extVersionCode = 16
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/kool/build.gradle b/src/de/kool/build.gradle
index ab338000..e972693c 100644
--- a/src/de/kool/build.gradle
+++ b/src/de/kool/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Kool'
     extClass = '.Kool'
-    extVersionCode = 13
+    extVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/moflixstream/build.gradle b/src/de/moflixstream/build.gradle
index d669b46a..b3f904ce 100644
--- a/src/de/moflixstream/build.gradle
+++ b/src/de/moflixstream/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Moflix-Stream'
     extClass = '.MoflixStream'
-    extVersionCode = 15
+    extVersionCode = 16
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/allanime/build.gradle b/src/en/allanime/build.gradle
index 6326ced1..bb20fc34 100644
--- a/src/en/allanime/build.gradle
+++ b/src/en/allanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AllAnime'
     extClass = '.AllAnime'
-    extVersionCode = 35
+    extVersionCode = 36
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/allanimechi/build.gradle b/src/en/allanimechi/build.gradle
index 3f9e5bc8..b10ec04b 100644
--- a/src/en/allanimechi/build.gradle
+++ b/src/en/allanimechi/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AllAnimeChi'
     extClass = '.AllAnimeChi'
-    extVersionCode = 12
+    extVersionCode = 13
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animekhor/build.gradle b/src/en/animekhor/build.gradle
index 9a161c9e..df54b379 100644
--- a/src/en/animekhor/build.gradle
+++ b/src/en/animekhor/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AnimeKhor'
     themePkg = 'animestream'
     baseUrl = 'https://animekhor.org'
-    overrideVersionCode = 7
+    overrideVersionCode = 8
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animenosub/build.gradle b/src/en/animenosub/build.gradle
index faadad95..7c3fbed3 100644
--- a/src/en/animenosub/build.gradle
+++ b/src/en/animenosub/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Animenosub'
     themePkg = 'animestream'
     baseUrl = 'https://animenosub.com'
-    overrideVersionCode = 8
+    overrideVersionCode = 9
     isNsfw = true
 }
 
diff --git a/src/en/animetake/build.gradle b/src/en/animetake/build.gradle
index 8b4afa73..9dc2ab27 100644
--- a/src/en/animetake/build.gradle
+++ b/src/en/animetake/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeTake'
     extClass = '.AnimeTake'
-    extVersionCode = 7
+    extVersionCode = 8
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/asiaflix/build.gradle b/src/en/asiaflix/build.gradle
index d6c6e49d..d57c55c8 100644
--- a/src/en/asiaflix/build.gradle
+++ b/src/en/asiaflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AsiaFlix'
     extClass = '.AsiaFlix'
-    extVersionCode = 16
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/luciferdonghua/build.gradle b/src/en/luciferdonghua/build.gradle
index 5a7c9c49..62752fab 100644
--- a/src/en/luciferdonghua/build.gradle
+++ b/src/en/luciferdonghua/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.LuciferDonghua'
     themePkg = 'animestream'
     baseUrl = 'https://luciferdonghua.in'
-    overrideVersionCode = 6
+    overrideVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/tokuzilla/build.gradle b/src/en/tokuzilla/build.gradle
index ce66cf1a..af309649 100644
--- a/src/en/tokuzilla/build.gradle
+++ b/src/en/tokuzilla/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Tokuzilla'
     extClass = '.Tokuzilla'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animebum/build.gradle b/src/es/animebum/build.gradle
index 9c54088a..abb1e52e 100644
--- a/src/es/animebum/build.gradle
+++ b/src/es/animebum/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeBum'
     extClass = '.AnimeBum'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
index 38c7f15a..40b8b8b3 100644
--- a/src/es/animefenix/build.gradle
+++ b/src/es/animefenix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Animefenix'
     extClass = '.Animefenix'
-    extVersionCode = 57
+    extVersionCode = 58
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle
index 5781e41b..bf64fced 100644
--- a/src/es/animeflv/build.gradle
+++ b/src/es/animeflv/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeFLV'
     extClass = '.AnimeFlv'
-    extVersionCode = 64
+    extVersionCode = 65
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeid/build.gradle b/src/es/animeid/build.gradle
index 591dddf4..ace183d0 100644
--- a/src/es/animeid/build.gradle
+++ b/src/es/animeid/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeID'
     extClass = '.AnimeID'
-    extVersionCode = 16
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animejl/build.gradle b/src/es/animejl/build.gradle
index 195c2645..d4299bc6 100644
--- a/src/es/animejl/build.gradle
+++ b/src/es/animejl/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Animejl'
     extClass = '.Animejl'
-    extVersionCode = 5
+    extVersionCode = 6
     isNsfw = true
 }
 
diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index a79f7eaa..75a010db 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeLatinoHD'
     extClass = '.AnimeLatinoHD'
-    extVersionCode = 39
+    extVersionCode = 40
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animemovil/build.gradle b/src/es/animemovil/build.gradle
index 30f61d24..08df37f1 100644
--- a/src/es/animemovil/build.gradle
+++ b/src/es/animemovil/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeMovil'
     extClass = '.AnimeMovil'
-    extVersionCode = 29
+    extVersionCode = 30
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animenix/build.gradle b/src/es/animenix/build.gradle
index 1ac55757..5c0e96d0 100644
--- a/src/es/animenix/build.gradle
+++ b/src/es/animenix/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Animenix'
     themePkg = 'dooplay'
     baseUrl = 'https://animenix.com'
-    overrideVersionCode = 9
+    overrideVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeonlineninja/build.gradle b/src/es/animeonlineninja/build.gradle
index 5c5fd46c..1be35d0a 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 = 44
+    overrideVersionCode = 45
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeytes/build.gradle b/src/es/animeytes/build.gradle
index eb62857f..28230d44 100644
--- a/src/es/animeytes/build.gradle
+++ b/src/es/animeytes/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AnimeYTES'
     themePkg = 'animestream'
     baseUrl = 'https://animeyt.pro'
-    overrideVersionCode = 9
+    overrideVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/asialiveaction/build.gradle b/src/es/asialiveaction/build.gradle
index fcf9c358..8f182775 100644
--- a/src/es/asialiveaction/build.gradle
+++ b/src/es/asialiveaction/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AsiaLiveAction'
     extClass = '.AsiaLiveAction'
-    extVersionCode = 36
+    extVersionCode = 37
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/cine24h/build.gradle b/src/es/cine24h/build.gradle
index 1037606e..33a8917d 100644
--- a/src/es/cine24h/build.gradle
+++ b/src/es/cine24h/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Cine24h'
     extClass = '.Cine24h'
-    extVersionCode = 11
+    extVersionCode = 12
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/cinecalidad/build.gradle b/src/es/cinecalidad/build.gradle
index 748cdd65..32a8f5ae 100644
--- a/src/es/cinecalidad/build.gradle
+++ b/src/es/cinecalidad/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'CineCalidad'
     extClass = '.CineCalidad'
-    extVersionCode = 17
+    extVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/cineplus123/build.gradle b/src/es/cineplus123/build.gradle
index b6598a0f..556c4a70 100644
--- a/src/es/cineplus123/build.gradle
+++ b/src/es/cineplus123/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Cineplus123'
     themePkg = 'dooplay'
     baseUrl = 'https://cineplus123.org'
-    overrideVersionCode = 6
+    overrideVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/cuevana/build.gradle b/src/es/cuevana/build.gradle
index b1198287..58354ab7 100644
--- a/src/es/cuevana/build.gradle
+++ b/src/es/cuevana/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Cuevana'
     extClass = '.CuevanaFactory'
-    extVersionCode = 46
+    extVersionCode = 47
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/detodopeliculas/build.gradle b/src/es/detodopeliculas/build.gradle
index a8fd0f63..66c1cf59 100644
--- a/src/es/detodopeliculas/build.gradle
+++ b/src/es/detodopeliculas/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.DeTodoPeliculas'
     themePkg = 'dooplay'
     baseUrl = 'https://detodopeliculas.nu'
-    overrideVersionCode = 3
+    overrideVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index 4a3548a2..4e3bf359 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasflix'
     extClass = '.Doramasflix'
-    extVersionCode = 33
+    extVersionCode = 34
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index 0923c038..6d48f020 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasyt'
     extClass = '.Doramasyt'
-    extVersionCode = 20
+    extVersionCode = 21
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/estrenosdoramas/build.gradle b/src/es/estrenosdoramas/build.gradle
index 5c437a4b..399827e0 100644
--- a/src/es/estrenosdoramas/build.gradle
+++ b/src/es/estrenosdoramas/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'EstrenosDoramas'
     extClass = '.EstrenosDoramas'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/flixlatam/build.gradle b/src/es/flixlatam/build.gradle
index 3e2c1fa1..bfad5808 100644
--- a/src/es/flixlatam/build.gradle
+++ b/src/es/flixlatam/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.FlixLatam'
     themePkg = 'dooplay'
     baseUrl = 'https://flixlatam.com'
-    overrideVersionCode = 4
+    overrideVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/gnula/build.gradle b/src/es/gnula/build.gradle
index e9b646a2..a3a68dd5 100644
--- a/src/es/gnula/build.gradle
+++ b/src/es/gnula/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Gnula'
     extClass = '.Gnula'
-    extVersionCode = 31
+    extVersionCode = 32
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle
index 6bf040da..9cad0e13 100644
--- a/src/es/hackstore/build.gradle
+++ b/src/es/hackstore/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hackstore'
     extClass = '.Hackstore'
-    extVersionCode = 25
+    extVersionCode = 26
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index 72d8448c..d5c1ed06 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiLA'
     extClass = '.Hentaila'
-    extVersionCode = 34
+    extVersionCode = 35
     isNsfw = true
 }
 
diff --git a/src/es/hentaitk/build.gradle b/src/es/hentaitk/build.gradle
index b0542c73..65153704 100644
--- a/src/es/hentaitk/build.gradle
+++ b/src/es/hentaitk/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiTk'
     extClass = '.Hentaitk'
-    extVersionCode = 13
+    extVersionCode = 14
     isNsfw = true
 }
 
diff --git a/src/es/homecine/build.gradle b/src/es/homecine/build.gradle
index a6c09108..2fe35c6a 100644
--- a/src/es/homecine/build.gradle
+++ b/src/es/homecine/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HomeCine'
     extClass = '.HomeCine'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index 45d001fb..6f93c7d9 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Jkanime'
     extClass = '.Jkanime'
-    extVersionCode = 35
+    extVersionCode = 36
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/katanime/build.gradle b/src/es/katanime/build.gradle
index 3010fde4..be48135e 100644
--- a/src/es/katanime/build.gradle
+++ b/src/es/katanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Katanime'
     extClass = '.Katanime'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/lacartoons/build.gradle b/src/es/lacartoons/build.gradle
index 314804e2..dd7bf1b8 100644
--- a/src/es/lacartoons/build.gradle
+++ b/src/es/lacartoons/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'LACartoons'
     extClass = '.Lacartoons'
-    extVersionCode = 11
+    extVersionCode = 12
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/legionanime/build.gradle b/src/es/legionanime/build.gradle
index 07a08cbf..4331c999 100644
--- a/src/es/legionanime/build.gradle
+++ b/src/es/legionanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'LegionAnime'
     extClass = '.LegionAnime'
-    extVersionCode = 35
+    extVersionCode = 36
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/metroseries/build.gradle b/src/es/metroseries/build.gradle
index 1a0b5e73..077fed91 100644
--- a/src/es/metroseries/build.gradle
+++ b/src/es/metroseries/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MetroSeries'
     extClass = '.MetroSeries'
-    extVersionCode = 18
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/mhdflix/build.gradle b/src/es/mhdflix/build.gradle
index d816f1d8..51670054 100644
--- a/src/es/mhdflix/build.gradle
+++ b/src/es/mhdflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MhdFlix'
     extClass = '.MhdFlix'
-    extVersionCode = 6
+    extVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index fe88e25d..5a1f227e 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MonosChinos'
     extClass = '.MonosChinos'
-    extVersionCode = 35
+    extVersionCode = 36
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/mundodonghua/build.gradle b/src/es/mundodonghua/build.gradle
index 03ee9a53..ab1ce4ab 100644
--- a/src/es/mundodonghua/build.gradle
+++ b/src/es/mundodonghua/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MundoDonghua'
     extClass = '.MundoDonghua'
-    extVersionCode = 29
+    extVersionCode = 30
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/otakuverso/build.gradle b/src/es/otakuverso/build.gradle
index 830bd251..9e67e6a5 100644
--- a/src/es/otakuverso/build.gradle
+++ b/src/es/otakuverso/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Otakuverso'
     extClass = '.Otakuverso'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/pelisforte/build.gradle b/src/es/pelisforte/build.gradle
index 03fafc85..7666875a 100644
--- a/src/es/pelisforte/build.gradle
+++ b/src/es/pelisforte/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'PelisForte'
     extClass = '.PelisForte'
-    extVersionCode = 30
+    extVersionCode = 31
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 5b320ba5..9fa56682 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Pelisplushd'
     extClass = '.PelisplushdFactory'
-    extVersionCode = 73
+    extVersionCode = 74
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/serieskao/build.gradle b/src/es/serieskao/build.gradle
index 0019d12b..67293eb1 100644
--- a/src/es/serieskao/build.gradle
+++ b/src/es/serieskao/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Serieskao'
     extClass = '.Serieskao'
-    extVersionCode = 4
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/sololatino/build.gradle b/src/es/sololatino/build.gradle
index 494a153a..fbc45af3 100644
--- a/src/es/sololatino/build.gradle
+++ b/src/es/sololatino/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.SoloLatino'
     themePkg = 'dooplay'
     baseUrl = 'https://sololatino.net'
-    overrideVersionCode = 6
+    overrideVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/veranimes/build.gradle b/src/es/veranimes/build.gradle
index 13732043..84dfb17c 100644
--- a/src/es/veranimes/build.gradle
+++ b/src/es/veranimes/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'VerAnimes'
     extClass = '.VerAnimes'
-    extVersionCode = 10
+    extVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/verseriesonline/build.gradle b/src/es/verseriesonline/build.gradle
index 0070c5e6..2f9e1da4 100644
--- a/src/es/verseriesonline/build.gradle
+++ b/src/es/verseriesonline/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'VerSeriesOnline'
     extClass = '.VerSeriesOnline'
-    extVersionCode = 4
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/zeroanime/build.gradle b/src/es/zeroanime/build.gradle
index 21506d70..53010f8d 100644
--- a/src/es/zeroanime/build.gradle
+++ b/src/es/zeroanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'zeroanime'
     extClass = '.Zeroanime'
-    extVersionCode = 3
+    extVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/zonaleros/build.gradle b/src/es/zonaleros/build.gradle
index 30e67c19..5e38dff6 100644
--- a/src/es/zonaleros/build.gradle
+++ b/src/es/zonaleros/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Zonaleros'
     extClass = '.Zonaleros'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/anisama/build.gradle b/src/fr/anisama/build.gradle
index d15cbb71..39fc3435 100644
--- a/src/fr/anisama/build.gradle
+++ b/src/fr/anisama/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AniSama'
     extClass = '.AniSama'
-    extVersionCode = 11
+    extVersionCode = 12
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/hds/build.gradle b/src/fr/hds/build.gradle
index d7ce4c06..66c7d8bb 100644
--- a/src/fr/hds/build.gradle
+++ b/src/fr/hds/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Hds'
     themePkg = 'dooplay'
     baseUrl = 'https://www.hds.quest'
-    overrideVersionCode = 4
+    overrideVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/otakufr/build.gradle b/src/fr/otakufr/build.gradle
index 8781806c..fa0f4bf9 100644
--- a/src/fr/otakufr/build.gradle
+++ b/src/fr/otakufr/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'OtakuFR'
     extClass = '.OtakuFR'
-    extVersionCode = 25
+    extVersionCode = 26
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/hi/animesaga/build.gradle b/src/hi/animesaga/build.gradle
index b1513e54..e5c5c863 100644
--- a/src/hi/animesaga/build.gradle
+++ b/src/hi/animesaga/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AniSAGA'
     themePkg = 'dooplay'
     baseUrl = 'https://www.anisaga.org'
-    overrideVersionCode = 17
+    overrideVersionCode = 18
     isNsfw = false
 }
 
diff --git a/src/id/otakudesu/build.gradle b/src/id/otakudesu/build.gradle
index 8afaaba1..104b909f 100644
--- a/src/id/otakudesu/build.gradle
+++ b/src/id/otakudesu/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'OtakuDesu'
     extClass = '.OtakuDesu'
-    extVersionCode = 31
+    extVersionCode = 32
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animesgratis/build.gradle b/src/pt/animesgratis/build.gradle
index 8e0c3b14..ba79a631 100644
--- a/src/pt/animesgratis/build.gradle
+++ b/src/pt/animesgratis/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Q1N'
     themePkg = 'dooplay'
     baseUrl = 'https://q1n.net'
-    overrideVersionCode = 18
+    overrideVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/sr/animesrbija/build.gradle b/src/sr/animesrbija/build.gradle
index dcb1115b..7deac6fb 100644
--- a/src/sr/animesrbija/build.gradle
+++ b/src/sr/animesrbija/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anime Srbija'
     extClass = '.AnimeSrbija'
-    extVersionCode = 11
+    extVersionCode = 12
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/animeler/build.gradle b/src/tr/animeler/build.gradle
index 58181623..0f3047d4 100644
--- a/src/tr/animeler/build.gradle
+++ b/src/tr/animeler/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Animeler'
     extClass = '.Animeler'
-    extVersionCode = 16
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/anizm/build.gradle b/src/tr/anizm/build.gradle
index 102ced5e..71efbd1a 100644
--- a/src/tr/anizm/build.gradle
+++ b/src/tr/anizm/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anizm'
     extClass = '.Anizm'
-    extVersionCode = 25
+    extVersionCode = 26
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/tranimeizle/build.gradle b/src/tr/tranimeizle/build.gradle
index 426aa9a6..cb95a536 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 = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/turkanime/build.gradle b/src/tr/turkanime/build.gradle
index 3f3d3007..83ec41a6 100644
--- a/src/tr/turkanime/build.gradle
+++ b/src/tr/turkanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Türk Anime TV'
     extClass = '.TurkAnime'
-    extVersionCode = 34
+    extVersionCode = 35
 }
 
 apply from: "$rootDir/common.gradle"