diff --git a/lib-multisrc/animestream/build.gradle.kts b/lib-multisrc/animestream/build.gradle.kts
index 5e2a19a1..e2f11e9c 100644
--- a/lib-multisrc/animestream/build.gradle.kts
+++ b/lib-multisrc/animestream/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 2
\ No newline at end of file
+baseVersionCode = 3
diff --git a/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt b/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt
index fbd2a189..d6a25493 100644
--- a/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt
+++ b/lib-multisrc/animestream/src/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt
@@ -117,7 +117,11 @@ abstract class AnimeStream(
     }
 
     protected open fun searchAnimeByPathParse(response: Response): AnimesPage {
-        val details = animeDetailsParse(response.asJsoup())
+        val details = animeDetailsParse(response.asJsoup()).apply {
+            setUrlWithoutDomain(response.request.url.toString())
+            initialized = true
+        }
+
         return AnimesPage(listOf(details), false)
     }
 
diff --git a/lib-multisrc/dooplay/build.gradle.kts b/lib-multisrc/dooplay/build.gradle.kts
index 0024039f..9dce2478 100644
--- a/lib-multisrc/dooplay/build.gradle.kts
+++ b/lib-multisrc/dooplay/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 1
\ No newline at end of file
+baseVersionCode = 2
diff --git a/lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt b/lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt
index 818496c8..7756075c 100644
--- a/lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt
+++ b/lib-multisrc/dooplay/src/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt
@@ -155,7 +155,11 @@ abstract class DooPlay(
     // =============================== Search ===============================
 
     private fun searchAnimeByPathParse(response: Response): AnimesPage {
-        val details = animeDetailsParse(response)
+        val details = animeDetailsParse(response).apply {
+            setUrlWithoutDomain(response.request.url.toString())
+            initialized = true
+        }
+
         return AnimesPage(listOf(details), false)
     }
 
diff --git a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
index 1ea54de1..747db057 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,5 +1,6 @@
 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
@@ -51,6 +52,7 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
         val subtitleList = buildList {
             val subtitles = REGEX_SUBS.findAll(decryptedScript)
             subtitles.forEach {
+                Log.d("ChillxExtractor", "Found subtitle: ${it.groupValues}")
                 add(Track(it.groupValues[1], decodeUnicodeEscape(it.groupValues[2])))
             }
         }
diff --git a/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt b/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt
index 2d2c460c..9b626958 100644
--- a/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt
+++ b/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt
@@ -5,36 +5,50 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import okhttp3.Headers
 import okhttp3.OkHttpClient
+import java.net.URI
 
 class DoodExtractor(private val client: OkHttpClient) {
 
     fun videoFromUrl(
         url: String,
-        quality: String? = null,
+        prefix: String? = null,
         redirect: Boolean = true,
         externalSubs: List<Track> = emptyList(),
     ): Video? {
-        val newQuality = quality ?: ("Doodstream" + if (redirect) " mirror" else "")
-
         return runCatching {
             val response = client.newCall(GET(url)).execute()
             val newUrl = if (redirect) response.request.url.toString() else url
 
-            val doodHost = Regex("https://(.*?)/").find(newUrl)!!.groupValues[1]
+            val doodHost = getBaseUrl(newUrl)
             val content = response.body.string()
             if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
+
+            // Obtener la calidad del título de la página
+            val extractedQuality = Regex("\\d{3,4}p")
+                .find(content.substringAfter("<title>").substringBefore("</title>"))
+                ?.groupValues
+                ?.getOrNull(0)
+
+            // Determinar la calidad a usar
+            val newQuality = extractedQuality ?: ( if (redirect) " mirror" else "")
+
+            // Obtener el hash MD5
+            val md5 = doodHost + (Regex("/pass_md5/[^']*").find(content)?.value ?: return null)
             val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
+            val randomString = createHashTable()
             val expiry = System.currentTimeMillis()
+
+            // Obtener la URL del video
             val videoUrlStart = client.newCall(
                 GET(
-                    "https://$doodHost/pass_md5/$md5",
+                    md5,
                     Headers.headersOf("referer", newUrl),
                 ),
             ).execute().body.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            Video(videoUrl, newQuality, videoUrl, headers = doodHeaders(doodHost), subtitleTracks = externalSubs)
+
+            val trueUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
+
+            Video(trueUrl, prefix + "Doodstream " + newQuality , trueUrl, headers = doodHeaders(doodHost), subtitleTracks = externalSubs)
         }.getOrNull()
     }
 
@@ -44,16 +58,27 @@ class DoodExtractor(private val client: OkHttpClient) {
         redirect: Boolean = true,
     ): List<Video> {
         val video = videoFromUrl(url, quality, redirect)
-        return video?.let(::listOf) ?: emptyList<Video>()
+        return video?.let(::listOf) ?: emptyList()
     }
 
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
+    // Método para generar una cadena aleatoria
+    private fun createHashTable(): String {
+        val alphabet = ('A'..'Z') + ('a'..'z') + ('0'..'9')
+        return buildString {
+            repeat(10) {
+                append(alphabet.random())
+            }
+        }
     }
 
+    // Método para obtener la base de la URL
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+
+    // Método para obtener headers personalizados
     private fun doodHeaders(host: String) = Headers.Builder().apply {
         add("User-Agent", "Aniyomi")
         add("Referer", "https://$host/")
diff --git a/lib/goodstream-extractor/build.gradle.kts b/lib/goodstream-extractor/build.gradle.kts
new file mode 100644
index 00000000..c26cbc8a
--- /dev/null
+++ b/lib/goodstream-extractor/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+    id("lib-android")
+}
diff --git a/lib/goodstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/goodstramextractor/GoodStreamExtractor.kt b/lib/goodstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/goodstramextractor/GoodStreamExtractor.kt
new file mode 100644
index 00000000..208a9851
--- /dev/null
+++ b/lib/goodstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/goodstramextractor/GoodStreamExtractor.kt
@@ -0,0 +1,33 @@
+package eu.kanade.tachiyomi.lib.goodstramextractor
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class GoodStreamExtractor(private val client: OkHttpClient, private val headers: Headers) {
+
+    fun videosFromUrl(url: String, name: String): List<Video> {
+        val doc = client.newCall(GET(url, headers)).execute().asJsoup()
+        val videos = mutableListOf<Video>()
+
+        doc.select("script").forEach { script ->
+            if (script.data().contains(Regex("file|player"))) {
+                val urlRegex = Regex("file: \"(https:\\/\\/[a-z0-9.\\/-_?=&]+)\",")
+                urlRegex.find(script.data())?.groupValues?.get(1)?.let { link ->
+                    videos.add(
+                        Video(
+                            url = link,
+                            quality = name,
+                            videoUrl = link,
+                            headers = headers
+                        )
+                    )
+                }
+            }
+        }
+
+        return videos
+    }
+}
diff --git a/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt b/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
index 3591258d..1ea06fbd 100644
--- a/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
+++ b/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
@@ -8,6 +8,7 @@ import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.internal.commonEmptyHeaders
+import kotlin.math.abs
 
 class PlaylistUtils(private val client: OkHttpClient, private val headers: Headers = commonEmptyHeaders) {
 
@@ -126,10 +127,16 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
         }.toList()
 
         return masterPlaylist.substringAfter(PLAYLIST_SEPARATOR).split(PLAYLIST_SEPARATOR).mapNotNull {
+            val codec = it.substringAfter("CODECS=\"", "").substringBefore("\"", "")
+            if (codec.isNotEmpty()) {
+                if (codec.startsWith("mp4a")) return@mapNotNull null
+            }
+
+
             val resolution = it.substringAfter("RESOLUTION=")
                 .substringBefore("\n")
                 .substringAfter("x")
-                .substringBefore(",") + "p"
+                .substringBefore(",").let(::stnQuality)
 
             val videoUrl = it.substringAfter("\n").substringBefore("\n").let { url ->
                 getAbsoluteUrl(url, playlistUrl, masterUrlBasePath)?.trimEnd()
@@ -328,6 +335,13 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
 
     // ============================= Utilities ==============================
 
+    private fun stnQuality(quality: String): String {
+        val intQuality = quality.toInt()
+        val standardQualities = listOf(144, 240, 360, 480, 720, 1080)
+        val result =  standardQualities.minByOrNull { abs(it - intQuality) } ?: quality
+        return "${result}p"
+    }
+
     companion object {
         private const val PLAYLIST_SEPARATOR = "#EXT-X-STREAM-INF:"
 
diff --git a/lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt b/lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt
index 87daac7a..090d20ed 100644
--- a/lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt
+++ b/lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt
@@ -1,25 +1,48 @@
 package eu.kanade.tachiyomi.lib.streamhidevidextractor
 
+import android.util.Log
 import dev.datlag.jsunpacker.JsUnpacker
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
 import okhttp3.OkHttpClient
 
-class StreamHideVidExtractor(private val client: OkHttpClient) {
+class StreamHideVidExtractor(private val client: OkHttpClient, private val headers: Headers) {
 
-    private val playlistUtils by lazy { PlaylistUtils(client) }
 
-    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
-        val page = client.newCall(GET(url)).execute().body.string()
-        val playlistUrl = (JsUnpacker.unpackAndCombine(page) ?: page)
-            .substringAfter("sources:")
-            .substringAfter("file:\"") // StreamHide
-            .substringAfter("src:\"") // StreamVid
-            .substringBefore('"')
-        if (!playlistUrl.startsWith("http")) return emptyList()
-        return playlistUtils.extractFromHls(playlistUrl,
-            videoNameGen = { "${prefix}StreamHideVid - $it" }
-        )
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    fun videosFromUrl(url: String, videoNameGen: (String) -> String = { quality -> "StreamHideVid - $quality" }): List<Video> {
+
+        val doc = client.newCall(GET(getEmbedUrl(url), headers)).execute().asJsoup()
+
+        val scriptBody = doc.selectFirst("script:containsData(m3u8)")?.data()
+            ?.let { script ->
+                if (script.contains("eval(function(p,a,c")) {
+                    JsUnpacker.unpackAndCombine(script)
+                } else {
+                    script
+                }
+            }
+        val masterUrl = scriptBody
+            ?.substringAfter("source", "")
+            ?.substringAfter("file:\"", "")
+            ?.substringBefore("\"", "")
+            ?.takeIf(String::isNotBlank)
+            ?: return emptyList()
+
+        Log.d("StreamHideVidExtractor", "Playlist URL: $masterUrl")
+        return playlistUtils.extractFromHls(masterUrl, url, videoNameGen = videoNameGen)
+    }
+
+     private fun getEmbedUrl(url: String): String {
+        return when {
+            url.contains("/d/") -> url.replace("/d/", "/v/")
+            url.contains("/download/") -> url.replace("/download/", "/v/")
+            url.contains("/file/") -> url.replace("/file/", "/v/")
+            else -> url.replace("/f/", "/v/")
+        }
     }
 }
diff --git a/lib/universal-extractor/build.gradle.kts b/lib/universal-extractor/build.gradle.kts
new file mode 100644
index 00000000..d31dd9ff
--- /dev/null
+++ b/lib/universal-extractor/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("lib-android")
+}
+
+dependencies {
+    implementation(project(":lib:playlist-utils"))
+}
diff --git a/lib/universal-extractor/src/main/java/eu/kanade/tachiyomi/lib/universalextractor/UniversalExtractor.kt b/lib/universal-extractor/src/main/java/eu/kanade/tachiyomi/lib/universalextractor/UniversalExtractor.kt
new file mode 100644
index 00000000..16408cec
--- /dev/null
+++ b/lib/universal-extractor/src/main/java/eu/kanade/tachiyomi/lib/universalextractor/UniversalExtractor.kt
@@ -0,0 +1,115 @@
+package eu.kanade.tachiyomi.lib.universalextractor
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class UniversalExtractor(private val client: OkHttpClient) {
+    private val context: Application by injectLazy()
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+    @SuppressLint("SetJavaScriptEnabled")
+    fun videosFromUrl(origRequestUrl: String, origRequestHeader: Headers, customQuality: String? = null, prefix: String = ""): List<Video> {
+        val host = origRequestUrl.toHttpUrl().host.substringBefore(".").proper()
+        val latch = CountDownLatch(1)
+        var webView: WebView? = null
+        var resultUrl = ""
+        val playlistUtils by lazy { PlaylistUtils(client, origRequestHeader) }
+        val headers = origRequestHeader.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
+
+        handler.post {
+            val newView = WebView(context)
+            webView = newView
+            with(newView.settings) {
+                javaScriptEnabled = true
+                domStorageEnabled = true
+                databaseEnabled = true
+                useWideViewPort = false
+                loadWithOverviewMode = false
+                userAgentString = origRequestHeader["User-Agent"]
+            }
+            newView.webViewClient = object : WebViewClient() {
+                override fun shouldInterceptRequest(
+                    view: WebView,
+                    request: WebResourceRequest,
+                ): WebResourceResponse? {
+                    val url = request.url.toString()
+                    if (VIDEO_REGEX.containsMatchIn(url)) {
+                        resultUrl = url
+                        latch.countDown()
+                    }
+                    return super.shouldInterceptRequest(view, request)
+                }
+            }
+
+            webView?.loadUrl(origRequestUrl, headers)
+        }
+
+        latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+            webView = null
+        }
+        // terabox special case start
+        if ("M3U8_AUTO_360" in resultUrl) {
+            val qualities = listOf("1080", "720", "480", "360")
+            val allVideos = mutableListOf<Video>()
+
+            for (quality in qualities) {
+                val modifiedUrl = resultUrl.replace("M3U8_AUTO_360", "M3U8_AUTO_$quality")
+                val videos = playlistUtils.extractFromHls(modifiedUrl, origRequestUrl, videoNameGen = { "$prefix - $host: $it $quality" + "p" })
+
+                if (videos.isNotEmpty()) {
+                    allVideos.addAll(videos)
+                }
+            }
+
+            if (allVideos.isNotEmpty()) {
+                return allVideos
+            }
+        }
+        // terabox special case end
+
+        return when {
+            "m3u8" in resultUrl -> {
+                Log.d("UniversalExtractor", "m3u8 URL: $resultUrl")
+                playlistUtils.extractFromHls(resultUrl, origRequestUrl, videoNameGen = { "$prefix - $host: $it" })
+            }
+            "mpd" in resultUrl -> {
+                Log.d("UniversalExtractor", "mpd URL: $resultUrl")
+                playlistUtils.extractFromDash(resultUrl, { it -> "$prefix - $host: $it" }, referer = origRequestUrl)
+            }
+            "mp4" in resultUrl -> {
+                Log.d("UniversalExtractor", "mp4 URL: $resultUrl")
+                Video(resultUrl, "$prefix - $host: ${customQuality ?: "Mirror"}", resultUrl, origRequestHeader.newBuilder().add("referer", origRequestUrl).build()).let(::listOf)
+            }
+            else -> emptyList()
+        }
+    }
+
+    private fun String.proper(): String {
+        return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase(
+            Locale.getDefault()) else it.toString() }
+    }
+
+    companion object {
+        const val TIMEOUT_SEC: Long = 10
+        private val VIDEO_REGEX by lazy { Regex(".*\\.(mp4|m3u8|mpd)(\\?.*)?$") }
+    }
+}
diff --git a/lib/uqload-extractor/src/main/java/eu/kanade/tachiyomi/lib/uqloadextractor/UqloadExtractor.kt b/lib/uqload-extractor/src/main/java/eu/kanade/tachiyomi/lib/uqloadextractor/UqloadExtractor.kt
index f98193e0..c420deb9 100644
--- a/lib/uqload-extractor/src/main/java/eu/kanade/tachiyomi/lib/uqloadextractor/UqloadExtractor.kt
+++ b/lib/uqload-extractor/src/main/java/eu/kanade/tachiyomi/lib/uqloadextractor/UqloadExtractor.kt
@@ -17,7 +17,7 @@ class UqloadExtractor(private val client: OkHttpClient) {
             ?.takeIf { it.startsWith("http") }
             ?: return emptyList()
 
-        val videoHeaders = Headers.headersOf("Referer", "https://uqload.co/")
+        val videoHeaders = Headers.headersOf("Referer", "https://uqload.ws/")
         val quality = if (prefix.isNotBlank()) "$prefix Uqload" else "Uqload"
 
         return listOf(Video(videoUrl, quality, videoUrl, videoHeaders))
diff --git a/src/all/debridindex/AndroidManifest.xml b/src/all/debridindex/AndroidManifest.xml
new file mode 100644
index 00000000..193c019a
--- /dev/null
+++ b/src/all/debridindex/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".all.debridindex.DebirdIndexUrlActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="torrentio.strem.fun"
+                    android:pathPattern="/anime/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/src/all/debridindex/build.gradle b/src/all/debridindex/build.gradle
new file mode 100644
index 00000000..05b7a71f
--- /dev/null
+++ b/src/all/debridindex/build.gradle
@@ -0,0 +1,8 @@
+ext {
+    extName = 'Debrid Index'
+    extClass = '.DebridIndex'
+    extVersionCode = 1
+    containsNsfw = false
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/all/debridindex/res/mipmap-hdpi/ic_launcher.png b/src/all/debridindex/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..c436527b
Binary files /dev/null and b/src/all/debridindex/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/all/debridindex/res/mipmap-mdpi/ic_launcher.png b/src/all/debridindex/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..0298c082
Binary files /dev/null and b/src/all/debridindex/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/all/debridindex/res/mipmap-xhdpi/ic_launcher.png b/src/all/debridindex/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..48a1105b
Binary files /dev/null and b/src/all/debridindex/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/all/debridindex/res/mipmap-xxhdpi/ic_launcher.png b/src/all/debridindex/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..9f85dfcc
Binary files /dev/null and b/src/all/debridindex/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/all/debridindex/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/debridindex/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..d1861dc5
Binary files /dev/null and b/src/all/debridindex/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/DebirdIndexUrlActivity.kt b/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/DebirdIndexUrlActivity.kt
new file mode 100644
index 00000000..008b5f8a
--- /dev/null
+++ b/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/DebirdIndexUrlActivity.kt
@@ -0,0 +1,40 @@
+package eu.kanade.tachiyomi.animeextension.all.debridindex
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+
+/**
+ * Springboard that accepts https://torrentio.strem.fun/anime/<item> intents
+ * and redirects them to the main Aniyomi process.
+ */
+class DebirdIndexUrlActivity : Activity() {
+
+    private val tag = javaClass.simpleName
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null && pathSegments.size > 1) {
+            val item = pathSegments[1]
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", "${DebridIndex.PREFIX_SEARCH}$item")
+                putExtra("filter", packageName)
+            }
+
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {
+                Log.e(tag, e.toString())
+            }
+        } else {
+            Log.e(tag, "could not parse uri from intent $intent")
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/DebridIndex.kt b/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/DebridIndex.kt
new file mode 100644
index 00000000..3ef02f5d
--- /dev/null
+++ b/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/DebridIndex.kt
@@ -0,0 +1,208 @@
+package eu.kanade.tachiyomi.animeextension.all.debridindex
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.widget.Toast
+import androidx.preference.EditTextPreference
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import androidx.preference.SwitchPreferenceCompat
+import eu.kanade.tachiyomi.animeextension.all.debridindex.dto.RootFiles
+import eu.kanade.tachiyomi.animeextension.all.debridindex.dto.SubFiles
+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.network.GET
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+import java.lang.Exception
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class DebridIndex : ConfigurableAnimeSource, AnimeHttpSource() {
+
+    override val name = "Debrid Index"
+
+    override val baseUrl = "https://torrentio.strem.fun"
+
+    override val lang = "all"
+
+    override val supportsLatest = false
+
+    private val json: Json by injectLazy()
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int): Request {
+        val tokenKey = preferences.getString(PREF_TOKEN_KEY, null)
+        val debridProvider = preferences.getString(PREF_DEBRID_KEY, "RealDebrid")
+        when {
+            tokenKey.isNullOrBlank() -> throw Exception("Please enter the token in extension settings.")
+            else -> {
+                return GET("$baseUrl/${debridProvider!!.lowercase()}=$tokenKey/catalog/other/torrentio-${debridProvider.lowercase()}.json")
+            }
+        }
+    }
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val animeList = json.decodeFromString<RootFiles>(response.body.string()).metas?.map { meta ->
+            SAnime.create().apply {
+                title = meta.name
+                url = meta.id
+                thumbnail_url = if (meta.name == "Downloads") {
+                    "https://i.ibb.co/MGmhmJg/download.png"
+                } else {
+                    "https://i.ibb.co/Q9GPtbC/default.png"
+                }
+            }
+        } ?: emptyList()
+        return AnimesPage(animeList, false)
+    }
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request = throw Exception("Not used")
+    override fun latestUpdatesParse(response: Response): AnimesPage = throw Exception("Not used")
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val tokenKey = preferences.getString(PREF_TOKEN_KEY, null)
+        val debridProvider = preferences.getString(PREF_DEBRID_KEY, "RealDebrid")
+        when {
+            tokenKey.isNullOrBlank() -> throw Exception("Please enter the token in extension settings.")
+            else -> {
+                // Used Debrid Search v0.1.8 https://68d69db7dc40-debrid-search.baby-beamup.club/configure
+                return GET("https://68d69db7dc40-debrid-search.baby-beamup.club/%7B%22DebridProvider%22%3A%22$debridProvider%22%2C%22DebridApiKey%22%3A%22$tokenKey%22%7D/catalog/other/debridsearch/search=$query.json")
+            }
+        }
+    }
+
+    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
+    // =========================== Anime Details ============================
+
+    override fun animeDetailsParse(response: Response): SAnime = throw UnsupportedOperationException()
+
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
+        return anime
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListRequest(anime: SAnime): Request {
+        val tokenKey = preferences.getString(PREF_TOKEN_KEY, null)
+        val debridProvider = preferences.getString(PREF_DEBRID_KEY, "RealDebrid")
+        return GET("$baseUrl/${debridProvider!!.lowercase()}=$tokenKey/meta/other/${anime.url}.json")
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val jsonData = response.body.string()
+        return json.decodeFromString<SubFiles>(jsonData).meta?.videos?.mapIndexed { index, video ->
+            SEpisode.create().apply {
+                episode_number = (index + 1).toFloat()
+                name = if (preferences.getBoolean(IS_FILENAME_KEY, IS_FILENAME_DEFAULT)) {
+                    video.title.trim().split('/').last()
+                } else {
+                    video.title.trim()
+                        .replace("[", "(")
+                        .replace(Regex("]"), ")")
+                        .replace("/", "\uD83D\uDCC2 ")
+                }
+                url = video.streams.firstOrNull()?.url.orEmpty()
+                date_upload = parseDate(video.released)
+            }
+        }?.reversed() ?: emptyList()
+    }
+
+    private fun parseDate(dateStr: String): Long {
+        return runCatching { DATE_FORMATTER.parse(dateStr)?.time }
+            .getOrNull() ?: 0L
+    }
+
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        return listOf(Video(episode.url, episode.name.split("/").last(), episode.url))
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        // Debrid provider
+        ListPreference(screen.context).apply {
+            key = PREF_DEBRID_KEY
+            title = "Debird Provider"
+            entries = PREF_DEBRID_ENTRIES
+            entryValues = PREF_DEBRID_VALUES
+            setDefaultValue("realdebrid")
+            summary = "Don't forget to enter your token key."
+
+            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)
+
+        // Token
+        EditTextPreference(screen.context).apply {
+            key = PREF_TOKEN_KEY
+            title = "Real Debrid Token"
+            setDefaultValue(PREF_TOKEN_DEFAULT)
+            summary = PREF_TOKEN_SUMMARY
+
+            setOnPreferenceChangeListener { _, newValue ->
+                runCatching {
+                    val value = (newValue as String).trim().ifBlank { PREF_TOKEN_DEFAULT }
+                    Toast.makeText(screen.context, "Restart app to apply new setting.", Toast.LENGTH_LONG).show()
+                    preferences.edit().putString(key, value).commit()
+                }.getOrDefault(false)
+            }
+        }.also(screen::addPreference)
+
+        SwitchPreferenceCompat(screen.context).apply {
+            key = IS_FILENAME_KEY
+            title = "Only display filename"
+            setDefaultValue(IS_FILENAME_DEFAULT)
+            setOnPreferenceChangeListener { _, newValue ->
+                preferences.edit().putBoolean(key, newValue as Boolean).commit()
+            }
+            summary = "Will note display full path of episode."
+        }.also(screen::addPreference)
+    }
+
+    companion object {
+        const val PREFIX_SEARCH = "id:"
+
+        // Token
+        private const val PREF_TOKEN_KEY = "token"
+        private const val PREF_TOKEN_DEFAULT = "none"
+        private const val PREF_TOKEN_SUMMARY = "For temporary uses. Updating the extension will erase this setting."
+
+        // Debird
+        private const val PREF_DEBRID_KEY = "debrid_provider"
+        private val PREF_DEBRID_ENTRIES = arrayOf(
+            "RealDebrid",
+            "Premiumize",
+            "AllDebrid",
+            "DebridLink",
+        )
+        private val PREF_DEBRID_VALUES = arrayOf(
+            "RealDebrid",
+            "Premiumize",
+            "AllDebrid",
+            "DebridLink",
+        )
+
+        private const val IS_FILENAME_KEY = "filename"
+        private const val IS_FILENAME_DEFAULT = false
+
+        private val DATE_FORMATTER by lazy {
+            SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ENGLISH)
+        }
+    }
+}
diff --git a/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/dto/DebridIndexDto.kt b/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/dto/DebridIndexDto.kt
new file mode 100644
index 00000000..eb4a1c0e
--- /dev/null
+++ b/src/all/debridindex/src/eu/kanade/tachiyomi/animeextension/all/debridindex/dto/DebridIndexDto.kt
@@ -0,0 +1,35 @@
+package eu.kanade.tachiyomi.animeextension.all.debridindex.dto
+
+import kotlinx.serialization.Serializable
+
+// Root
+@Serializable
+data class RootFiles(
+    val metas: List<Meta>? = null,
+)
+
+@Serializable
+data class SubFiles(
+    val meta: Meta? = null,
+)
+
+@Serializable
+data class Meta(
+    val id: String,
+    val type: String,
+    val name: String,
+    val videos: List<Video>? = null,
+)
+
+@Serializable
+data class Video(
+    val id: String,
+    val title: String,
+    val released: String,
+    val streams: List<Stream>,
+)
+
+@Serializable
+data class Stream(
+    val url: String,
+)
diff --git a/src/all/hikari/build.gradle b/src/all/hikari/build.gradle
index cd8617d3..215336a5 100644
--- a/src/all/hikari/build.gradle
+++ b/src/all/hikari/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hikari'
     extClass = '.Hikari'
-    extVersionCode = 14
+    extVersionCode = 15
 }
 
 apply from: "$rootDir/common.gradle"
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 0ccfb7d7..26b65154 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
@@ -208,11 +208,17 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     override fun episodeListSelector() = "a[class~=ep-item]"
 
     override fun episodeFromElement(element: Element): SEpisode {
-        val ep = element.selectFirst(".ssli-order")!!.text()
+        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.toFloat()
-            name = "Ep. $ep - ${element.selectFirst(".ep-name")?.text() ?: ""}"
+            episode_number = ep
+            name = "Ep. $ep - $nameText"
         }
     }
 
diff --git a/src/all/javgg/build.gradle b/src/all/javgg/build.gradle
index a37ff201..a8a51ac4 100644
--- a/src/all/javgg/build.gradle
+++ b/src/all/javgg/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'JavGG'
     extClass = '.Javgg'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = true
 }
 
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
index 20179da6..cb2f2f4a 100644
--- 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
@@ -154,8 +154,7 @@ class Javgg : ConfigurableAnimeSource, AnimeHttpSource() {
                     .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("vidhide") || embedUrl.contains("streamhide") || embedUrl.contains("guccihide") || embedUrl.contains("streamvid") -> StreamHideVidExtractor(client, headers).videosFromUrl(url)
             embedUrl.contains("voe") -> VoeExtractor(client).videosFromUrl(url)
             embedUrl.contains("yourupload") || embedUrl.contains("upload") -> YourUploadExtractor(client).videoFromUrl(url, headers = headers)
             embedUrl.contains("turboplay") -> {
diff --git a/src/all/javguru/build.gradle b/src/all/javguru/build.gradle
index 423d026a..033af185 100644
--- a/src/all/javguru/build.gradle
+++ b/src/all/javguru/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Jav Guru'
     extClass = '.JavGuru'
-    extVersionCode = 19
+    extVersionCode = 24
     isNsfw = true
 }
 
diff --git a/src/all/sudatchi/build.gradle b/src/all/sudatchi/build.gradle
index 7a9c807e..a6cafd56 100644
--- a/src/all/sudatchi/build.gradle
+++ b/src/all/sudatchi/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Sudatchi'
     extClass = '.Sudatchi'
-    extVersionCode = 5
+    extVersionCode = 10
     isNsfw = true
 }
 
diff --git a/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt b/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt
index b4351e3b..a8e44589 100644
--- a/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt
+++ b/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt
@@ -59,7 +59,7 @@ class Sudatchi : AnimeHttpSource(), ConfigurableAnimeSource {
     override fun popularAnimeRequest(page: Int) = GET(baseUrl, headers)
 
     private fun Int.parseStatus() = when (this) {
-        1 -> SAnime.UNKNOWN // Not Yet Released
+        1 -> SAnime.LICENSED // Not Yet Released
         2 -> SAnime.ONGOING
         3 -> SAnime.COMPLETED
         else -> SAnime.UNKNOWN
@@ -86,7 +86,7 @@ class Sudatchi : AnimeHttpSource(), ConfigurableAnimeSource {
         val titleLang = preferences.title
         val document = response.asJsoup()
         val data = document.parseAs<HomePageDto>().animeSpotlight
-        return AnimesPage(data.map { it.toSAnime(titleLang) }, false)
+        return AnimesPage(data.map { it.toSAnime(titleLang) }.filterNot { it.status == SAnime.LICENSED }, false)
     }
 
     // =============================== Latest ===============================
@@ -96,7 +96,7 @@ class Sudatchi : AnimeHttpSource(), ConfigurableAnimeSource {
         sudatchiFilters.fetchFilters()
         val titleLang = preferences.title
         return response.parseAs<DirectoryDto>().let {
-            AnimesPage(it.animes.map { it.toSAnime(titleLang) }, it.page != it.pages)
+            AnimesPage(it.animes.map { it.toSAnime(titleLang) }.filterNot { it.status == SAnime.LICENSED }, it.page != it.pages)
         }
     }
 
@@ -176,7 +176,13 @@ class Sudatchi : AnimeHttpSource(), ConfigurableAnimeSource {
             videoUrl,
             videoNameGen = { "Sudatchi (Private IPFS Gateway) - $it" },
             subtitleList = subtitles.map {
-                Track("$ipfsUrl${it.url}", "${it.subtitlesName.name} (${it.subtitlesName.language})")
+                Track(
+                    when {
+                        it.url.startsWith("/ipfs") -> "$ipfsUrl${it.url}"
+                        else -> "$baseUrl${it.url}"
+                    },
+                    "${it.SubtitlesName.name} (${it.SubtitlesName.language})",
+                )
             }.sort(),
         )
     }
diff --git a/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/dto/SudatchiDto.kt b/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/dto/SudatchiDto.kt
index e72bda0f..39baa939 100644
--- a/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/dto/SudatchiDto.kt
+++ b/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/dto/SudatchiDto.kt
@@ -79,7 +79,7 @@ data class SubtitleLangDto(
 data class SubtitleDto(
     val url: String,
     @SerialName("SubtitlesName")
-    val subtitlesName: SubtitleLangDto,
+    val SubtitlesName: SubtitleLangDto,
 )
 
 @Serializable
diff --git a/src/all/torrentio/build.gradle b/src/all/torrentio/build.gradle
index babff732..b61fce87 100644
--- a/src/all/torrentio/build.gradle
+++ b/src/all/torrentio/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Torrentio (Torrent / Debrid)'
     extClass = '.Torrentio'
-    extVersionCode = 2
+    extVersionCode = 5
     containsNsfw = false
 }
 
diff --git a/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/Torrentio.kt b/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/Torrentio.kt
index 7eed3eb3..218491d9 100644
--- a/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/Torrentio.kt
+++ b/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/Torrentio.kt
@@ -22,7 +22,6 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.awaitSuccess
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
@@ -60,7 +59,12 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         {"query": "${query.replace("\n", "")}", "variables": $variables}
         """.trimIndent().toRequestBody("application/json; charset=utf-8".toMediaType())
 
-        return POST("https://apis.justwatch.com/graphql", headers = headers, body = requestBody)
+        val request = Request.Builder()
+            .url("https://apis.justwatch.com/graphql")
+            .post(requestBody)
+            .build()
+
+        return request
     }
 
     // ============================== JustWatch Api Query ======================
@@ -135,7 +139,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
                 val content = node.content ?: return@mapNotNull null
 
                 SAnime.create().apply {
-                    url = "${content.externalIds?.imdbId ?: ""},${node.objectType ?: ""},${content.fullPath ?: ""}"
+                    url = "${content.externalIds?.imdbId ?: ""},${if (node.objectType == "SHOW") "series" else node.objectType ?: ""},${content.fullPath ?: ""}"
                     title = content.title ?: ""
                     thumbnail_url = "https://images.justwatch.com${content.posterUrl?.replace("{profile}", "s276")?.replace("{format}", "webp")}"
                     description = content.shortDescription ?: ""
@@ -155,7 +159,31 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================== Popular ===============================
     override fun popularAnimeRequest(page: Int): Request {
-        return searchAnimeRequest(page, "", AnimeFilterList())
+        val country = preferences.getString(PREF_REGION_KEY, PREF_REGION_DEFAULT)
+        val language = preferences.getString(PREF_JW_LANG_KEY, PREF_JW_LANG_DEFAULT)
+        val perPage = 40
+        val packages = ""
+        val year = 0
+        val objectTypes = ""
+        val variables = """
+            {
+              "first": $perPage,
+              "offset": ${(page - 1) * perPage},
+              "platform": "WEB",
+              "country": "$country",
+              "language": "$language",
+              "searchQuery": "",
+              "packages": [$packages],
+              "objectTypes": [$objectTypes],
+              "popularTitlesSortBy": "TRENDING",
+              "releaseYear": {
+                "min": $year,
+                "max": $year
+              }
+            }
+        """.trimIndent()
+
+        return makeGraphQLRequest(justWatchQuery(), variables)
     }
 
     override fun popularAnimeParse(response: Response): AnimesPage {
@@ -171,7 +199,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
     override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
-            client.newCall(GET("$baseUrl/anime/$id", headers))
+            client.newCall(GET("$baseUrl/anime/$id"))
                 .awaitSuccess()
                 .use(::searchAnimeByIdParse)
         } else {
@@ -198,7 +226,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
               "platform": "WEB",
               "country": "$country",
               "language": "$language",
-              "searchQuery": "${query.replace(searchQueryRegex, "").trim()}",
+              "searchQuery": "${query.replace(Regex("[^A-Za-z0-9 ]"), "").trim()}",
               "packages": [$packages],
               "objectTypes": [$objectTypes],
               "popularTitlesSortBy": "TRENDING",
@@ -212,10 +240,6 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         return makeGraphQLRequest(justWatchQuery(), variables)
     }
 
-    private val searchQueryRegex by lazy {
-        Regex("[^A-Za-z0-9 ]")
-    }
-
     override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
 
     // =========================== Anime Details ============================
@@ -288,18 +312,18 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         val responseString = response.body.string()
         val episodeList = json.decodeFromString<EpisodeList>(responseString)
         return when (episodeList.meta?.type) {
-            "show" -> {
+            "series" -> {
                 episodeList.meta.videos
                     ?.let { videos ->
-                        if (preferences.getBoolean(UPCOMING_EP_KEY, UPCOMING_EP_DEFAULT)) { videos } else { videos.filter { video -> (video.firstAired?.let { parseDate(it) } ?: 0L) <= System.currentTimeMillis() } }
+                        if (preferences.getBoolean(UPCOMING_EP_KEY, UPCOMING_EP_DEFAULT)) { videos } else { videos.filter { video -> (video.released?.let { parseDate(it) } ?: 0L) <= System.currentTimeMillis() } }
                     }
                     ?.map { video ->
                         SEpisode.create().apply {
                             episode_number = "${video.season}.${video.number}".toFloat()
                             url = "/stream/series/${video.id}.json"
-                            date_upload = video.firstAired?.let { parseDate(it) } ?: 0L
-                            name = "S${video.season.toString().trim()}:E${video.number} - ${video.name}"
-                            scanlator = (video.firstAired?.let { parseDate(it) } ?: 0L)
+                            date_upload = video.released?.let { parseDate(it) } ?: 0L
+                            name = "S${video.season.toString().trim()}:E${video.number} - ${video.title}"
+                            scanlator = (video.released?.let { parseDate(it) } ?: 0L)
                                 .takeIf { it > System.currentTimeMillis() }
                                 ?.let { "Upcoming" }
                                 ?: ""
@@ -402,7 +426,8 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             udp://tracker.tiny-vps.com:6969/announce,
             udp://tracker.torrent.eu.org:451/announce,
             udp://valakas.rollo.dnsabr.com:2710/announce,
-            udp://www.torrent.eu.org:451/announce
+            udp://www.torrent.eu.org:451/announce,
+             ${fetchTrackers().split("\n").joinToString(",")}
         """.trimIndent()
 
         return streamList.streams?.map { stream ->
@@ -428,6 +453,17 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         )
     }
 
+    private fun fetchTrackers(): String {
+        val request = Request.Builder()
+            .url("https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt")
+            .build()
+
+        client.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) throw Exception("Unexpected code $response")
+            return response.body.string().trim()
+        }
+    }
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         // Debrid provider
         ListPreference(screen.context).apply {
@@ -652,7 +688,10 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "🇫🇷 Torrent9",
             "🇪🇸 MejorTorrent",
             "🇲🇽 Cinecalidad",
+            "🇮🇹 ilCorsaroNero",
+            "🇪🇸 Wolfmax4k",
         )
+
         private val PREF_PROVIDERS_VALUE = arrayOf(
             "yts",
             "eztv",
@@ -673,6 +712,8 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "torrent9",
             "mejortorrent",
             "cinecalidad",
+            "ilcorsaronero",
+            "wolfmax4k",
         )
 
         private val PREF_DEFAULT_PROVIDERS_VALUE = arrayOf(
@@ -691,12 +732,15 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         )
         private val PREF_PROVIDERS_DEFAULT = PREF_DEFAULT_PROVIDERS_VALUE.toSet()
 
-        // Qualities/Resolutions
+        // / Qualities/Resolutions
         private const val PREF_QUALITY_KEY = "quality_selection"
         private val PREF_QUALITY = arrayOf(
             "BluRay REMUX",
             "HDR/HDR10+/Dolby Vision",
             "Dolby Vision",
+            "Dolby Vision + HDR",
+            "3D",
+            "Non 3D (DO NOT SELECT IF NOT SURE)",
             "4k",
             "1080p",
             "720p",
@@ -706,10 +750,14 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "Cam",
             "Unknown",
         )
+
         private val PREF_QUALITY_VALUE = arrayOf(
             "brremux",
             "hdrall",
             "dolbyvision",
+            "dolbyvisionwithhdr",
+            "threed",
+            "nonthreed",
             "4k",
             "1080p",
             "720p",
@@ -832,7 +880,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         private val PREF_LANG_DEFAULT = setOf<String>()
 
         private const val UPCOMING_EP_KEY = "upcoming_ep"
-        private const val UPCOMING_EP_DEFAULT = true
+        private const val UPCOMING_EP_DEFAULT = false
 
         private const val IS_DUB_KEY = "dubbed"
         private const val IS_DUB_DEFAULT = false
diff --git a/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/dto/TorrentioDto.kt b/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/dto/TorrentioDto.kt
index 064c18ad..72e99899 100644
--- a/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/dto/TorrentioDto.kt
+++ b/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/dto/TorrentioDto.kt
@@ -110,6 +110,6 @@ class EpisodeVideo(
     val id: String? = null,
     val season: Int? = null,
     val number: Int? = null,
-    val firstAired: String? = null,
-    val name: String? = null,
+    val released: String? = null,
+    val title: String? = null,
 )
diff --git a/src/all/torrentioanime/build.gradle b/src/all/torrentioanime/build.gradle
index 61921d82..52ec219c 100644
--- a/src/all/torrentioanime/build.gradle
+++ b/src/all/torrentioanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Torrentio Anime (Torrent / Debrid)'
     extClass = '.Torrentio'
-    extVersionCode = 11
+    extVersionCode = 14
     containsNsfw = false
 }
 
diff --git a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListFilters.kt b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListFilters.kt
new file mode 100644
index 00000000..8f404e13
--- /dev/null
+++ b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListFilters.kt
@@ -0,0 +1,155 @@
+package eu.kanade.tachiyomi.animeextension.all.torrentioanime
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object AniListFilters {
+    open class QueryPartFilter(
+        displayName: String,
+        val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart() = vals[state].second
+    }
+
+    open class CheckBoxFilterList(name: String, val pairs: Array<Pair<String, String>>) :
+        AnimeFilter.Group<AnimeFilter.CheckBox>(name, pairs.map { CheckBoxVal(it.first, false) })
+
+    private class CheckBoxVal(name: String, state: Boolean = false) : AnimeFilter.CheckBox(name, state)
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(): String {
+        return (getFirst<R>() as QueryPartFilter).toQueryPart()
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return first { it is R } as R
+    }
+
+    private inline fun <reified R> AnimeFilterList.parseCheckboxList(
+        options: Array<Pair<String, String>>,
+    ): List<String> {
+        return (getFirst<R>() as CheckBoxFilterList).state
+            .filter { it.state }
+            .map { checkBox -> options.find { it.first == checkBox.name }!!.second }
+            .filter(String::isNotBlank)
+    }
+
+    private inline fun <reified R> AnimeFilterList.getSort(): String {
+        val state = (getFirst<R>() as AnimeFilter.Sort).state ?: return ""
+        val index = state.index
+        val suffix = if (state.ascending) "" else "_DESC"
+        return AniListFiltersData.SORT_LIST[index].second + suffix
+    }
+
+    class GenreFilter : CheckBoxFilterList("Genres", AniListFiltersData.GENRE_LIST)
+    class YearFilter : QueryPartFilter("Year", AniListFiltersData.YEAR_LIST)
+    class SeasonFilter : QueryPartFilter("Season", AniListFiltersData.SEASON_LIST)
+    class FormatFilter : CheckBoxFilterList("Format", AniListFiltersData.FORMAT_LIST)
+    class StatusFilter : QueryPartFilter("Airing Status", AniListFiltersData.STATUS_LIST)
+
+    class SortFilter : AnimeFilter.Sort(
+        "Sort",
+        AniListFiltersData.SORT_LIST.map { it.first }.toTypedArray(),
+        Selection(1, false),
+    )
+
+    val FILTER_LIST get() = AnimeFilterList(
+        SortFilter(),
+        FormatFilter(),
+        GenreFilter(),
+        YearFilter(),
+        SeasonFilter(),
+        StatusFilter(),
+
+    )
+
+    class FilterSearchParams(
+        val sort: String = "",
+        val format: List<String> = emptyList(),
+        val genres: List<String> = emptyList(),
+        val year: String = "",
+        val season: String = "",
+        val status: String = "",
+
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        return FilterSearchParams(
+            filters.getSort<SortFilter>(),
+            filters.parseCheckboxList<FormatFilter>(AniListFiltersData.FORMAT_LIST),
+            filters.parseCheckboxList<GenreFilter>(AniListFiltersData.GENRE_LIST),
+            filters.asQueryPart<YearFilter>(),
+            filters.asQueryPart<SeasonFilter>(),
+            filters.asQueryPart<StatusFilter>(),
+
+        )
+    }
+
+    private object AniListFiltersData {
+        val GENRE_LIST = arrayOf(
+            Pair("Action", "Action"),
+            Pair("Adventure", "Adventure"),
+            Pair("Comedy", "Comedy"),
+            Pair("Drama", "Drama"),
+            Pair("Ecchi", "Ecchi"),
+            Pair("Fantasy", "Fantasy"),
+            Pair("Horror", "Horror"),
+            Pair("Mahou Shoujo", "Mahou Shoujo"),
+            Pair("Mecha", "Mecha"),
+            Pair("Music", "Music"),
+            Pair("Mystery", "Mystery"),
+            Pair("Psychological", "Psychological"),
+            Pair("Romance", "Romance"),
+            Pair("Sci-Fi", "Sci-Fi"),
+            Pair("Slice of Life", "Slice of Life"),
+            Pair("Sports", "Sports"),
+            Pair("Supernatural", "Supernatural"),
+            Pair("Thriller", "Thriller"),
+        )
+
+        val YEAR_LIST: Array<Pair<String, String>> = arrayOf(
+            Pair("Any", ""),
+        ) + (1940..2025).reversed().map { Pair(it.toString(), it.toString()) }.toTypedArray()
+
+        val SEASON_LIST = arrayOf(
+            Pair("Any", ""),
+            Pair("Winter", "WINTER"),
+            Pair("Spring", "SPRING"),
+            Pair("Summer", "SUMMER"),
+            Pair("Fall", "FALL"),
+        )
+
+        val FORMAT_LIST = arrayOf(
+            Pair("Any", ""),
+            Pair("TV Show", "TV"),
+            Pair("Movie", "MOVIE"),
+            Pair("TV Short", "TV_SHORT"),
+            Pair("Special", "SPECIAL"),
+            Pair("OVA", "OVA"),
+            Pair("ONA", "ONA"),
+            Pair("Music", "MUSIC"),
+        )
+
+        val STATUS_LIST = arrayOf(
+            Pair("Any", ""),
+            Pair("Airing", "RELEASING"),
+            Pair("Finished", "FINISHED"),
+            Pair("Not Yet Aired", "NOT_YET_RELEASED"),
+            Pair("Cancelled", "CANCELLED"),
+        )
+
+        val SORT_LIST = arrayOf(
+            Pair("Title", "TITLE_ENGLISH"),
+            Pair("Popularity", "POPULARITY"),
+            Pair("Average Score", "SCORE"),
+            Pair("Trending", "TRENDING"),
+            Pair("Favorites", "FAVOURITES"),
+            Pair("Date Added", "ID"),
+            Pair("Release Date", "START_DATE"),
+        )
+    }
+}
diff --git a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListQueries.kt b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListQueries.kt
new file mode 100644
index 00000000..9eb474e0
--- /dev/null
+++ b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListQueries.kt
@@ -0,0 +1,159 @@
+package eu.kanade.tachiyomi.animeextension.all.torrentioanime
+
+private fun String.toQuery() = this.trimIndent().replace("%", "$")
+
+fun anilistQuery() = """
+    query (
+        %page: Int,
+        %perPage: Int,
+        %sort: [MediaSort],
+        %search: String,
+        %genres: [String],
+        %year: String,
+        %seasonYear: Int,
+        %season: MediaSeason,
+        %format: [MediaFormat],
+        %status: [MediaStatus],
+    ) {
+        Page(page: %page, perPage: %perPage) {
+            pageInfo {
+                currentPage
+                hasNextPage
+            }
+            media(
+                type: ANIME,
+                sort: %sort,
+                search: %search,
+                status_in: %status,
+                genre_in: %genres,
+                startDate_like: %year,
+                seasonYear: %seasonYear,
+                season: %season,
+                format_in: %format
+            ) {
+                id
+                title {
+                    romaji
+                    english
+                    native
+                }
+                coverImage {
+                    extraLarge
+                    large
+                }
+                description
+                status
+                tags {
+                    name
+                }
+                genres
+                studios {
+                    nodes {
+                        name
+                    }
+                }
+                countryOfOrigin
+                isAdult
+            }
+        }
+    }
+""".toQuery()
+
+fun anilistLatestQuery() = """
+    query (%page: Int, %perPage: Int, %sort: [AiringSort]) {
+        Page(page: %page, perPage: %perPage) {
+            pageInfo {
+                currentPage
+                hasNextPage
+            }
+            airingSchedules(
+                airingAt_greater: 0,
+                airingAt_lesser: ${System.currentTimeMillis() / 1000 - 10000},
+                sort: %sort
+            ) {
+                media {
+                    id
+                    title {
+                        romaji
+                        english
+                        native
+                    }
+                    coverImage {
+                        extraLarge
+                        large
+                    }
+                    description
+                    status
+                    tags {
+                        name
+                    }
+                    genres
+                    studios {
+                        nodes {
+                            name
+                        }
+                    }
+                    countryOfOrigin
+                    isAdult
+                }
+            }
+        }
+    }
+""".toQuery()
+
+fun getDetailsQuery() = """
+query media(%id: Int) {
+  Media(id: %id) {
+    id
+    title {
+        romaji
+        english
+        native
+    }
+    coverImage {
+        extraLarge
+        large
+        medium
+    }
+    description
+    season
+    seasonYear
+    format
+    status
+    genres
+    episodes
+    format
+    countryOfOrigin
+    isAdult
+    tags{
+        name
+    }
+    studios {
+        nodes {
+          id
+          name
+        }
+    }
+  }
+}
+""".toQuery()
+
+fun getEpisodeQuery() = """
+query media(%id: Int, %type: MediaType) {
+  Media(id: %id, type: %type) {
+    episodes
+    nextAiringEpisode {
+      episode
+    }
+  }
+}
+""".toQuery()
+
+fun getMalIdQuery() = """
+query media(%id: Int, %type: MediaType) {
+  Media(id: %id, type: %type) {
+    idMal
+    id
+  }
+}
+""".toQuery()
diff --git a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt
index d6cd40a5..007f9cc6 100644
--- a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt
+++ b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/Torrentio.kt
@@ -25,15 +25,19 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.awaitSuccess
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import kotlinx.serialization.json.putJsonArray
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
-import org.json.JSONObject
+import org.jsoup.Jsoup
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
-import java.net.URL
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -62,93 +66,9 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             .add("query", query)
             .add("variables", variables)
             .build()
-
         return POST("https://graphql.anilist.co", body = requestBody)
     }
 
-    // ============================== Anilist Meta List ======================
-    private fun anilistQuery(): String {
-        return """
-            query (${"$"}page: Int, ${"$"}perPage: Int, ${"$"}sort: [MediaSort], ${"$"}search: String) {
-                Page(page: ${"$"}page, perPage: ${"$"}perPage) {
-                    pageInfo{
-                        currentPage
-                        hasNextPage
-                    }
-                    media(type: ANIME, sort: ${"$"}sort, search: ${"$"}search, status_in:[RELEASING,FINISHED,NOT_YET_RELEASED]) {
-                        id
-                        title {
-                            romaji
-                            english
-                            native
-                        }
-                        coverImage {
-                            extraLarge
-                            large
-                        }
-                        description
-                        status
-                        tags{
-                            name
-                        }
-                        genres
-                        studios {
-                            nodes {
-                                name
-                            }
-                        }
-                        countryOfOrigin
-                        isAdult
-                    }
-                }
-            }
-        """.trimIndent()
-    }
-
-    private fun anilistLatestQuery(): String {
-        return """
-            query (${"$"}page: Int, ${"$"}perPage: Int, ${"$"}sort: [AiringSort]) {
-              Page(page: ${"$"}page, perPage: ${"$"}perPage) {
-                pageInfo {
-                  currentPage
-                  hasNextPage
-                }
-                airingSchedules(
-                  airingAt_greater: 0
-                  airingAt_lesser: ${System.currentTimeMillis() / 1000 - 10000}
-                  sort: ${"$"}sort
-                ) {
-                  media{
-                    id
-                    title {
-                        romaji
-                        english
-                        native
-                    }
-                    coverImage {
-                       extraLarge
-                       large
-                    }
-                    description
-                    status
-                    tags{
-                        name
-                    }
-                    genres
-                    studios {
-                        nodes {
-                            name
-                        }
-                    }
-                    countryOfOrigin
-                    isAdult
-                  }
-                }
-              }
-            }
-        """.trimIndent()
-    }
-
     private fun parseSearchJson(jsonLine: String?, isLatestQuery: Boolean = false): AnimesPage {
         val jsonData = jsonLine ?: return AnimesPage(emptyList(), false)
         val metaData: Any = if (!isLatestQuery) {
@@ -218,7 +138,8 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             {
                 "page": $page,
                 "perPage": 30,
-                "sort": "TRENDING_DESC"
+                "sort": "TRENDING_DESC",
+                "status": ["FINISHED", "RELEASING"]
             }
         """.trimIndent()
 
@@ -227,8 +148,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun popularAnimeParse(response: Response): AnimesPage {
         val jsonData = response.body.string()
-        return parseSearchJson(jsonData)
-    }
+        return parseSearchJson(jsonData) }
 
     // =============================== Latest ===============================
     override fun latestUpdatesRequest(page: Int): Request {
@@ -261,67 +181,73 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     private fun searchAnimeByIdParse(response: Response): AnimesPage {
-        val details = animeDetailsParse(response).apply {
-            setUrlWithoutDomain(response.request.url.toString())
-            initialized = true
-        }
-
+        val details = animeDetailsParse(response)
         return AnimesPage(listOf(details), false)
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val variables = """
-            {
-                "page": $page,
-                "perPage": 30,
-                "sort": "POPULARITY_DESC",
-                "search": "$query"
+        val params = AniListFilters.getSearchParameters(filters)
+        val variablesObject = buildJsonObject {
+            put("page", page)
+            put("perPage", 30)
+            put("sort", params.sort)
+            if (query.isNotBlank()) put("search", query)
+
+            if (params.genres.isNotEmpty()) {
+                putJsonArray("genres") {
+                    params.genres.forEach { add(it) }
+                }
             }
-        """.trimIndent()
+
+            if (params.format.isNotEmpty()) {
+                putJsonArray("format") {
+                    params.format.forEach { add(it) }
+                }
+            }
+
+            if (params.season.isBlank() && params.year.isNotBlank()) {
+                put("year", "${params.year}%")
+            }
+
+            if (params.season.isNotBlank() && params.year.isBlank()) {
+                throw Exception("Year cannot be blank if season is set")
+            }
+
+            if (params.season.isNotBlank() && params.year.isNotBlank()) {
+                put("season", params.season)
+                put("seasonYear", params.year)
+            }
+
+            if (params.status.isNotBlank()) {
+                putJsonArray("status") {
+                    params.status.forEach { add(it.toString()) }
+                }
+            }
+        }
+
+        val variables = json.encodeToString(variablesObject)
+
+        println(anilistQuery())
+        println(variables)
 
         return makeGraphQLRequest(anilistQuery(), variables)
     }
 
     override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
+
+    // ============================== Filters ===============================
+
+    override fun getFilterList(): AnimeFilterList = AniListFilters.FILTER_LIST
+
     // =========================== Anime Details ============================
 
     override fun animeDetailsParse(response: Response): SAnime = throw UnsupportedOperationException()
 
     override suspend fun getAnimeDetails(anime: SAnime): SAnime {
-        val query = """
-        query(${"$"}id: Int){
-            Media(id: ${"$"}id){
-                id
-                title {
-                    romaji
-                    english
-                    native
-                }
-                coverImage {
-                   extraLarge
-                   large
-                }
-                description
-                status
-                tags{
-                    name
-                }
-                genres
-                studios {
-                    nodes {
-                        name
-                    }
-                }
-                countryOfOrigin
-                isAdult
-            }
-        }
-        """.trimIndent()
-
         val variables = """{"id": ${anime.url}}"""
 
         val metaData = runCatching {
-            json.decodeFromString<DetailsById>(client.newCall(makeGraphQLRequest(query, variables)).execute().body.string())
+            json.decodeFromString<DetailsById>(client.newCall(makeGraphQLRequest(getDetailsQuery(), variables)).execute().body.string())
         }.getOrNull()?.data?.media
 
         anime.title = metaData?.title?.let { title ->
@@ -334,10 +260,24 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         } ?: ""
 
         anime.thumbnail_url = metaData?.coverImage?.extraLarge
-        anime.description = metaData?.description
-            ?.replace(Regex("<br><br>"), "\n")
-            ?.replace(Regex("<.*?>"), "")
-            ?: "No Description"
+
+        anime.description = buildString {
+            append(
+                metaData?.description?.let {
+                    Jsoup.parseBodyFragment(
+                        it.replace("<br>\n", "br2n")
+                            .replace("<br>", "br2n")
+                            .replace("\n", "br2n"),
+                    ).text().replace("br2n", "\n")
+                },
+            )
+            append("\n\n")
+            if (!(metaData?.season == null && metaData?.seasonYear == null)) {
+                append("Release: ${ metaData.season ?: ""} ${ metaData.seasonYear ?: ""}")
+            }
+            metaData?.format?.let { append("\nType: ${metaData.format}") }
+            metaData?.episodes?.let { append("\nTotal Episode Count: ${metaData.episodes}") }
+        }.trim()
 
         anime.status = when (metaData?.status) {
             "RELEASING" -> SAnime.ONGOING
@@ -360,9 +300,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================== Episodes ==============================
     override fun episodeListRequest(anime: SAnime): Request {
-        val res = URL("https://api.ani.zip/mappings?anilist_id=${anime.url}").readText()
-        val kitsuId = JSONObject(res).getJSONObject("mappings").getInt("kitsu_id").toString()
-        return GET("https://anime-kitsu.strem.fun/meta/series/kitsu%3A$kitsuId.json")
+        return GET("https://anime-kitsu.strem.fun/meta/series/anilist%3A${anime.url}.json")
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> {
@@ -375,7 +313,6 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
                     ?.let { videos ->
                         if (preferences.getBoolean(UPCOMING_EP_KEY, UPCOMING_EP_DEFAULT)) { videos } else { videos.filter { video -> (video.released?.let { parseDate(it) } ?: 0L) <= System.currentTimeMillis() } }
                     }
-                    ?.filter { it.thumbnail != null }
                     ?.map { video ->
                         SEpisode.create().apply {
                             episode_number = video.episode?.toFloat() ?: 0.0F
@@ -481,9 +418,9 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             udp://tracker.tiny-vps.com:6969/announce,
             udp://tracker.torrent.eu.org:451/announce,
             udp://valakas.rollo.dnsabr.com:2710/announce,
-            udp://www.torrent.eu.org:451/announce
+            udp://www.torrent.eu.org:451/announce,
+            ${fetchTrackers().split("\n").joinToString(",")}
         """.trimIndent()
-
         return streamList.streams?.map { stream ->
             val urlOrHash =
                 if (debridProvider == "none") {
@@ -509,6 +446,17 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         )
     }
 
+    private fun fetchTrackers(): String {
+        val request = Request.Builder()
+            .url("https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt")
+            .build()
+
+        client.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) throw Exception("Unexpected code $response")
+            return response.body.string().trim()
+        }
+    }
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         // Debrid provider
         ListPreference(screen.context).apply {
@@ -714,7 +662,10 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "🇫🇷 Torrent9",
             "🇪🇸 MejorTorrent",
             "🇲🇽 Cinecalidad",
+            "🇮🇹 ilCorsaroNero",
+            "🇪🇸 Wolfmax4k",
         )
+
         private val PREF_PROVIDERS_VALUE = arrayOf(
             "yts",
             "eztv",
@@ -735,6 +686,8 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "torrent9",
             "mejortorrent",
             "cinecalidad",
+            "ilcorsaronero",
+            "wolfmax4k",
         )
 
         private val PREF_DEFAULT_PROVIDERS_VALUE = arrayOf(
@@ -759,6 +712,9 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "BluRay REMUX",
             "HDR/HDR10+/Dolby Vision",
             "Dolby Vision",
+            "Dolby Vision + HDR",
+            "3D",
+            "Non 3D (DO NOT SELECT IF NOT SURE)",
             "4k",
             "1080p",
             "720p",
@@ -768,10 +724,14 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
             "Cam",
             "Unknown",
         )
+
         private val PREF_QUALITY_VALUE = arrayOf(
             "brremux",
             "hdrall",
             "dolbyvision",
+            "dolbyvisionwithhdr",
+            "threed",
+            "nonthreed",
             "4k",
             "1080p",
             "720p",
diff --git a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/dto/TorrentioDto.kt b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/dto/TorrentioDto.kt
index 14d6683f..0fd7d6fa 100644
--- a/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/dto/TorrentioDto.kt
+++ b/src/all/torrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/dto/TorrentioDto.kt
@@ -73,7 +73,11 @@ data class AnilistMedia(
     val status: String? = null,
     val tags: List<AnilistTag>? = null,
     val genres: List<String>? = null,
+    val episodes: Int? = null,
+    val format: String? = null,
     val studios: AnilistStudios? = null,
+    val season: String? = null,
+    val seasonYear: Int? = null,
     val countryOfOrigin: String? = null,
     val isAdult: Boolean = false,
 )
diff --git a/src/de/animetoast/build.gradle b/src/de/animetoast/build.gradle
index c89b109a..b0872d18 100644
--- a/src/de/animetoast/build.gradle
+++ b/src/de/animetoast/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeToast'
     extClass = '.AnimeToast'
-    extVersionCode = 16
+    extVersionCode = 20
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
index 9d2b6af0..9b5872a7 100644
--- a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
+++ b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
@@ -166,7 +166,6 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                             DoodExtractor(client).videoFromUrl(
                                                 link,
                                                 quality,
-                                                false,
                                             )
                                         if (video != null) {
                                             videoList.add(video)
@@ -224,7 +223,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                             ) == true -> {
                                 val quality = "DoodStream"
                                 val video =
-                                    DoodExtractor(client).videoFromUrl(link, quality, false)
+                                    DoodExtractor(client).videoFromUrl(link, quality)
                                 if (video != null) {
                                     videoList.add(video)
                                 }
diff --git a/src/de/serienstream/build.gradle b/src/de/serienstream/build.gradle
index 4267a35e..b75e2e4a 100644
--- a/src/de/serienstream/build.gradle
+++ b/src/de/serienstream/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Serienstream'
     extClass = '.Serienstream'
-    extVersionCode = 20
+    extVersionCode = 23
 }
 
 apply from: "$rootDir/common.gradle"
@@ -10,4 +10,4 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:streamtape-extractor'))
     implementation(project(':lib:dood-extractor'))
-}
+}
\ No newline at end of file
diff --git a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
index fcc6e65d..5a74c6e3 100644
--- a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
+++ b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
@@ -37,7 +37,7 @@ class Serienstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "Serienstream"
 
-    override val baseUrl = "https://s.to"
+    override val baseUrl = "http://186.2.175.5"
 
     override val lang = "de"
 
@@ -91,7 +91,7 @@ class Serienstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val headers = Headers.Builder()
-            .add("Referer", "https://s.to/search")
+            .add("Referer", "http://186.2.175.5/search")
             .add("origin", baseUrl)
             .add("connection", "keep-alive")
             .add("user-agent", "Mozilla/5.0 (Linux; Android 12; Pixel 5 Build/SP2A.220405.004; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.127 Safari/537.36")
diff --git a/src/en/animeflix/build.gradle b/src/en/animeflix/build.gradle
new file mode 100644
index 00000000..928c3f9c
--- /dev/null
+++ b/src/en/animeflix/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'AnimeFlix'
+    extClass = '.AnimeFlix'
+    extVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/animeflix/res/mipmap-hdpi/ic_launcher.png b/src/en/animeflix/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..6f64faa7
Binary files /dev/null and b/src/en/animeflix/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/en/animeflix/res/mipmap-mdpi/ic_launcher.png b/src/en/animeflix/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..f7ca2d46
Binary files /dev/null and b/src/en/animeflix/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/en/animeflix/res/mipmap-xhdpi/ic_launcher.png b/src/en/animeflix/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..d76b68a6
Binary files /dev/null and b/src/en/animeflix/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/en/animeflix/res/mipmap-xxhdpi/ic_launcher.png b/src/en/animeflix/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..600b9bb2
Binary files /dev/null and b/src/en/animeflix/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/en/animeflix/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/animeflix/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b7784bc4
Binary files /dev/null and b/src/en/animeflix/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt b/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt
new file mode 100644
index 00000000..4f5e1f81
--- /dev/null
+++ b/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt
@@ -0,0 +1,398 @@
+package eu.kanade.tachiyomi.animeextension.en.animeflix
+
+import android.app.Application
+import android.util.Base64
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.MultipartBody
+import okhttp3.Request
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+
+class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "AnimeFlix"
+
+    override val baseUrl = "https://animeflix.mobi"
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    private val json: Json by injectLazy()
+
+    private val preferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/page/$page/")
+
+    override fun popularAnimeSelector() = "div#content_box > div.post-cards > article"
+
+    override fun popularAnimeFromElement(element: Element) = SAnime.create().apply {
+        setUrlWithoutDomain(element.selectFirst("a")!!.attr("href"))
+        // prevent base64 images
+        thumbnail_url = element.selectFirst("img")!!.run {
+            attr("data-pagespeed-high-res-src").ifEmpty { attr("src") }
+        }
+        title = element.selectFirst("header")!!.text()
+    }
+
+    override fun popularAnimeNextPageSelector() = "div.nav-links > a.next"
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/latest-release/page/$page/")
+
+    override fun latestUpdatesSelector(): String = popularAnimeSelector()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+
+    override fun latestUpdatesNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    // =============================== Search ===============================
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val cleanQuery = query.replace(" ", "+").lowercase()
+
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+        val subpageFilter = filterList.find { it is SubPageFilter } as SubPageFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/page/$page/?s=$cleanQuery", headers = headers)
+            genreFilter.state != 0 -> GET("$baseUrl/genre/${genreFilter.toUriPart()}/page/$page/", headers = headers)
+            subpageFilter.state != 0 -> GET("$baseUrl/${subpageFilter.toUriPart()}/page/$page/", headers = headers)
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    // ============================== Filters ===============================
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("Text search ignores filters"),
+        GenreFilter(),
+        SubPageFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Genres",
+        arrayOf(
+            Pair("<select>", ""),
+            Pair("Action", "action"),
+            Pair("Adventure", "adventure"),
+            Pair("Isekai", "isekai"),
+            Pair("Drama", "drama"),
+            Pair("Psychological", "psychological"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Sci-Fi", "sci-fi"),
+            Pair("Magic", "magic"),
+            Pair("Slice Of Life", "slice-of-life"),
+            Pair("Sports", "sports"),
+            Pair("Comedy", "comedy"),
+            Pair("Fantasy", "fantasy"),
+            Pair("Horror", "horror"),
+            Pair("Yaoi", "yaoi"),
+        ),
+    )
+
+    private class SubPageFilter : UriPartFilter(
+        "Sub-page",
+        arrayOf(
+            Pair("<select>", ""),
+            Pair("Ongoing", "ongoing"),
+            Pair("Latest Release", "latest-release"),
+            Pair("Movies", "movies"),
+        ),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document) = SAnime.create().apply {
+        title = document.selectFirst("div.single_post > header > h1")!!.text()
+        thumbnail_url = document.selectFirst("img.imdbwp__img")?.attr("src")
+
+        val infosDiv = document.selectFirst("div.thecontent h3:contains(Anime Info) ~ ul")!!
+        status = when (infosDiv.getInfo("Status").toString()) {
+            "Completed" -> SAnime.COMPLETED
+            "Currently Airing" -> SAnime.ONGOING
+            else -> SAnime.UNKNOWN
+        }
+        artist = infosDiv.getInfo("Studios")
+        author = infosDiv.getInfo("Producers")
+        genre = infosDiv.getInfo("Genres")
+        val animeInfo = infosDiv.select("li").joinToString("\n") { it.text() }
+        description = document.select("div.thecontent h3:contains(Summary) ~ p:not(:has(*)):not(:empty)")
+            .joinToString("\n\n") { it.ownText() } + "\n\n$animeInfo"
+    }
+
+    private fun Element.getInfo(info: String) =
+        selectFirst("li:contains($info)")?.ownText()?.trim()
+
+    // ============================== Episodes ==============================
+    val seasonRegex by lazy { Regex("""season (\d+)""", RegexOption.IGNORE_CASE) }
+    val qualityRegex by lazy { """(\d+)p""".toRegex() }
+
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
+        val document = client.newCall(GET(baseUrl + anime.url)).execute()
+            .asJsoup()
+
+        val seasonList = document.select("div.inline > h3:contains(Season),div.thecontent > h3:contains(Season)")
+
+        val episodeList = if (seasonList.distinctBy { seasonRegex.find(it.text())!!.groupValues[1] }.size > 1) {
+            val seasonsLinks = document.select("div.thecontent p:has(span:contains(Gdrive))").groupBy {
+                seasonRegex.find(it.previousElementSibling()!!.text())!!.groupValues[1]
+            }
+
+            seasonsLinks.flatMap { (seasonNumber, season) ->
+                val serverListSeason = season.map {
+                    val previousText = it.previousElementSibling()!!.text()
+                    val quality = qualityRegex.find(previousText)?.groupValues?.get(1) ?: "Unknown quality"
+
+                    val url = it.selectFirst("a")!!.attr("href")
+                    val episodesDocument = client.newCall(GET(url)).execute()
+                        .asJsoup()
+                    episodesDocument.select("div.entry-content > h3 > a").map {
+                        EpUrl(quality, it.attr("href"), "Season $seasonNumber ${it.text()}")
+                    }
+                }
+
+                transposeEpisodes(serverListSeason)
+            }
+        } else {
+            val driveList = document.select("div.thecontent p:has(span:contains(Gdrive))").map {
+                val quality = qualityRegex.find(it.previousElementSibling()!!.text())?.groupValues?.get(1) ?: "Unknown quality"
+                Pair(it.selectFirst("a")!!.attr("href"), quality)
+            }
+
+            // Load episodes
+            val serversList = driveList.map { drive ->
+                val episodesDocument = client.newCall(GET(drive.first)).execute()
+                    .asJsoup()
+                episodesDocument.select("div.entry-content > h3 > a").map {
+                    EpUrl(drive.second, it.attr("href"), it.text())
+                }
+            }
+
+            transposeEpisodes(serversList)
+        }
+
+        return episodeList.reversed()
+    }
+
+    private fun transposeEpisodes(serversList: List<List<EpUrl>>) =
+        transpose(serversList).mapIndexed { index, serverList ->
+            SEpisode.create().apply {
+                name = serverList.first().name
+                episode_number = (index + 1).toFloat()
+                setUrlWithoutDomain(json.encodeToString(serverList))
+            }
+        }
+
+    override fun episodeListSelector(): String = throw UnsupportedOperationException()
+
+    override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
+
+    // ============================ Video Links =============================
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        val urls = json.decodeFromString<List<EpUrl>>(episode.url)
+
+        val leechUrls = urls.map {
+            val firstLeech = client.newCall(GET(it.url)).execute()
+                .asJsoup()
+                .selectFirst("script:containsData(downlaod_button)")!!
+                .data()
+                .substringAfter("<a href=\"")
+                .substringBefore("\">")
+
+            val path = client.newCall(GET(firstLeech)).execute()
+                .body.string()
+                .substringAfter("replace(\"")
+                .substringBefore("\"")
+
+            val link = "https://" + firstLeech.toHttpUrl().host + path
+            EpUrl(it.quality, link, it.name)
+        }
+
+        val videoList = leechUrls.parallelCatchingFlatMap { url ->
+            if (url.url.toHttpUrl().encodedPath == "/404") return@parallelCatchingFlatMap emptyList()
+            val (videos, mediaUrl) = extractVideo(url)
+            when {
+                videos.isEmpty() -> {
+                    extractGDriveLink(mediaUrl, url.quality).ifEmpty {
+                        getDirectLink(mediaUrl, "instant", "/mfile/")?.let {
+                            listOf(Video(it, "${url.quality}p - GDrive Instant link", it))
+                        } ?: emptyList()
+                    }
+                }
+                else -> videos
+            }
+        }
+
+        return videoList.sort()
+    }
+
+    override fun videoFromElement(element: Element): Video = throw UnsupportedOperationException()
+
+    override fun videoListSelector(): String = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document): String = throw UnsupportedOperationException()
+
+    // ============================= Utilities ==============================
+    // https://github.com/aniyomiorg/aniyomi-extensions/blob/master/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt
+    private fun extractVideo(epUrl: EpUrl): Pair<List<Video>, String> {
+        val matchResult = qualityRegex.find(epUrl.name)
+        val quality = matchResult?.groupValues?.get(1) ?: epUrl.quality
+
+        return (1..3).toList().flatMap { type ->
+            extractWorkerLinks(epUrl.url, quality, type)
+        }.let { Pair(it, epUrl.url) }
+    }
+
+    private fun extractWorkerLinks(mediaUrl: String, quality: String, type: Int): List<Video> {
+        val reqLink = mediaUrl.replace("/file/", "/wfile/") + "?type=$type"
+        val resp = client.newCall(GET(reqLink)).execute().asJsoup()
+        val sizeMatch = SIZE_REGEX.find(resp.select("div.card-header").text().trim())
+        val size = sizeMatch?.groups?.get(1)?.value?.let { " - $it" } ?: ""
+        return resp.select("div.card-body div.mb-4 > a").mapIndexed { index, linkElement ->
+            val link = linkElement.attr("href")
+            val decodedLink = if (link.contains("workers.dev")) {
+                link
+            } else {
+                String(Base64.decode(link.substringAfter("download?url="), Base64.DEFAULT))
+            }
+
+            Video(
+                url = decodedLink,
+                quality = "${quality}p - CF $type Worker ${index + 1}$size",
+                videoUrl = decodedLink,
+            )
+        }
+    }
+
+    private fun getDirectLink(url: String, action: String = "direct", newPath: String = "/file/"): String? {
+        val doc = client.newCall(GET(url, headers)).execute().asJsoup()
+        val script = doc.selectFirst("script:containsData(async function taskaction)")
+            ?.data()
+            ?: return url
+
+        val key = script.substringAfter("key\", \"").substringBefore('"')
+        val form = MultipartBody.Builder()
+            .setType(MultipartBody.FORM)
+            .addFormDataPart("action", action)
+            .addFormDataPart("key", key)
+            .addFormDataPart("action_token", "")
+            .build()
+
+        val headers = headersBuilder().set("x-token", url.toHttpUrl().host).build()
+
+        val req = client.newCall(POST(url.replace("/file/", newPath), headers, form)).execute()
+        return runCatching {
+            json.decodeFromString<DriveLeechDirect>(req.body.string()).url
+        }.getOrNull()
+    }
+
+    private fun extractGDriveLink(mediaUrl: String, quality: String): List<Video> {
+        val neoUrl = getDirectLink(mediaUrl) ?: mediaUrl
+        val response = client.newCall(GET(neoUrl)).execute().asJsoup()
+        val gdBtn = response.selectFirst("div.card-body a.btn")!!
+        val gdLink = gdBtn.attr("href")
+        val sizeMatch = SIZE_REGEX.find(gdBtn.text())
+        val size = sizeMatch?.groups?.get(1)?.value?.let { " - $it" } ?: ""
+        val gdResponse = client.newCall(GET(gdLink)).execute().asJsoup()
+        val link = gdResponse.select("form#download-form")
+        return if (link.isNullOrEmpty()) {
+            emptyList()
+        } else {
+            val realLink = link.attr("action")
+            listOf(Video(realLink, "$quality - Gdrive$size", realLink))
+        }
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+
+        return sortedWith(
+            compareBy { it.quality.contains(quality) },
+        ).reversed()
+    }
+
+    private fun <E> transpose(xs: List<List<E>>): List<List<E>> {
+        // Helpers
+        fun <E> List<E>.head(): E = this.first()
+        fun <E> List<E>.tail(): List<E> = this.takeLast(this.size - 1)
+        fun <E> E.append(xs: List<E>): List<E> = listOf(this).plus(xs)
+
+        xs.filter { it.isNotEmpty() }.let { ys ->
+            return when (ys.isNotEmpty()) {
+                true -> ys.map { it.head() }.append(transpose(ys.map { it.tail() }))
+                else -> emptyList()
+            }
+        }
+    }
+
+    @Serializable
+    data class EpUrl(
+        val quality: String,
+        val url: String,
+        val name: String,
+    )
+
+    @Serializable
+    data class DriveLeechDirect(val url: String? = null)
+
+    companion object {
+        private val SIZE_REGEX = "\\[((?:.(?!\\[))+)][ ]*\$".toRegex(RegexOption.IGNORE_CASE)
+
+        private const val PREF_QUALITY_KEY = "pref_quality"
+        private const val PREF_QUALITY_TITLE = "Preferred quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val PREF_QUALITY_ENTRIES = arrayOf("1080p", "720p", "480p", "360p")
+        private val PREF_QUALITY_VALUES = arrayOf("1080", "720", "480", "360")
+    }
+
+    // ============================== Settings ==============================
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = PREF_QUALITY_TITLE
+            entries = PREF_QUALITY_ENTRIES
+            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)
+    }
+}
diff --git a/src/en/animeflixlive/build.gradle b/src/en/animeflixlive/build.gradle
new file mode 100644
index 00000000..18ce25e9
--- /dev/null
+++ b/src/en/animeflixlive/build.gradle
@@ -0,0 +1,12 @@
+ext {
+    extName = 'Animeflix.live'
+    extClass = '.AnimeflixLive'
+    extVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:gogostream-extractor'))
+    implementation(project(':lib:playlist-utils'))
+}
diff --git a/src/en/animeflixlive/res/mipmap-hdpi/ic_launcher.png b/src/en/animeflixlive/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..f630587c
Binary files /dev/null and b/src/en/animeflixlive/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/en/animeflixlive/res/mipmap-mdpi/ic_launcher.png b/src/en/animeflixlive/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..d42685d6
Binary files /dev/null and b/src/en/animeflixlive/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/en/animeflixlive/res/mipmap-xhdpi/ic_launcher.png b/src/en/animeflixlive/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..818568c2
Binary files /dev/null and b/src/en/animeflixlive/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/en/animeflixlive/res/mipmap-xxhdpi/ic_launcher.png b/src/en/animeflixlive/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..d9d77e46
Binary files /dev/null and b/src/en/animeflixlive/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/en/animeflixlive/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/animeflixlive/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..5ebf9614
Binary files /dev/null and b/src/en/animeflixlive/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/AnimeflixLive.kt b/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/AnimeflixLive.kt
new file mode 100644
index 00000000..f80d7e18
--- /dev/null
+++ b/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/AnimeflixLive.kt
@@ -0,0 +1,503 @@
+package eu.kanade.tachiyomi.animeextension.en.animeflixlive
+
+import GenreFilter
+import SortFilter
+import SubPageFilter
+import TypeFilter
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Track
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+import java.net.URLDecoder
+import java.util.Calendar
+import java.util.Locale
+import java.util.TimeZone
+import kotlin.math.min
+
+class AnimeflixLive : ConfigurableAnimeSource, AnimeHttpSource() {
+
+    override val name = "Animeflix.live"
+
+    override val baseUrl by lazy { preferences.baseUrl }
+
+    private val apiUrl by lazy { preferences.apiUrl }
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    private val json: Json by injectLazy()
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    private val apiHeaders = headersBuilder().apply {
+        add("Accept", "*/*")
+        add("Host", apiUrl.toHttpUrl().host)
+        add("Origin", baseUrl)
+        add("Referer", "$baseUrl/")
+    }.build()
+
+    private val docHeaders = headersBuilder().apply {
+        add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8")
+        add("Host", apiUrl.toHttpUrl().host)
+        add("Referer", "$baseUrl/")
+    }.build()
+
+    // ============================== Popular ===============================
+
+    override fun popularAnimeRequest(page: Int): Request =
+        GET("$apiUrl/popular?page=${page - 1}", apiHeaders)
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val parsed = response.parseAs<List<AnimeDto>>()
+        val titlePref = preferences.titleType
+
+        val animeList = parsed.map {
+            it.toSAnime(titlePref)
+        }
+
+        return AnimesPage(animeList, animeList.size == PAGE_SIZE)
+    }
+
+    // =============================== Latest ===============================
+
+    override fun latestUpdatesRequest(page: Int): Request =
+        GET("$apiUrl/trending?page=${page - 1}", apiHeaders)
+
+    override fun latestUpdatesParse(response: Response): AnimesPage {
+        val parsed = response.parseAs<TrendingDto>()
+        val titlePref = preferences.titleType
+
+        val animeList = parsed.trending.map {
+            it.toSAnime(titlePref)
+        }
+
+        return AnimesPage(animeList, animeList.size == PAGE_SIZE)
+    }
+
+    // =============================== Search ===============================
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val sort = filters.filterIsInstance<SortFilter>().first().getValue()
+        val type = filters.filterIsInstance<TypeFilter>().first().getValues()
+        val genre = filters.filterIsInstance<GenreFilter>().first().getValues()
+        val subPage = filters.filterIsInstance<SubPageFilter>().first().getValue()
+
+        if (subPage.isNotBlank()) {
+            return GET("$apiUrl/$subPage?page=${page - 1}", apiHeaders)
+        }
+
+        if (query.isEmpty()) {
+            throw Exception("Search must not be empty")
+        }
+
+        val filtersObj = buildJsonObject {
+            put("sort", sort)
+            if (type.isNotEmpty()) {
+                put("type", json.encodeToString(type))
+            }
+            if (genre.isNotEmpty()) {
+                put("genre", json.encodeToString(genre))
+            }
+        }.toJsonString()
+
+        val url = apiUrl.toHttpUrl().newBuilder().apply {
+            addPathSegment("info")
+            addPathSegment("")
+            addQueryParameter("query", query)
+            addQueryParameter("limit", "15")
+            addQueryParameter("filters", filtersObj)
+            addQueryParameter("k", query.substr(0, 3).sk())
+        }.build()
+
+        return GET(url, apiHeaders)
+    }
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val parsed = response.parseAs<List<AnimeDto>>()
+        val titlePref = preferences.titleType
+
+        val animeList = parsed.map {
+            it.toSAnime(titlePref)
+        }
+
+        val hasNextPage = if (response.request.url.queryParameter("limit") == null) {
+            animeList.size == 44
+        } else {
+            animeList.size == 15
+        }
+
+        return AnimesPage(animeList, hasNextPage)
+    }
+
+    // ============================== Filters ===============================
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        SortFilter(),
+        TypeFilter(),
+        GenreFilter(),
+        AnimeFilter.Separator(),
+        AnimeFilter.Header("NOTE: Subpage overrides search and other filters!"),
+        SubPageFilter(),
+    )
+
+    // =========================== Anime Details ============================
+
+    override fun animeDetailsRequest(anime: SAnime): Request {
+        return GET("$apiUrl/getslug/${anime.url}", apiHeaders)
+    }
+
+    override fun getAnimeUrl(anime: SAnime): String {
+        return "$baseUrl/search/${anime.title}?anime=${anime.url}"
+    }
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val titlePref = preferences.titleType
+        return response.parseAs<DetailsDto>().toSAnime(titlePref)
+    }
+
+    // ============================== Episodes ==============================
+
+    override fun episodeListRequest(anime: SAnime): Request {
+        val lang = preferences.lang
+
+        val url = apiUrl.toHttpUrl().newBuilder().apply {
+            addPathSegment("episodes")
+            addQueryParameter("id", anime.url)
+            addQueryParameter("dub", (lang == "Dub").toString())
+            addQueryParameter("c", anime.url.sk())
+        }.build()
+
+        return GET(url, apiHeaders)
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val slug = response.request.url.queryParameter("id")!!
+
+        return response.parseAs<EpisodeResponseDto>().episodes.map {
+            it.toSEpisode(slug)
+        }.sortedByDescending { it.episode_number }
+    }
+
+    // ============================ Video Links =============================
+
+    override fun videoListRequest(episode: SEpisode): Request {
+        val url = "$apiUrl${episode.url}".toHttpUrl().newBuilder().apply {
+            addQueryParameter("server", "")
+            addQueryParameter("c", episode.url.substringAfter("/watch/").sk())
+        }.build()
+
+        return GET(url, apiHeaders)
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val initialPlayerUrl = apiUrl + response.parseAs<ServerDto>().source
+        val initialServer = initialPlayerUrl.toHttpUrl().queryParameter("server")!!
+
+        val initialPlayerDocument = client.newCall(
+            GET(initialPlayerUrl, docHeaders),
+        ).execute().asJsoup().unescape()
+
+        videoList.addAll(
+            videosFromPlayer(
+                initialPlayerDocument,
+                initialServer.replaceFirstChar { c -> c.titlecase(Locale.ROOT) },
+            ),
+        )
+
+        // Go through rest of servers
+        val servers = initialPlayerDocument.selectFirst("script:containsData(server-settings)")!!.data()
+        val serversHtml = SERVER_REGEX.findAll(servers).map {
+            Jsoup.parseBodyFragment(it.groupValues[1])
+        }.toList()
+
+        videoList.addAll(
+            serversHtml.parallelCatchingFlatMapBlocking {
+                val server = serverMapping[
+                    it.selectFirst("button")!!
+                        .attr("onclick")
+                        .substringAfter("postMessage('")
+                        .substringBefore("'"),
+                ]
+                if (server == initialServer) {
+                    return@parallelCatchingFlatMapBlocking emptyList()
+                }
+
+                val serverUrl = response.request.url.newBuilder()
+                    .setQueryParameter("server", server)
+                    .build()
+                val playerUrl = apiUrl + client.newCall(
+                    GET(serverUrl, apiHeaders),
+                ).execute().parseAs<ServerDto>().source
+
+                if (server != playerUrl.toHttpUrl().queryParameter("server")!!) {
+                    return@parallelCatchingFlatMapBlocking emptyList()
+                }
+
+                val playerDocument = client.newCall(
+                    GET(playerUrl, docHeaders),
+                ).execute().asJsoup().unescape()
+
+                videosFromPlayer(
+                    playerDocument,
+                    server.replaceFirstChar { c -> c.titlecase(Locale.ROOT) },
+                )
+            },
+        )
+
+        return videoList
+    }
+
+    private val serverMapping = mapOf(
+        "settings-0" to "moon",
+        "settings-1" to "sun",
+        "settings-2" to "zoro",
+        "settings-3" to "gogo",
+    )
+
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    private fun getVideoHeaders(baseHeaders: Headers, referer: String, videoUrl: String): Headers {
+        return baseHeaders.newBuilder().apply {
+            add("Accept", "*/*")
+            add("Accept-Language", "en-US,en;q=0.5")
+            add("Host", videoUrl.toHttpUrl().host)
+            add("Origin", "https://${apiUrl.toHttpUrl().host}")
+            add("Referer", "$apiUrl/")
+            add("Sec-Fetch-Dest", "empty")
+            add("Sec-Fetch-Mode", "cors")
+            add("Sec-Fetch-Site", "cross-site")
+        }.build()
+    }
+
+    private fun Document.unescape(): Document {
+        val unescapeScript = this.selectFirst("script:containsData(unescape)")
+        return if (unescapeScript == null) {
+            this
+        } else {
+            val data = URLDecoder.decode(unescapeScript.data(), "UTF-8")
+            Jsoup.parse(data, this.location())
+        }
+    }
+
+    private fun videosFromPlayer(document: Document, name: String): List<Video> {
+        val dataScript = document.selectFirst("script:containsData(m3u8)")
+            ?.data() ?: return emptyList()
+
+        val subtitleList = document.select("video > track[kind=captions]").map {
+            Track(it.attr("id"), it.attr("label"))
+        }
+
+        var masterPlaylist = M3U8_REGEX.find(dataScript)?.groupValues?.get(1)
+            ?: return emptyList()
+
+        if (name.equals("moon", true)) {
+            masterPlaylist += dataScript.substringAfter("`${'$'}{url}")
+                .substringBefore("`")
+        }
+
+        return playlistUtils.extractFromHls(
+            masterPlaylist,
+            videoHeadersGen = ::getVideoHeaders,
+            videoNameGen = { q -> "$name - $q" },
+            subtitleList = subtitleList,
+        )
+    }
+
+    // ============================= Utilities ==============================
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.quality
+        val server = preferences.server
+
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(quality) },
+                { it.quality.contains(server, true) },
+            ),
+        ).reversed()
+    }
+
+    private fun JsonObject.toJsonString(): String {
+        return json.encodeToString(this)
+    }
+
+    private fun String.sk(): String {
+        val t = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
+        val n = 17 + (t.get(Calendar.DAY_OF_MONTH) - t.get(Calendar.MONTH)) / 2
+        return this.toCharArray().fold("") { acc, c ->
+            acc + c.code.toString(n).padStart(2, '0')
+        }
+    }
+
+    private fun String.substr(start: Int, end: Int): String {
+        val stop = min(end, this.length)
+        return this.substring(start, stop)
+    }
+
+    companion object {
+        private val SERVER_REGEX = Regex("""'1' === '1'.*?(<button.*?</button>)""", RegexOption.DOT_MATCHES_ALL)
+        private val M3U8_REGEX = Regex("""const ?\w*? ?= ?`(.*?)`""")
+        private const val PAGE_SIZE = 24
+
+        private const val PREF_DOMAIN_KEY = "pref_domain_key"
+        private const val PREF_DOMAIN_DEFAULT = "https://animeflix.live,https://api.animeflix.dev"
+        private val PREF_DOMAIN_ENTRIES = arrayOf("animeflix.live", "animeflix.ro")
+        private val PREF_DOMAIN_ENTRY_VALUES = arrayOf(
+            "https://animeflix.live,https://api.animeflix.dev",
+            "https://animeflix.ro,https://api.animeflixtv.to",
+        )
+
+        private const val PREF_TITLE_KEY = "pref_title_type_key"
+        private const val PREF_TITLE_DEFAULT = "English"
+        private val PREF_TITLE_ENTRIES = arrayOf("English", "Native", "Romaji")
+
+        private const val PREF_LANG_KEY = "pref_lang_key"
+        private const val PREF_LANG_DEFAULT = "Sub"
+        private val PREF_LANG_ENTRIES = arrayOf("Sub", "Dub")
+
+        private const val PREF_QUALITY_KEY = "pref_quality_key"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val PREF_QUALITY_ENTRY_VALUES = arrayOf("1080", "720", "480", "360")
+        private val PREF_QUALITY_ENTRIES = PREF_QUALITY_ENTRY_VALUES.map { "${it}p" }.toTypedArray()
+
+        private const val PREF_SERVER_KEY = "pref_server_key"
+        private const val PREF_SERVER_DEFAULT = "Moon"
+        private val PREF_SERVER_ENTRIES = arrayOf("Moon", "Sun", "Zoro", "Gogo")
+    }
+
+    // ============================== Settings ==============================
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_DOMAIN_KEY
+            title = "Preferred domain (requires app restart)"
+            entries = PREF_DOMAIN_ENTRIES
+            entryValues = PREF_DOMAIN_ENTRY_VALUES
+            setDefaultValue(PREF_DOMAIN_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_TITLE_KEY
+            title = "Preferred Title Type"
+            entries = PREF_TITLE_ENTRIES
+            entryValues = PREF_TITLE_ENTRIES
+            setDefaultValue(PREF_TITLE_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_LANG_KEY
+            title = "Preferred Language"
+            entries = PREF_LANG_ENTRIES
+            entryValues = PREF_LANG_ENTRIES
+            setDefaultValue(PREF_LANG_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 = PREF_QUALITY_ENTRIES
+            entryValues = PREF_QUALITY_ENTRY_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_SERVER_KEY
+            title = "Preferred server"
+            entries = PREF_SERVER_ENTRIES
+            entryValues = PREF_SERVER_ENTRIES
+            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)
+    }
+
+    private val SharedPreferences.baseUrl
+        get() = getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!!
+            .split(",").first()
+
+    private val SharedPreferences.apiUrl
+        get() = getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!!
+            .split(",").last()
+
+    private val SharedPreferences.titleType
+        get() = getString(PREF_TITLE_KEY, PREF_TITLE_DEFAULT)!!
+
+    private val SharedPreferences.lang
+        get() = getString(PREF_LANG_KEY, PREF_LANG_DEFAULT)!!
+
+    private val SharedPreferences.quality
+        get() = getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+
+    private val SharedPreferences.server
+        get() = getString(PREF_SERVER_KEY, PREF_QUALITY_DEFAULT)!!
+}
diff --git a/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/Dto.kt b/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/Dto.kt
new file mode 100644
index 00000000..0066f965
--- /dev/null
+++ b/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/Dto.kt
@@ -0,0 +1,123 @@
+package eu.kanade.tachiyomi.animeextension.en.animeflixlive
+
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.jsoup.Jsoup
+import kotlin.math.ceil
+import kotlin.math.floor
+
+@Serializable
+class TrendingDto(
+    val trending: List<AnimeDto>,
+)
+
+@Serializable
+class AnimeDto(
+    val slug: String,
+    @SerialName("title") val titleObj: TitleObject,
+    val images: ImageObject,
+) {
+    @Serializable
+    class TitleObject(
+        val english: String? = null,
+        val native: String? = null,
+        val romaji: String? = null,
+    )
+
+    @Serializable
+    class ImageObject(
+        val large: String? = null,
+        val medium: String? = null,
+        val small: String? = null,
+    )
+
+    fun toSAnime(titlePref: String): SAnime = SAnime.create().apply {
+        title = when (titlePref) {
+            "English" -> titleObj.english ?: titleObj.romaji ?: titleObj.native ?: "Title N/A"
+            "Romaji" -> titleObj.romaji ?: titleObj.english ?: titleObj.native ?: "Title N/A"
+            else -> titleObj.native ?: titleObj.romaji ?: titleObj.english ?: "Title N/A"
+        }
+        thumbnail_url = images.large ?: images.medium ?: images.small ?: ""
+        url = slug
+    }
+}
+
+@Serializable
+class DetailsDto(
+    val slug: String,
+    @SerialName("title") val titleObj: TitleObject,
+    val description: String,
+    val genres: List<String>,
+    val status: String? = null,
+    val images: ImageObject,
+) {
+    @Serializable
+    class TitleObject(
+        val english: String? = null,
+        val native: String? = null,
+        val romaji: String? = null,
+    )
+
+    @Serializable
+    class ImageObject(
+        val large: String? = null,
+        val medium: String? = null,
+        val small: String? = null,
+    )
+
+    fun toSAnime(titlePref: String): SAnime = SAnime.create().apply {
+        title = when (titlePref) {
+            "English" -> titleObj.english ?: titleObj.romaji ?: titleObj.native ?: "Title N/A"
+            "Romaji" -> titleObj.romaji ?: titleObj.english ?: titleObj.native ?: "Title N/A"
+            else -> titleObj.native ?: titleObj.romaji ?: titleObj.english ?: "Title N/A"
+        }
+        thumbnail_url = images.large ?: images.medium ?: images.small ?: ""
+        url = slug
+        genre = genres.joinToString()
+        status = this@DetailsDto.status.parseStatus()
+        description = Jsoup.parseBodyFragment(
+            this@DetailsDto.description.replace("<br>", "br2n"),
+        ).text().replace("br2n", "\n")
+    }
+
+    private fun String?.parseStatus(): Int = when (this?.lowercase()) {
+        "releasing" -> SAnime.ONGOING
+        "finished" -> SAnime.COMPLETED
+        "cancelled" -> SAnime.CANCELLED
+        else -> SAnime.UNKNOWN
+    }
+}
+
+@Serializable
+class EpisodeResponseDto(
+    val episodes: List<EpisodeDto>,
+) {
+    @Serializable
+    class EpisodeDto(
+        val number: Float,
+        val title: String? = null,
+    ) {
+        fun toSEpisode(slug: String): SEpisode = SEpisode.create().apply {
+            val epNum = if (floor(number) == ceil(number)) {
+                number.toInt().toString()
+            } else {
+                number.toString()
+            }
+
+            url = "/watch/$slug-episode-$epNum"
+            episode_number = number
+            name = if (title == null) {
+                "Episode $epNum"
+            } else {
+                "Ep. $epNum - $title"
+            }
+        }
+    }
+}
+
+@Serializable
+class ServerDto(
+    val source: String,
+)
diff --git a/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/Filters.kt b/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/Filters.kt
new file mode 100644
index 00000000..79121709
--- /dev/null
+++ b/src/en/animeflixlive/src/eu/kanade/tachiyomi/animeextension/en/animeflixlive/Filters.kt
@@ -0,0 +1,81 @@
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+
+open class UriPartFilter(
+    name: String,
+    private val vals: Array<Pair<String, String>>,
+    defaultValue: String? = null,
+) : AnimeFilter.Select<String>(
+    name,
+    vals.map { it.first }.toTypedArray(),
+    vals.indexOfFirst { it.second == defaultValue }.takeIf { it != -1 } ?: 0,
+) {
+    fun getValue(): String {
+        return vals[state].second
+    }
+}
+
+open class UriMultiSelectOption(name: String, val value: String) : AnimeFilter.CheckBox(name)
+
+open class UriMultiSelectFilter(
+    name: String,
+    private val vals: Array<Pair<String, String>>,
+) : AnimeFilter.Group<UriMultiSelectOption>(name, vals.map { UriMultiSelectOption(it.first, it.second) }) {
+    fun getValues(): List<String> {
+        return state.filter { it.state }.map { it.value }
+    }
+}
+
+class SortFilter : UriPartFilter(
+    "Sort",
+    arrayOf(
+        Pair("Recently Updated", "recently_updated"),
+        Pair("Recently Added", "recently_added"),
+        Pair("Release Date ↓", "release_date_down"),
+        Pair("Release Date ↑", "release_date_up"),
+        Pair("Name A-Z", "title_az"),
+        Pair("Best Rating", "scores"),
+        Pair("Most Watched", "most_watched"),
+        Pair("Anime Length", "number_of_episodes"),
+    ),
+)
+
+class TypeFilter : UriMultiSelectFilter(
+    "Type",
+    arrayOf(
+        Pair("TV", "TV"),
+        Pair("Movie", "MOVIE"),
+        Pair("OVA", "OVA"),
+        Pair("ONA", "ONA"),
+        Pair("Special", "SPECIAL"),
+    ),
+)
+
+class GenreFilter : UriMultiSelectFilter(
+    "Genre",
+    arrayOf(
+        Pair("Action", "Action"),
+        Pair("Adventure", "Adventure"),
+        Pair("Comedy", "Comedy"),
+        Pair("Drama", "Drama"),
+        Pair("Ecchi", "Ecchi"),
+        Pair("Fantasy", "Fantasy"),
+        Pair("Horror", "Horror"),
+        Pair("Mecha", "Mecha"),
+        Pair("Mystery", "Mystery"),
+        Pair("Psychological", "Psychological"),
+        Pair("Romance", "Romance"),
+        Pair("Sci-Fi", "Sci-Fi"),
+        Pair("Sports", "Sports"),
+        Pair("Supernatural", "Supernatural"),
+        Pair("Thriller", "Thriller"),
+    ),
+)
+
+class SubPageFilter : UriPartFilter(
+    "Sub-page",
+    arrayOf(
+        Pair("<select>", ""),
+        Pair("Movies", "movies"),
+        Pair("Series", "series"),
+    ),
+)
diff --git a/src/en/wcofun/build.gradle b/src/en/wcofun/build.gradle
index bce463f2..2ef9eb22 100644
--- a/src/en/wcofun/build.gradle
+++ b/src/en/wcofun/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Wcofun'
     extClass = '.Wcofun'
-    extVersionCode = 13
+    extVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt b/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt
index 962bd625..1d9ce48e 100644
--- a/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt
+++ b/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt
@@ -99,13 +99,13 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun episodeFromElement(element: Element) = SEpisode.create().apply {
         setUrlWithoutDomain(element.attr("href"))
-        val epName = element.ownText()
-        val season = epName.substringAfter("Season ")
-        val ep = epName.substringAfter("Episode ")
-        val seasonNum = season.substringBefore(" ").toIntOrNull() ?: 1
-        val epNum = ep.substringBefore(" ").toIntOrNull() ?: 1
-        episode_number = (seasonNum * 100 + epNum).toFloat()
-        name = "Season $seasonNum - Episode $epNum"
+        val title = element.attr("title")
+        val season = title.substringAfter("Season ").substringBefore(" ")
+        val episode = title.substringAfter("Episode ").substringBefore(" ")
+        val seasonNum = season.toIntOrNull() ?: 1
+        val episodeNum = episode.toIntOrNull() ?: 1
+        episode_number = ((seasonNum - 1) * 100 + episodeNum).toFloat()
+        name = "Season $seasonNum - Episode $episodeNum"
     }
 
     // ============================ Video Links =============================
diff --git a/src/en/yugenanime/AndroidManifest.xml b/src/en/yugenanime/AndroidManifest.xml
new file mode 100644
index 00000000..5f63e27c
--- /dev/null
+++ b/src/en/yugenanime/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".en.yugenanime.YugenAnimeUrlActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="yugenanime.sx"
+                    android:pathPattern="/anime/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/src/en/yugenanime/build.gradle b/src/en/yugenanime/build.gradle
new file mode 100644
index 00000000..435264d0
--- /dev/null
+++ b/src/en/yugenanime/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'YugenAnime'
+    extClass = '.YugenAnime'
+    extVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/yugenanime/res/mipmap-hdpi/ic_launcher.png b/src/en/yugenanime/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..f30375d4
Binary files /dev/null and b/src/en/yugenanime/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/en/yugenanime/res/mipmap-mdpi/ic_launcher.png b/src/en/yugenanime/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..18216fbc
Binary files /dev/null and b/src/en/yugenanime/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/en/yugenanime/res/mipmap-xhdpi/ic_launcher.png b/src/en/yugenanime/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..d73bdcdf
Binary files /dev/null and b/src/en/yugenanime/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/en/yugenanime/res/mipmap-xxhdpi/ic_launcher.png b/src/en/yugenanime/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..39784209
Binary files /dev/null and b/src/en/yugenanime/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/en/yugenanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/yugenanime/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..08bec54d
Binary files /dev/null and b/src/en/yugenanime/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/en/yugenanime/src/eu/kanade/tachiyomi/animeextension/en/yugenanime/YugenAnime.kt b/src/en/yugenanime/src/eu/kanade/tachiyomi/animeextension/en/yugenanime/YugenAnime.kt
new file mode 100644
index 00000000..158dae7c
--- /dev/null
+++ b/src/en/yugenanime/src/eu/kanade/tachiyomi/animeextension/en/yugenanime/YugenAnime.kt
@@ -0,0 +1,406 @@
+package eu.kanade.tachiyomi.animeextension.en.yugenanime
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import okhttp3.FormBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.net.URI
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class YugenAnime : ParsedAnimeHttpSource() {
+
+    override val name = "YugenAnime"
+
+    override val baseUrl = "https://yugenanime.sx"
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    override val client = OkHttpClient()
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int): Request {
+        val url = "$baseUrl/discover/?page=$page"
+        return GET(url, headers)
+    }
+
+    override fun popularAnimeSelector(): String = "div.cards-grid a.anime-meta"
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.title = element.attr("title").ifBlank { element.select("span.anime-name").text() }
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = element.selectFirst("img.lozad")?.attr("data-src")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "div.sidepanel--content > nav > ul > li:nth-child(7) > a"
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request {
+        val url = "$baseUrl/discover/?page=$page&sort=Newest+Addition"
+        return GET(url, headers)
+    }
+
+    override fun latestUpdatesSelector(): String = "div.cards-grid a.anime-meta"
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.title = element.attr("title").ifBlank { element.select("span.anime-name").text() }
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = element.selectFirst("img.lozad")?.attr("data-src")
+        return anime
+    }
+
+    override fun latestUpdatesNextPageSelector(): String = "ul.pagination li.next a"
+
+    // =============================== Search ===============================
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as? GenreFilter
+        val sortFilter = filterList.find { it is SortFilter } as? SortFilter
+        val statusFilter = filterList.find { it is StatusFilter } as? StatusFilter
+        val yearFilter = filterList.find { it is YearFilter } as? YearFilter
+        val languageFilter = filterList.find { it is LanguageFilter } as? LanguageFilter
+
+        val queryString = mutableListOf<String>()
+
+        genreFilter?.let {
+            val genrePart = it.toUriPart()
+            if (genrePart.isNotBlank()) {
+                queryString.add(genrePart)
+            }
+        }
+
+        sortFilter?.let { if (it.state != 0) queryString.add(it.toUriPart()) }
+        statusFilter?.let { if (it.state != 0) queryString.add(it.toUriPart()) }
+        yearFilter?.let { if (it.state != 0) queryString.add(it.toUriPart()) }
+        languageFilter?.let { if (it.state != 0) queryString.add(it.toUriPart()) }
+
+        val url = when {
+            query.isNotBlank() -> "$baseUrl/discover/?page=$page&q=$query${if (queryString.isNotEmpty()) "&${queryString.joinToString("&")}" else ""}"
+            queryString.isNotEmpty() -> "$baseUrl/discover/?page=$page&${queryString.joinToString("&")}"
+            else -> "$baseUrl/discover/?page=$page"
+        }
+
+        return GET(url, headers)
+    }
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    private class StatusFilter : UriPartFilter(
+        "Status",
+        arrayOf(
+            Pair("Any", ""),
+            Pair("Not yet aired", "status=Not+yet+aired"),
+            Pair("Currently Airing", "status=Currently+Airing"),
+            Pair("Finished Airing", "status=Finished+Airing"),
+        ),
+    )
+
+    private class YearFilter : UriPartFilter(
+        "Year",
+        arrayOf(
+            Pair("Any", ""),
+            Pair("2024", "year=2024"),
+            Pair("2023", "year=2023"),
+            Pair("2022", "year=2022"),
+        ),
+    )
+
+    private class LanguageFilter : UriPartFilter(
+        "Language",
+        arrayOf(
+            Pair("Both", ""),
+            Pair("Sub", "language=Sub"),
+            Pair("Dub", "language=Dub"),
+        ),
+    )
+
+    private class GenreFilter : CheckBoxFilterList(
+        "Genres",
+        arrayOf(
+            Pair("Action", "genreIncluded=Action"),
+            Pair("Adventure", "genreIncluded=Adventure"),
+            Pair("Comedy", "genreIncluded=Comedy"),
+            Pair("Drama", "genreIncluded=Drama"),
+            Pair("Ecchi", "genreIncluded=Ecchi"),
+            Pair("Fantasy", "genreIncluded=Fantasy"),
+            Pair("Harem", "genreIncluded=Harem"),
+            Pair("Historical", "genreIncluded=Historical"),
+            Pair("Horror", "genreIncluded=Horror"),
+            Pair("Magic", "genreIncluded=Magic"),
+            Pair("Martial Arts", "genreIncluded=Martial+Arts"),
+            Pair("Mecha", "genreIncluded=Mecha"),
+            Pair("Military", "genreIncluded=Military"),
+            Pair("Music", "genreIncluded=Music"),
+            Pair("Mystery", "genreIncluded=Mystery"),
+            Pair("Parody", "genreIncluded=Parody"),
+            Pair("Police", "genreIncluded=Police"),
+            Pair("Psychological", "genreIncluded=Psychological"),
+            Pair("Romance", "genreIncluded=Romance"),
+            Pair("Samurai", "genreIncluded=Samurai"),
+            Pair("School", "genreIncluded=School"),
+            Pair("Sci-Fi", "genreIncluded=Sci-Fi"),
+            Pair("Seinen", "genreIncluded=Seinen"),
+            Pair("Shoujo", "genreIncluded=Shoujo"),
+            Pair("Shoujo Ai", "genreIncluded=Shoujo+Ai"),
+            Pair("Shounen", "genreIncluded=Shounen"),
+            Pair("Shounen Ai", "genreIncluded=Shounen+Ai"),
+            Pair("Slice of Life", "genreIncluded=Slice+of+Life"),
+            Pair("Space", "genreIncluded=Space"),
+            Pair("Sports", "genreIncluded=Sports"),
+            Pair("Super Power", "genreIncluded=Super+Power"),
+            Pair("Supernatural", "genreIncluded=Supernatural"),
+            Pair("Thriller", "genreIncluded=Thriller"),
+            Pair("Vampire", "genreIncluded=Vampire"),
+            Pair("Yaoi", "genreIncluded=Yaoi"),
+            Pair("Yuri", "genreIncluded=Yuri"),
+        ),
+    )
+
+    private open class CheckBoxFilterList(name: String, pairs: Array<Pair<String, String>>) :
+        AnimeFilter.Group<CheckBoxFilterList.CheckBoxVal>(name, pairs.map { CheckBoxVal(it.first, false, it.second) }) {
+
+        fun toUriPart(): String {
+            return state.filter { it.state }.joinToString("&") { it.uriPart }
+        }
+
+        private class CheckBoxVal(displayName: String, defaultState: Boolean, val uriPart: String) :
+            CheckBox(displayName, defaultState)
+    }
+
+    private class SortFilter : UriPartFilter(
+        "Sort By",
+        arrayOf(
+            Pair("Default", ""),
+            Pair("Newest Addition", "sort=Newest+Addition"),
+            Pair("Oldest Addition", "sort=Oldest+Addition"),
+            Pair("Alphabetical", "sort=Alphabetical"),
+            Pair("Rating", "sort=Rating"),
+            Pair("Views", "sort=Views"),
+        ),
+    )
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("Text search ignores filters"),
+        GenreFilter(),
+        SortFilter(),
+        StatusFilter(),
+        YearFilter(),
+        LanguageFilter(),
+    )
+
+    override fun searchAnimeSelector(): String {
+        return "div.cards-grid a.anime-meta"
+    }
+
+    override fun videoFromElement(element: Element): Video {
+        throw UnsupportedOperationException()
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.title = element.attr("title").ifBlank { element.select("span.anime-name").text() }
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = (element.selectFirst("img.lozad")?.attr("data-src"))
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "ul.pagination li.next a"
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.title = document.selectFirst("div.content h1")?.text().orEmpty()
+        anime.thumbnail_url = document.selectFirst("img.cover")?.attr("src")
+
+        val metaDetails = document.select("div.anime-metadetails div.data")
+        metaDetails.forEach { data ->
+            val title = data.selectFirst("div.ap--data-title")?.text()
+            val description = data.selectFirst("span.description")?.text()
+
+            when (title) {
+                "Romaji" -> anime.title = description.orEmpty()
+                "Studios" -> anime.author = description.orEmpty()
+                "Status" -> anime.status = parseStatus(description.orEmpty())
+                "Genres" -> anime.genre = description.orEmpty()
+            }
+        }
+
+        anime.description = document.select("p.description").text()
+
+        return anime
+    }
+
+    private fun parseStatus(status: String): Int {
+        return when (status.lowercase()) {
+            "finished airing" -> SAnime.COMPLETED
+            "currently airing" -> SAnime.ONGOING
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListSelector(): String = "ul.ep-grid li.ep-card"
+
+    private fun episodeListRequest(anime: SAnime, page: Int): Request {
+        val url = "$baseUrl${anime.url}watch/?page=$page"
+        return GET(url, headers)
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        val title = element.select("a.ep-title").text()
+        val link = fixUrl(element.select("a.ep-title").attr("href"))
+        val dateElement = element.selectFirst("time[datetime]")
+        val releaseDate = dateElement?.attr("datetime") ?: ""
+
+        val date = try {
+            SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(releaseDate)
+        } catch (e: Exception) {
+            null
+        }
+
+        val episodeNumber = title.substringBefore(":").filter { it.isDigit() }.toIntOrNull()
+
+        episode.setUrlWithoutDomain(link)
+        episode.name = title
+        episode.episode_number = episodeNumber?.toFloat() ?: 0F
+        episode.date_upload = date?.time ?: 0
+
+        return episode
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val anime = SAnime.create()
+        anime.url = response.request.url.encodedPath
+        return fetchAllEpisodes(anime)
+    }
+
+    private fun fixUrl(url: String?): String {
+        return when {
+            url == null -> ""
+            url.startsWith("http") -> url
+            url.startsWith("//") -> "https:$url"
+            url.startsWith("/") -> "$baseUrl$url"
+            else -> "$baseUrl/$url"
+        }
+    }
+
+    private fun fetchAllEpisodes(anime: SAnime, page: Int = 1, episodes: MutableList<SEpisode> = mutableListOf()): List<SEpisode> {
+        val response = client.newCall(episodeListRequest(anime, page)).execute()
+        val document = response.asJsoup()
+        val newEpisodes = document.select(episodeListSelector()).map { element -> episodeFromElement(element) }
+        episodes.addAll(newEpisodes)
+
+        val hasNextPage = document.select("ul.pagination li a:contains(Next)").isNotEmpty()
+        return if (hasNextPage) {
+            fetchAllEpisodes(anime, page + 1, episodes)
+        } else {
+            episodes.sortedByDescending { it.episode_number }
+        }
+    }
+
+    // ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val data = response.request.url.toString()
+        val episode = data.removeSuffix("/").split("/").last()
+        val dubData = data.substringBeforeLast("/$episode").let { "$it-dub/$episode" }
+        val api = "$baseUrl/api/embed/"
+
+        val videoList = mutableListOf<Video>()
+
+        listOf(data, dubData).forEach { url ->
+            val doc = client.newCall(GET(url)).execute().asJsoup()
+            val iframe = doc.select("iframe#main-embed").attr("src") ?: return@forEach
+            val id = iframe.removeSuffix("/").split("/").lastOrNull() ?: return@forEach
+            val sourceResponse = client.newCall(
+                POST(
+                    api,
+                    body = FormBody.Builder()
+                        .add("id", id)
+                        .add("ac", "0")
+                        .build(),
+                    headers = headers.newBuilder()
+                        .add("Miru-Url", api)
+                        .add("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
+                        .add("X-Requested-With", "XMLHttpRequest")
+                        .add("Referer", "$baseUrl/e/$id/")
+                        .build(),
+                ),
+            ).execute().body.string()
+
+            val source = sourceResponse.parseAs<Sources>().hls?.distinct()?.firstOrNull() ?: return@forEach
+            val isDub = if (url.contains("-dub")) "dub" else "sub"
+            val sourceType = getSourceType(getBaseUrl(source))
+
+            videoList.add(
+                Video(
+                    source,
+                    "$sourceType [$isDub]",
+                    source,
+                    headers = headers,
+                ),
+            )
+        }
+
+        return videoList
+    }
+
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+
+    private fun getSourceType(url: String): String {
+        return when {
+            url.contains("cache", true) -> "Cache"
+            url.contains("allanime", true) -> "Crunchyroll-AL"
+
+            else -> Regex("\\.(\\S+)\\.").find(url)?.groupValues?.getOrNull(1)?.let { fixTitle(it) } ?: this.name
+        }
+    }
+
+    private fun fixTitle(title: String): String {
+        return title.replace("_", " ")
+    }
+
+    override fun videoListSelector(): String {
+        throw UnsupportedOperationException()
+    }
+
+    override fun videoUrlParse(document: Document): String {
+        throw UnsupportedOperationException()
+    }
+
+    @Serializable
+    data class Sources(
+        @SerialName("hls")
+        val hls: List<String>? = null,
+    )
+    companion object {
+        const val PREFIX_SEARCH = "id:"
+    }
+}
diff --git a/src/en/yugenanime/src/eu/kanade/tachiyomi/animeextension/en/yugenanime/YugenAnimeUrlActivity.kt b/src/en/yugenanime/src/eu/kanade/tachiyomi/animeextension/en/yugenanime/YugenAnimeUrlActivity.kt
new file mode 100644
index 00000000..3f0e7c21
--- /dev/null
+++ b/src/en/yugenanime/src/eu/kanade/tachiyomi/animeextension/en/yugenanime/YugenAnimeUrlActivity.kt
@@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.animeextension.en.yugenanime
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+
+/**
+ * Springboard that accepts https://yugenanime.sx/anime/<item> intents
+ * and redirects them to the main Aniyomi process.
+ */
+class YugenAnimeUrlActivity : Activity() {
+
+    private val tag = javaClass.simpleName
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null && pathSegments.size > 1) {
+            val item = pathSegments[1]
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", "${YugenAnime.PREFIX_SEARCH}$item")
+                putExtra("filter", packageName)
+            }
+
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {
+                Log.e(tag, e.toString())
+            }
+        } else {
+            Log.e(tag, "could not parse uri from intent $intent")
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/es/animebum/build.gradle b/src/es/animebum/build.gradle
new file mode 100644
index 00000000..076cc4f1
--- /dev/null
+++ b/src/es/animebum/build.gradle
@@ -0,0 +1,17 @@
+ext {
+    extName = 'AnimeBum'
+    extClass = '.AnimeBum'
+    extVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:universal-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:gdriveplayer-extractor'))
+}
\ No newline at end of file
diff --git a/src/es/animebum/res/mipmap-hdpi/ic_launcher.png b/src/es/animebum/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..1b2ad2c0
Binary files /dev/null and b/src/es/animebum/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/animebum/res/mipmap-mdpi/ic_launcher.png b/src/es/animebum/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..7abecc70
Binary files /dev/null and b/src/es/animebum/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/animebum/res/mipmap-xhdpi/ic_launcher.png b/src/es/animebum/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..130f14d6
Binary files /dev/null and b/src/es/animebum/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/animebum/res/mipmap-xxhdpi/ic_launcher.png b/src/es/animebum/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..aa379d76
Binary files /dev/null and b/src/es/animebum/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/animebum/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/animebum/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..e2fc3a60
Binary files /dev/null and b/src/es/animebum/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/animebum/src/eu/kanade/tachiyomi/animeextension/es/animebum/AnimeBum.kt b/src/es/animebum/src/eu/kanade/tachiyomi/animeextension/es/animebum/AnimeBum.kt
new file mode 100644
index 00000000..28eedb46
--- /dev/null
+++ b/src/es/animebum/src/eu/kanade/tachiyomi/animeextension/es/animebum/AnimeBum.kt
@@ -0,0 +1,356 @@
+package eu.kanade.tachiyomi.animeextension.es.animebum
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.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.lib.gdriveplayerextractor.GdrivePlayerExtractor
+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.vidguardextractor.VidGuardExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class AnimeBum : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "AnimeBum"
+
+    override val baseUrl = "https://www.animebum.net"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int): Request {
+        return GET("$baseUrl/series?page=$page", headers)
+    }
+
+    override fun popularAnimeSelector(): String = "article.serie"
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+
+        // Extraer el título y enlace
+        val titleElement = element.selectFirst("div.title h3 a")
+        anime.title = titleElement?.attr("title") ?: "Sin título"
+        anime.setUrlWithoutDomain(titleElement?.attr("href") ?: "")
+        // Extraer la imagen
+        val imageElement = element.selectFirst("figure.image img")
+        anime.thumbnail_url = imageElement?.attr("src") ?: ""
+
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String {
+        return "ul.pagination li a[rel=next]"
+    }
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesSelector(): String = popularAnimeSelector()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+
+    override fun latestUpdatesNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    // =============================== Search ===============================
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/search?s=$query&page=$page", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/${genreFilter.toUriPart()}?page=$page", headers)
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        val animes = document.select(searchAnimeSelector()).map { searchAnimeFromElement(it) }
+        val hasNextPage = searchAnimeNextPageSelector().let { selector ->
+            document.select(selector).firstOrNull() != null
+        }
+        return AnimesPage(animes, hasNextPage)
+    }
+
+    override fun searchAnimeSelector(): String {
+        return "div.search-results__item"
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+
+        val titleElement = element.selectFirst("div.search-results__left a h2")
+        anime.title = titleElement?.text().orEmpty()
+
+        val urlElement = element.selectFirst("div.search-results__left a")
+        anime.setUrlWithoutDomain(urlElement?.attr("href").orEmpty())
+
+        val imgElement = element.selectFirst("div.search-results__img a img")
+        anime.thumbnail_url = imgElement?.attr("src").orEmpty()
+
+        val descriptionElement = element.selectFirst("div.search-results__left div.description")
+        anime.description = descriptionElement?.text().orEmpty()
+
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String {
+        return "a.next.page-numbers"
+    }
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+
+        val synopsisElement = document.selectFirst("div.description p")
+        anime.description = synopsisElement?.text() ?: "Sin sinopsis"
+
+        val yearElement = document.selectFirst("p.datos-serie strong:contains(Año)")
+        anime.genre = yearElement?.text() ?: ""
+        // sie es fin o emison la clase
+        val statusElement = if (document.selectFirst("p.datos-serie strong.emision") != null) {
+            document.selectFirst("p.datos-serie strong.emision")
+        } else {
+            document.selectFirst("p.datos-serie strong.fin")
+        }
+        anime.status = parseStatus(statusElement?.text() ?: "")
+
+        val genresElement = document.select("div.boom-categories a")
+        anime.genre = genresElement.joinToString(", ") { it.text() }
+
+        return anime
+    }
+
+    private fun parseStatus(status: String): Int {
+        return when (status) {
+            "En emisión" -> SAnime.ONGOING
+            "Finalizado" -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListSelector(): String {
+        return "ul.list-episodies li"
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+
+        val episodeUrl = element.selectFirst("a")?.attr("href").orEmpty()
+        val episodeTitle = element.selectFirst("a")?.ownText()?.trim().orEmpty()
+        val episodeNumber = Regex("""Episodio (\d+)""").find(episodeTitle)?.groupValues?.get(1)?.toFloatOrNull()
+
+        episode.setUrlWithoutDomain(episodeUrl)
+        episode.name = episodeTitle
+        episode.episode_number = episodeNumber ?: 1F
+
+        return episode
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        return document.select(episodeListSelector()).map { episodeFromElement(it) }.sortedByDescending { it.episode_number }
+    }
+
+    // ============================ Video Extractor ==========================
+
+    private val vidHideExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val gdrivePlayerExtractor by lazy { GdrivePlayerExtractor(client) }
+
+    // ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        val scriptContent = document.select("script:containsData(var video = [])").firstOrNull()?.data()
+            ?: return videoList
+
+        val iframeRegex = """video\[\d+\]\s*=\s*['"]<iframe[^>]+src=["']([^"']+)["']""".toRegex()
+        val matches = iframeRegex.findAll(scriptContent)
+
+        for (match in matches) {
+            var videoUrl = match.groupValues[1]
+
+            if (videoUrl.startsWith("//")) {
+                videoUrl = "https:$videoUrl"
+            }
+
+            val vidHideDomains = listOf("vidhide", "VidHidePro", "luluvdo", "vidhideplus")
+
+            val video = when {
+                vidHideDomains.any { videoUrl.contains(it, ignoreCase = true) } -> vidHideExtractor.videosFromUrl(videoUrl)
+                "drive.google" in videoUrl -> {
+                    val newUrl = "https://gdriveplayer.to/embed2.php?link=$videoUrl"
+                    Log.d("AnimeBum", "New URL: $newUrl")
+                    gdrivePlayerExtractor.videosFromUrl(newUrl, "GdrivePlayer", headers)
+                }
+                videoUrl.contains("streamwish") -> streamWishExtractor.videosFromUrl(videoUrl)
+                videoUrl.contains("ok.ru") -> okruExtractor.videosFromUrl(videoUrl)
+                videoUrl.contains("listeamed") -> vidGuardExtractor.videosFromUrl(videoUrl)
+                else -> emptyList()
+            }
+            videoList.addAll(video)
+        }
+        return videoList.sortedByDescending { it.quality }
+    }
+
+    override fun videoListSelector(): String {
+        throw UnsupportedOperationException()
+    }
+
+    override fun videoFromElement(element: Element): Video {
+        throw UnsupportedOperationException()
+    }
+
+    override fun videoUrlParse(document: Document): String {
+        throw UnsupportedOperationException()
+    }
+
+    // ============================ Filters =============================
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Género",
+        arrayOf(
+            Pair("<Seleccionar>", ""),
+            Pair("Acción", "genero/accion"),
+            Pair("Aventura", "genero/aventura"),
+            Pair("Ciencia Ficción", "genero/ciencia-ficcion"),
+            Pair("Comedia", "genero/comedia"),
+            Pair("Drama", "genero/drama"),
+            Pair("Terror", "genero/terror"),
+            Pair("Suspenso", "genero/suspenso"),
+            Pair("Romance", "genero/romance"),
+            Pair("Magia", "genero/magia"),
+            Pair("Misterio", "genero/misterio"),
+            Pair("Superpoderes", "genero/super-poderes"),
+            Pair("Shounen", "genero/shounen"),
+            Pair("Deportes", "genero/deportes"),
+            Pair("Fantasía", "genero/fantasia"),
+            Pair("Sobrenatural", "genero/sobrenatural"),
+            Pair("Música", "genero/musica"),
+            Pair("Escolares", "genero/escolares"),
+            Pair("Seinen", "genero/seinen"),
+            Pair("Histórico", "genero/historico"),
+            Pair("Psicológico", "genero/psicologico"),
+            Pair("Mecha", "genero/mecha"),
+            Pair("Juegos", "genero/juegos"),
+            Pair("Militar", "genero/militar"),
+            Pair("Recuentos de la Vida", "genero/recuentos-de-la-vida"),
+            Pair("Demonios", "genero/demonios"),
+            Pair("Artes Marciales", "genero/artes-marciales"),
+            Pair("Espacial", "genero/espacial"),
+            Pair("Shoujo", "genero/shoujo"),
+            Pair("Samurái", "genero/samurai"),
+            Pair("Harem", "genero/harem"),
+            Pair("Parodia", "genero/parodia"),
+            Pair("Ecchi", "genero/ecchi"),
+            Pair("Demencia", "genero/demencia"),
+            Pair("Vampiros", "genero/vampiros"),
+            Pair("Josei", "genero/josei"),
+            Pair("Shounen Ai", "genero/shounen-ai"),
+            Pair("Shoujo Ai", "genero/shoujo-ai"),
+            Pair("Latino", "genero/latino"),
+            Pair("Policía", "genero/policia"),
+            Pair("Yaoi", "genero/yaoi"),
+        ),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    // ============================ Preferences =============================
+
+    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 = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+        )
+    }
+    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/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
new file mode 100644
index 00000000..dca8f96f
--- /dev/null
+++ b/src/es/animefenix/build.gradle
@@ -0,0 +1,25 @@
+ext {
+    extName = 'Animefenix'
+    extClass = '.Animefenix'
+    extVersionCode = 54
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:mp4upload-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:yourupload-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:burstcloud-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:streamlare-extractor'))
+    implementation(project(':lib:fastream-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:upstream-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:universal-extractor'))
+}
diff --git a/src/es/animefenix/res/mipmap-hdpi/ic_launcher.png b/src/es/animefenix/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..46c6d293
Binary files /dev/null and b/src/es/animefenix/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/animefenix/res/mipmap-mdpi/ic_launcher.png b/src/es/animefenix/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..46c6d293
Binary files /dev/null and b/src/es/animefenix/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/animefenix/res/mipmap-xhdpi/ic_launcher.png b/src/es/animefenix/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..46c6d293
Binary files /dev/null and b/src/es/animefenix/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/animefenix/res/mipmap-xxhdpi/ic_launcher.png b/src/es/animefenix/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..46c6d293
Binary files /dev/null and b/src/es/animefenix/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/animefenix/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/animefenix/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..46c6d293
Binary files /dev/null and b/src/es/animefenix/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt
new file mode 100644
index 00000000..eaab6fbf
--- /dev/null
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/AnimeFenixFilters.kt
@@ -0,0 +1,161 @@
+package eu.kanade.tachiyomi.animeextension.es.animefenix
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import java.util.Calendar
+
+object AnimeFenixFilters {
+    open class QueryPartFilter(displayName: String, val vals: Array<Pair<String, String>>) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart(name: String) = vals[state].second.takeIf { it.isNotEmpty() }?.let { "&$name=${vals[state].second}" } ?: run { "" }
+    }
+
+    open class CheckBoxFilterList(name: String, values: List<CheckBox>) : AnimeFilter.Group<AnimeFilter.CheckBox>(name, values)
+
+    private class CheckBoxVal(name: String, state: Boolean = false) : AnimeFilter.CheckBox(name, state)
+
+    private inline fun <reified R> AnimeFilterList.parseCheckbox(
+        options: Array<Pair<String, String>>,
+        name: String,
+    ): String {
+        return (this.getFirst<R>() as CheckBoxFilterList).state
+            .mapNotNull { checkbox ->
+                if (checkbox.state) {
+                    options.find { it.first == checkbox.name }!!.second
+                } else {
+                    null
+                }
+            }.joinToString("&$name[]=").let {
+                if (it.isBlank()) {
+                    ""
+                } else {
+                    "&$name[]=$it"
+                }
+            }
+    }
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(name: String): String {
+        return (this.getFirst<R>() as QueryPartFilter).toQueryPart(name)
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return this.filterIsInstance<R>().first()
+    }
+
+    private fun String.changePrefix() = this.takeIf { it.startsWith("&") }?.let { this.replaceFirst("&", "?") } ?: run { this }
+
+    data class FilterSearchParams(val filter: String = "") { fun getQuery() = filter.changePrefix() }
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+        return FilterSearchParams(
+            filters.parseCheckbox<GenresFilter>(AnimeFenixFiltersData.GENRES, "genero") +
+                filters.parseCheckbox<YearsFilter>(AnimeFenixFiltersData.YEARS, "year") +
+                filters.parseCheckbox<TypesFilter>(AnimeFenixFiltersData.TYPES, "type") +
+                filters.parseCheckbox<StateFilter>(AnimeFenixFiltersData.STATE, "estado") +
+                filters.asQueryPart<SortFilter>("order"),
+        )
+    }
+
+    val FILTER_LIST get() = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenresFilter(),
+        YearsFilter(),
+        TypesFilter(),
+        StateFilter(),
+        SortFilter(),
+    )
+
+    class GenresFilter : CheckBoxFilterList("Género", AnimeFenixFiltersData.GENRES.map { CheckBoxVal(it.first, false) })
+
+    class YearsFilter : CheckBoxFilterList("Año", AnimeFenixFiltersData.YEARS.map { CheckBoxVal(it.first, false) })
+
+    class TypesFilter : CheckBoxFilterList("Tipo", AnimeFenixFiltersData.TYPES.map { CheckBoxVal(it.first, false) })
+
+    class StateFilter : CheckBoxFilterList("Estado", AnimeFenixFiltersData.STATE.map { CheckBoxVal(it.first, false) })
+
+    class SortFilter : QueryPartFilter("Orden", AnimeFenixFiltersData.SORT)
+
+    private object AnimeFenixFiltersData {
+        val YEARS = (1990..Calendar.getInstance().get(Calendar.YEAR)).map { Pair("$it", "$it") }.reversed().toTypedArray()
+
+        val TYPES = arrayOf(
+            Pair("TV", "tv"),
+            Pair("Película", "movie"),
+            Pair("Especial", "special"),
+            Pair("OVA", "ova"),
+            Pair("DONGHUA", "donghua"),
+        )
+
+        val STATE = arrayOf(
+            Pair("Emisión", "1"),
+            Pair("Finalizado", "2"),
+            Pair("Próximamente", "3"),
+            Pair("En Cuarentena", "4"),
+        )
+
+        val SORT = arrayOf(
+            Pair("Por Defecto", "default"),
+            Pair("Recientemente Actualizados", "updated"),
+            Pair("Recientemente Agregados", "added"),
+            Pair("Nombre A-Z", "title"),
+            Pair("Calificación", "likes"),
+            Pair("Más Vistos", "visits"),
+        )
+
+        val GENRES = arrayOf(
+            Pair("Acción", "accion"),
+            Pair("Ángeles", "angeles"),
+            Pair("Artes Marciales", "artes-marciales"),
+            Pair("Aventura", "aventura"),
+            Pair("Ciencia Ficción", "Ciencia Ficción"),
+            Pair("Comedia", "comedia"),
+            Pair("Cyberpunk", "cyberpunk"),
+            Pair("Demonios", "demonios"),
+            Pair("Deportes", "deportes"),
+            Pair("Dragones", "dragones"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Escolares", "escolares"),
+            Pair("Fantasía", "fantasia"),
+            Pair("Gore", "gore"),
+            Pair("Harem", "harem"),
+            Pair("Histórico", "historico"),
+            Pair("Horror", "horror"),
+            Pair("Infantil", "infantil"),
+            Pair("Isekai", "isekai"),
+            Pair("Josei", "josei"),
+            Pair("Juegos", "juegos"),
+            Pair("Magia", "magia"),
+            Pair("Mecha", "mecha"),
+            Pair("Militar", "militar"),
+            Pair("Misterio", "misterio"),
+            Pair("Música", "Musica"),
+            Pair("Ninjas", "ninjas"),
+            Pair("Parodia", "parodia"),
+            Pair("Policía", "policia"),
+            Pair("Psicológico", "psicologico"),
+            Pair("Recuerdos de la vida", "Recuerdos de la vida"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("Sci-Fi", "sci-fi"),
+            Pair("Seinen", "seinen"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Shoujo Ai", "shoujo-ai"),
+            Pair("Shounen", "shounen"),
+            Pair("Slice of life", "slice-of-life"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Space", "space"),
+            Pair("Spokon", "spokon"),
+            Pair("Steampunk", "steampunk"),
+            Pair("Superpoder", "superpoder"),
+            Pair("Thriller", "thriller"),
+            Pair("Vampiro", "vampiro"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri"),
+            Pair("Zombies", "zombies"),
+        )
+    }
+}
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
new file mode 100644
index 00000000..dc1487bd
--- /dev/null
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
@@ -0,0 +1,307 @@
+package eu.kanade.tachiyomi.animeextension.es.animefenix
+
+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.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.net.URLDecoder
+
+class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
+
+    override val name = "AnimeFenix"
+
+    override val baseUrl = "https://www3.animefenix.tv"
+
+    override val lang = "es"
+
+    override val supportsLatest = true
+
+    private val preferences: SharedPreferences by lazy { Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) }
+
+    companion object {
+        private val SERVER_REGEX = """tabsArray\['?\d+'?]\s*=\s*['\"](https[^'\"]+)['\"]""".toRegex()
+        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 = "Amazon"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape",
+            "Fastream", "Filemoon", "StreamWish", "Okru",
+            "Amazon", "AmazonES", "Fireload", "FileLions",
+        )
+    }
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/animes?order=likes&page=$page")
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        val elements = document.select("div.container .grid.gap-4 a[href]")
+        val nextPage = document.select("nav[aria-label=Pagination] span:containsOwn(Next)").any()
+        val animeList = elements.map { element ->
+            SAnime.create().apply {
+                setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href"))
+                title = element.selectFirst("div h3.text-primary")!!.ownText()
+                thumbnail_url = element.selectFirst("img.object-cover")?.attr("abs:src")
+            }
+        }
+        return AnimesPage(animeList, nextPage)
+    }
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/animes?order=added&page=$page")
+
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = AnimeFenixFilters.getSearchParameters(filters)
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/animes?q=$query&page=$page", headers)
+            params.filter.isNotBlank() -> GET("$baseUrl/animes${params.getQuery()}&page=$page", headers)
+            else -> GET("$baseUrl/animes?order=likes&page=$page")
+        }
+    }
+
+    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        return document.select("div.container > div > ul > li").map { element ->
+            SEpisode.create().apply {
+                name = element.selectFirst("span > span")!!.ownText()
+                setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href"))
+            }
+        }
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        val serversData = document.selectFirst("script:containsData(var tabsArray)")?.data() ?: throw Exception("No se encontraron servidores")
+        val servers = SERVER_REGEX.findAll(serversData).map { it.groupValues[1] }.toList()
+
+        servers.parallelForEachBlocking { server ->
+            val decodedUrl = URLDecoder.decode(server, "UTF-8")
+            val realUrl = try {
+                client.newCall(GET(decodedUrl)).execute().asJsoup().selectFirst("script")!!
+                    .data().substringAfter("src=\"").substringBefore("\"")
+            } catch (e: Exception) { "" }
+
+            try {
+                serverVideoResolver(realUrl).let { videoList.addAll(it) }
+            } catch (_: Exception) { }
+        }
+        return videoList.filter { it.url.contains("https") || it.url.contains("http") }
+    }
+
+    private fun serverVideoResolver(url: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
+        try {
+            when {
+                embedUrl.contains("voe") -> {
+                    VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                (embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable") -> {
+                    val video = amazonExtractor(baseUrl + url.substringAfter(".."))
+                    if (video.isNotBlank()) {
+                        if (url.contains("&ext=es")) {
+                            videoList.add(Video(video, "AmazonES", video))
+                        } else {
+                            videoList.add(Video(video, "Amazon", video))
+                        }
+                    }
+                }
+                embedUrl.contains("ok.ru") || embedUrl.contains("okru") -> {
+                    OkruExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("filemoon") || embedUrl.contains("moonplayer") -> {
+                    val vidHeaders = headers.newBuilder()
+                        .add("Origin", "https://${url.toHttpUrl().host}")
+                        .add("Referer", "https://${url.toHttpUrl().host}/")
+                        .build()
+                    FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:", headers = vidHeaders).also(videoList::addAll)
+                }
+                embedUrl.contains("uqload") -> {
+                    UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("mp4upload") -> {
+                    Mp4uploadExtractor(client).videosFromUrl(url, headers).let { videoList.addAll(it) }
+                }
+                embedUrl.contains("wishembed") || embedUrl.contains("embedwish") || 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" }).also(videoList::addAll)
+                }
+                embedUrl.contains("doodstream") || embedUrl.contains("dood.") -> {
+                    DoodExtractor(client).videoFromUrl(url, "DoodStream")?.let { videoList.add(it) }
+                }
+                embedUrl.contains("streamlare") -> {
+                    StreamlareExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+                }
+                embedUrl.contains("yourupload") || embedUrl.contains("upload") -> {
+                    YourUploadExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+                }
+                embedUrl.contains("burstcloud") || embedUrl.contains("burst") -> {
+                    BurstCloudExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+                }
+                embedUrl.contains("fastream") -> {
+                    FastreamExtractor(client, headers).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("upstream") -> {
+                    UpstreamExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+                }
+                embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape") -> {
+                    StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
+                }
+                embedUrl.contains("ahvsh") || embedUrl.contains("streamhide") -> {
+                    StreamHideVidExtractor(client, headers).videosFromUrl(url).let { videoList.addAll(it) }
+                }
+                embedUrl.contains("/stream/fl.php") -> {
+                    val video = url.substringAfter("/stream/fl.php?v=")
+                    if (client.newCall(GET(video)).execute().code == 200) {
+                        videoList.add(Video(video, "FireLoad", video))
+                    }
+                }
+                embedUrl.contains("filelions") || embedUrl.contains("lion") -> {
+                    StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
+                }
+                else ->
+                    UniversalExtractor(client).videosFromUrl(url, headers).let { videoList.addAll(it) }
+            }
+        } catch (_: Exception) { }
+        return videoList
+    }
+
+    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 animeDetailsParse(response: Response) = SAnime.create().apply {
+        val document = response.asJsoup()
+        with(document.selectFirst("main > div.relative > div.container > div.flex")!!) {
+            title = selectFirst("h1.font-bold")!!.ownText()
+            genre = select("div:has(h2:containsOwn(Géneros)) > div.flex > a").joinToString { it.text() }
+            status = parseStatus(selectFirst("li:has(> span:containsOwn(Estado))")!!.ownText())
+            description = select("div:has(h2:containsOwn(Sinopsis)) > p").text()
+        }
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when {
+            statusString.contains("Emisión") -> SAnime.ONGOING
+            statusString.contains("Finalizado") -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    private fun amazonExtractor(url: String): String {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val videoURl = document.selectFirst("script:containsData(sources: [)")!!.data()
+            .substringAfter("[{\"file\":\"")
+            .substringBefore("\",").replace("\\", "")
+
+        return try {
+            if (client.newCall(GET(videoURl)).execute().code == 200) videoURl else ""
+        } catch (e: Exception) {
+            ""
+        }
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimeFenixFilters.FILTER_LIST
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        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)
+
+        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)
+    }
+
+    suspend inline fun <A> Iterable<A>.parallelForEach(crossinline f: suspend (A) -> Unit) {
+        coroutineScope {
+            for (item in this@parallelForEach) {
+                launch(Dispatchers.IO) {
+                    f(item)
+                }
+            }
+        }
+    }
+
+    inline fun <A> Iterable<A>.parallelForEachBlocking(crossinline f: suspend (A) -> Unit) {
+        runBlocking {
+            this@parallelForEachBlocking.parallelForEach(f)
+        }
+    }
+}
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt
new file mode 100644
index 00000000..a66b611e
--- /dev/null
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt
@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.animeextension.es.animefenix.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class SolidFilesExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
+        val videoList = mutableListOf<Video>()
+        return try {
+            val document = client.newCall(GET(url)).execute().asJsoup()
+            document.select("script").forEach { script ->
+                if (script.data().contains("\"downloadUrl\":")) {
+                    val data = script.data().substringAfter("\"downloadUrl\":").substringBefore(",")
+                    val url = data.replace("\"", "")
+                    val videoUrl = url
+                    val quality = prefix + "SolidFiles"
+                    videoList.add(Video(videoUrl, quality, videoUrl))
+                }
+            }
+            videoList
+        } catch (e: Exception) {
+            videoList
+        }
+    }
+}
diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle
index 26735a21..7fb9f6b1 100644
--- a/src/es/animeflv/build.gradle
+++ b/src/es/animeflv/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeFLV'
     extClass = '.AnimeFlv'
-    extVersionCode = 59
+    extVersionCode = 63
 }
 
 apply from: "$rootDir/common.gradle"
@@ -11,4 +11,5 @@ dependencies {
     implementation(project(':lib:streamtape-extractor'))
     implementation(project(':lib:okru-extractor'))
     implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
index eb3079a0..d7f952a9 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
@@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -57,7 +58,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun popularAnimeSelector(): String = "div.Container ul.ListAnimes li article"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/browse?order=rating&page=$page")
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/browse?order=rating&page=$page", headers)
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
@@ -108,18 +109,19 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers.newBuilder().add("Referer", "$baseUrl/").build()) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val jsonString = document.selectFirst("script:containsData(var videos = {)")?.data() ?: return emptyList()
         val responseString = jsonString.substringAfter("var videos =").substringBefore(";").trim()
-        return json.decodeFromString<ServerModel>(responseString).sub.parallelCatchingFlatMapBlocking {
+        return json.decodeFromString<ServerModel>(responseString).sub.parallelCatchingFlatMapBlocking { it ->
             when (it.title) {
                 "Stape" -> listOf(streamTapeExtractor.videoFromUrl(it.url ?: it.code)!!)
                 "Okru" -> okruExtractor.videosFromUrl(it.url ?: it.code)
                 "YourUpload" -> yourUploadExtractor.videoFromUrl(it.url ?: it.code, headers = headers)
                 "SW" -> streamWishExtractor.videosFromUrl(it.url ?: it.code, videoNameGen = { "StreamWish:$it" })
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(it.url ?: it.code, headers)
             }
         }
     }
@@ -132,7 +134,6 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val params = AnimeFlvFilters.getSearchParameters(filters)
-
         return when {
             query.isNotBlank() -> GET("$baseUrl/browse?q=$query&page=$page")
             params.filter.isNotBlank() -> GET("$baseUrl/browse${params.getQuery()}&page=$page")
@@ -166,13 +167,19 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+    override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers)
 
-    override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
+    override fun latestUpdatesNextPageSelector() = null
 
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/browse?order=added&page=$page")
+    override fun latestUpdatesSelector() = "div.Container ul.ListEpisodios li a.fa-play"
 
-    override fun latestUpdatesSelector() = popularAnimeSelector()
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a").attr("abs:href").replace("/ver/", "/anime/").substringBeforeLast("-"))
+        anime.title = element.select("strong.Title").text()
+        anime.thumbnail_url = element.select("span.Image img").attr("abs:src").replace("thumbs", "covers")
+        return anime
+    }
 
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
diff --git a/src/es/animeid/build.gradle b/src/es/animeid/build.gradle
index 02eafb73..6e7b3764 100644
--- a/src/es/animeid/build.gradle
+++ b/src/es/animeid/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeID'
     extClass = '.AnimeID'
-    extVersionCode = 10
+    extVersionCode = 15
 }
 
 apply from: "$rootDir/common.gradle"
@@ -9,4 +9,5 @@ apply from: "$rootDir/common.gradle"
 dependencies {
     implementation(project(':lib:streamtape-extractor'))
     implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
index 13be7d73..ea4a9080 100644
--- a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
+++ b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
@@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
@@ -120,6 +121,7 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // ============================ Video Links =============================
     private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -128,11 +130,10 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             val jsonString = script.attr("data")
             val jsonUnescape = unescapeJava(jsonString)!!.replace("\\", "")
             val url = fetchUrls(jsonUnescape).firstOrNull()?.replace("\\\\", "\\") ?: ""
-            if (url.contains("streamtape") || url.contains("tape") || url.contains("stp")) {
-                streamtapeExtractor.videosFromUrl(url).also(videoList::addAll)
-            }
-            if (url.contains("wish") || url.contains("fviplions") || url.contains("obeywish")) {
-                streamwishExtractor.videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
+            return when {
+                url.contains("streamtape") || url.contains("tape") || url.contains("stp") -> streamtapeExtractor.videosFromUrl(url)
+                url.contains("wish") || url.contains("fviplions") || url.contains("obeywish") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
+                else -> universalExtractor.videosFromUrl(url, headers)
             }
         }
         return videoList
diff --git a/src/es/animejl/build.gradle b/src/es/animejl/build.gradle
new file mode 100644
index 00000000..8c5f89a7
--- /dev/null
+++ b/src/es/animejl/build.gradle
@@ -0,0 +1,20 @@
+ext {
+    extName = 'Animejl'
+    extClass = '.Animejl'
+    extVersionCode = 4
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:yourupload-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:universal-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
+}
\ No newline at end of file
diff --git a/src/es/animejl/res/mipmap-hdpi/ic_launcher.png b/src/es/animejl/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..e095a591
Binary files /dev/null and b/src/es/animejl/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/animejl/res/mipmap-mdpi/ic_launcher.png b/src/es/animejl/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..fae29dd5
Binary files /dev/null and b/src/es/animejl/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/animejl/res/mipmap-xhdpi/ic_launcher.png b/src/es/animejl/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..b4da3029
Binary files /dev/null and b/src/es/animejl/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/animejl/res/mipmap-xxhdpi/ic_launcher.png b/src/es/animejl/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..a5a6f049
Binary files /dev/null and b/src/es/animejl/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/animejl/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/animejl/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..fe3ab328
Binary files /dev/null and b/src/es/animejl/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/animejl/src/eu/kanade/tachiyomi/animeextension/es/animejl/Animejl.kt b/src/es/animejl/src/eu/kanade/tachiyomi/animeextension/es/animejl/Animejl.kt
new file mode 100644
index 00000000..30278c80
--- /dev/null
+++ b/src/es/animejl/src/eu/kanade/tachiyomi/animeextension/es/animejl/Animejl.kt
@@ -0,0 +1,244 @@
+package eu.kanade.tachiyomi.animeextension.es.animejl
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import kotlin.Exception
+
+class Animejl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Animejl"
+
+    override val baseUrl = "https://www.anime-jl.net"
+
+    override val lang = "es"
+
+    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 = "720"
+        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", "YourUpload", "Okru", "StreamTape", "StreamHideVid", "Voe", "Uqload", "Mp4upload")
+    }
+
+    override fun popularAnimeSelector(): String = "div.Container ul.ListAnimes li article"
+
+    override fun popularAnimeRequest(page: Int): Request =
+        GET("$baseUrl/animes?order=rating&page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("div.Description a.Button").attr("abs:href"))
+        anime.title = element.select("a h3").text()
+        anime.thumbnail_url = element.select("a div.Image figure img").attr("src").replace("/storage", "$baseUrl/storage")
+        anime.description = element.select("div.Description p:eq(2)").text().removeSurrounding("\"")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.pagination li a[rel=\"next\"]"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episodeList = mutableListOf<SEpisode>()
+
+        val script = document.select("script:containsData(var episodes =)").firstOrNull()?.data() ?: return emptyList()
+
+        val episodesPattern = Regex("var episodes = (\\[.*?\\]);", RegexOption.DOT_MATCHES_ALL)
+        val episodesMatch = episodesPattern.find(script) ?: return emptyList()
+        val episodesString = episodesMatch.groupValues[1]
+
+        val animeInfoPattern = Regex("var anime_info = \\[(.*?)\\];")
+        val animeInfoMatch = animeInfoPattern.find(script) ?: return emptyList()
+        val animeInfo = animeInfoMatch.groupValues[1].split(",").map { it.trim('"') }
+
+        val animeSlug = animeInfo.getOrNull(2) ?: ""
+        val animeId = animeInfo.getOrNull(0) ?: ""
+        val episodePattern = Regex("\\[(\\d+),\"(.*?)\",\"(.*?)\",\"(.*?)\"\\]")
+        val episodeMatches = episodePattern.findAll(episodesString)
+
+        episodeMatches.forEach { match ->
+            try {
+                val episodeNumber = match.groupValues[1].toIntOrNull() ?: 0
+                val url = "$baseUrl/anime/$animeId/$animeSlug/episodio-$episodeNumber"
+                val episode = SEpisode.create()
+                episode.setUrlWithoutDomain(url)
+                episode.episode_number = episodeNumber.toFloat()
+                episode.name = "Episodio $episodeNumber"
+                episodeList.add(episode)
+            } catch (e: Exception) {
+                Log.e("Animejl", "Error processing episode: ${e.message}")
+            }
+        }
+
+        return episodeList.sortedByDescending { it.episode_number }
+    }
+
+    override fun episodeListSelector() = "uwu"
+
+    override fun episodeFromElement(element: Element) = throw UnsupportedOperationException()
+
+    /*--------------------------------Video extractors------------------------------------*/
+    private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val scriptContent = document.selectFirst("script:containsData(var video = [)")?.data()
+            ?: return emptyList()
+        val videoList = mutableListOf<Video>()
+        val videoPattern = Regex("""video\[\d+\] = '<iframe src="(.*?)"""")
+        val matches = videoPattern.findAll(scriptContent)
+        matches.forEach { match ->
+            val url = match.groupValues[1]
+            val videos = when {
+                url.contains("streamtape") -> listOfNotNull(streamTapeExtractor.videoFromUrl(url))
+                url.contains("ok.ru") -> okruExtractor.videosFromUrl(url)
+                url.contains("yourupload") -> yourUploadExtractor.videoFromUrl(url, headers)
+                url.contains("streamwish") || url.contains("playerwish") -> streamWishExtractor.videosFromUrl(url)
+                url.contains("streamhidevid") -> streamHideVidExtractor.videosFromUrl(url)
+                url.contains("voe") -> voeExtractor.videosFromUrl(url)
+                url.contains("uqload") -> uqloadExtractor.videosFromUrl(url)
+                url.contains("mp4upload") -> mp4uploadExtractor.videosFromUrl(url, headers)
+                else -> universalExtractor.videosFromUrl(url, headers)
+            }
+            videoList.addAll(videos)
+        }
+        return videoList.sort()
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = AnimejlFilters.getSearchParameters(filters)
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/animes?q=$query&page=$page")
+            params.filter.isNotBlank() -> GET("$baseUrl/animes${params.getQuery()}&page=$page")
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimejlFilters.FILTER_LIST
+
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url =
+            document.selectFirst("div.AnimeCover div.Image figure img")!!.attr("abs:src")
+        anime.title = document.selectFirst("div.Ficha.fchlt div.Container .Title")!!.text()
+        anime.description = document.selectFirst("div.Description")!!.text().removeSurrounding("\"")
+        anime.genre = document.select("nav.Nvgnrs a").joinToString { it.text() }
+        anime.status = parseStatus(document.select("span.fa-tv").text())
+        return anime
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when {
+            statusString.contains("En emision") -> SAnime.ONGOING
+            statusString.contains("Finalizado") -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+
+    override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/animes?order=updated&page=$page")
+
+    override fun latestUpdatesSelector() = popularAnimeSelector()
+
+    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/es/animejl/src/eu/kanade/tachiyomi/animeextension/es/animejl/AnimejlFilters.kt b/src/es/animejl/src/eu/kanade/tachiyomi/animeextension/es/animejl/AnimejlFilters.kt
new file mode 100644
index 00000000..987055a3
--- /dev/null
+++ b/src/es/animejl/src/eu/kanade/tachiyomi/animeextension/es/animejl/AnimejlFilters.kt
@@ -0,0 +1,159 @@
+package eu.kanade.tachiyomi.animeextension.es.animejl
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import java.util.Calendar
+
+object AnimejlFilters {
+    open class QueryPartFilter(displayName: String, val vals: Array<Pair<String, String>>) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart(name: String) = vals[state].second.takeIf { it.isNotEmpty() }?.let { "&$name=${vals[state].second}" } ?: run { "" }
+    }
+
+    open class CheckBoxFilterList(name: String, values: List<CheckBox>) : AnimeFilter.Group<AnimeFilter.CheckBox>(name, values)
+
+    private class CheckBoxVal(name: String, state: Boolean = false) : AnimeFilter.CheckBox(name, state)
+
+    private inline fun <reified R> AnimeFilterList.parseCheckbox(
+        options: Array<Pair<String, String>>,
+        name: String,
+    ): String {
+        return (this.getFirst<R>() as CheckBoxFilterList).state
+            .mapNotNull { checkbox ->
+                if (checkbox.state) {
+                    options.find { it.first == checkbox.name }!!.second
+                } else {
+                    null
+                }
+            }.joinToString("&$name[]=").let {
+                if (it.isBlank()) {
+                    ""
+                } else {
+                    "&$name[]=$it"
+                }
+            }
+    }
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(name: String): String {
+        return (this.getFirst<R>() as QueryPartFilter).toQueryPart(name)
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return this.filterIsInstance<R>().first()
+    }
+
+    private fun String.changePrefix() = this.takeIf { it.startsWith("&") }?.let { this.replaceFirst("&", "?") } ?: run { this }
+
+    data class FilterSearchParams(val filter: String = "") { fun getQuery() = filter.changePrefix() }
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+        return FilterSearchParams(
+            filters.parseCheckbox<GenresFilter>(AnimeFlvFiltersData.GENRES, "genre") +
+                filters.parseCheckbox<YearsFilter>(AnimeFlvFiltersData.YEARS, "year") +
+                filters.parseCheckbox<TypesFilter>(AnimeFlvFiltersData.TYPES, "type") +
+                filters.parseCheckbox<StateFilter>(AnimeFlvFiltersData.STATE, "estado") +
+                filters.asQueryPart<SortFilter>("order"),
+        )
+    }
+
+    val FILTER_LIST get() = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenresFilter(),
+        YearsFilter(),
+        TypesFilter(),
+        StateFilter(),
+        SortFilter(),
+    )
+
+    class GenresFilter : CheckBoxFilterList("Género", AnimeFlvFiltersData.GENRES.map { CheckBoxVal(it.first, false) })
+
+    class YearsFilter : CheckBoxFilterList("Año", AnimeFlvFiltersData.YEARS.map { CheckBoxVal(it.first, false) })
+
+    class TypesFilter : CheckBoxFilterList("Tipo", AnimeFlvFiltersData.TYPES.map { CheckBoxVal(it.first, false) })
+
+    class StateFilter : CheckBoxFilterList("Estado", AnimeFlvFiltersData.STATE.map { CheckBoxVal(it.first, false) })
+
+    class SortFilter : QueryPartFilter("Orden", AnimeFlvFiltersData.SORT)
+
+    private object AnimeFlvFiltersData {
+        val YEARS = (1990..Calendar.getInstance().get(Calendar.YEAR)).map { Pair("$it", "$it") }.reversed().toTypedArray()
+
+        val TYPES = arrayOf(
+            Pair("Anime", "1"),
+            Pair("Ova", "2"),
+            Pair("Pelicula", "3"),
+            Pair("Donghua", "7"),
+        )
+
+        val STATE = arrayOf(
+            Pair("En emisión", "0"),
+            Pair("Finalizado", "1"),
+            Pair("Próximamente", "2"),
+        )
+
+        val SORT = arrayOf(
+            Pair("Por Defecto", "created"),
+            Pair("Recientemente Actualizados", "updated"),
+            Pair("Nombre A-Z", "titleaz"),
+            Pair("Nombre Z-A", "titleza"),
+            Pair("Calificación", "rating"),
+            Pair("Vistas", "views"),
+        )
+
+        val GENRES = arrayOf(
+            Pair("Acción", "1"),
+            Pair("Artes Marciales", "2"),
+            Pair("Aventuras", "3"),
+            Pair("Ciencia Ficción", "33"),
+            Pair("Comedia", "9"),
+            Pair("Cultivación", "71"),
+            Pair("Demencia", "40"),
+            Pair("Demonios", "42"),
+            Pair("Deportes", "27"),
+            Pair("Donghua", "50"),
+            Pair("Drama", "10"),
+            Pair("Ecchi", "25"),
+            Pair("Escolares", "22"),
+            Pair("Espacial", "48"),
+            Pair("Fantasia", "6"),
+            Pair("Gore", "67"),
+            Pair("Harem", "32"),
+            Pair("Hentai", "31"),
+            Pair("Historico", "43"),
+            Pair("Horror", "39"),
+            Pair("Isekai", "45"),
+            Pair("Josei", "70"),
+            Pair("Juegos", "11"),
+            Pair("Latino / Castellano", "46"),
+            Pair("Magia", "38"),
+            Pair("Mecha", "41"),
+            Pair("Militar", "44"),
+            Pair("Misterio", "26"),
+            Pair("Mitología", "73"),
+            Pair("Musica", "28"),
+            Pair("Parodia", "13"),
+            Pair("Policía", "51"),
+            Pair("Psicologico", "29"),
+            Pair("Recuentos de la vida", "23"),
+            Pair("Reencarnación", "72"),
+            Pair("Romance", "12"),
+            Pair("Samurai", "69"),
+            Pair("Seinen", "24"),
+            Pair("Shoujo", "36"),
+            Pair("Shounen", "4"),
+            Pair("Sin Censura", "68"),
+            Pair("Sobrenatural", "7"),
+            Pair("Superpoderes", "5"),
+            Pair("Suspenso", "21"),
+            Pair("Terror", "20"),
+            Pair("Vampiros", "49"),
+            Pair("Venganza", "74"),
+            Pair("Yaoi", "53"),
+            Pair("Yuri", "52"),
+
+        )
+    }
+}
diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index a4d6ca43..b9e50a99 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeLatinoHD'
     extClass = '.AnimeLatinoHD'
-    extVersionCode = 35
+    extVersionCode = 38
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
index 8fab7b25..f6dcf06c 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
@@ -85,21 +85,21 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                 if (url.contains("status=1")) {
                     val latestData = data["data"]!!.jsonArray
                     latestData.forEach { item ->
-                        val animeItem = item!!.jsonObject
+                        val animeItem = item.jsonObject
                         val anime = SAnime.create()
-                        anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive!!.content}"))
-                        anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive!!.content}"
-                        anime.title = animeItem["name"]!!.jsonPrimitive!!.content
+                        anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive.content}"))
+                        anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive.content}"
+                        anime.title = animeItem["name"]!!.jsonPrimitive.content
                         animeList.add(anime)
                     }
                 } else {
                     val popularToday = data["popular_today"]!!.jsonArray
                     popularToday.forEach { item ->
-                        val animeItem = item!!.jsonObject
+                        val animeItem = item.jsonObject
                         val anime = SAnime.create()
-                        anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive!!.content}"))
-                        anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive!!.content}"
-                        anime.title = animeItem["name"]!!.jsonPrimitive!!.content
+                        anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive.content}"))
+                        anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive.content}"
+                        anime.title = animeItem["name"]!!.jsonPrimitive.content
                         animeList.add(anime)
                     }
                 }
@@ -122,12 +122,12 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                 val pageProps = props["pageProps"]!!.jsonObject
                 val data = pageProps["data"]!!.jsonObject
 
-                newAnime.title = data["name"]!!.jsonPrimitive!!.content
-                newAnime.genre = data["genres"]!!.jsonPrimitive!!.content.split(",").joinToString()
-                newAnime.description = data["overview"]!!.jsonPrimitive!!.content
-                newAnime.status = parseStatus(data["status"]!!.jsonPrimitive!!.content)
-                newAnime.thumbnail_url = "https://image.tmdb.org/t/p/w600_and_h900_bestv2${data["poster"]!!.jsonPrimitive!!.content}"
-                newAnime.setUrlWithoutDomain(externalOrInternalImg("anime/${data["slug"]!!.jsonPrimitive!!.content}"))
+                newAnime.title = data["name"]!!.jsonPrimitive.content
+                newAnime.genre = data["genres"]!!.jsonPrimitive.content.split(",").joinToString()
+                newAnime.description = data["overview"]!!.jsonPrimitive.content
+                newAnime.status = parseStatus(data["status"]!!.jsonPrimitive.content)
+                newAnime.thumbnail_url = "https://image.tmdb.org/t/p/w600_and_h900_bestv2${data["poster"]!!.jsonPrimitive.content}"
+                newAnime.setUrlWithoutDomain(externalOrInternalImg("anime/${data["slug"]!!.jsonPrimitive.content}"))
             }
         }
         return newAnime
@@ -144,11 +144,11 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                 val data = pageProps["data"]!!.jsonObject
                 val arrEpisode = data["episodes"]!!.jsonArray
                 arrEpisode.forEach { item ->
-                    val animeItem = item!!.jsonObject
+                    val animeItem = item.jsonObject
                     val episode = SEpisode.create()
-                    episode.setUrlWithoutDomain(externalOrInternalImg("ver/${data["slug"]!!.jsonPrimitive!!.content}/${animeItem["number"]!!.jsonPrimitive!!.content!!.toFloat()}"))
-                    episode.episode_number = animeItem["number"]!!.jsonPrimitive!!.content!!.toFloat()
-                    episode.name = "Episodio ${animeItem["number"]!!.jsonPrimitive!!.content!!.toFloat()}"
+                    episode.setUrlWithoutDomain(externalOrInternalImg("ver/${data["slug"]!!.jsonPrimitive.content}/${animeItem["number"]!!.jsonPrimitive.content.toFloat()}"))
+                    episode.episode_number = animeItem["number"]!!.jsonPrimitive.content.toFloat()
+                    episode.name = "Episodio ${animeItem["number"]!!.jsonPrimitive.content.toFloat()}"
                     episodeList.add(episode)
                 }
             }
@@ -158,7 +158,7 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private fun parseJsonArray(json: JsonElement?): List<JsonElement> {
         val list = mutableListOf<JsonElement>()
-        json!!.jsonObject!!.entries!!.forEach { list.add(it.value) }
+        json!!.jsonObject.entries.forEach { list.add(it.value) }
         return list
     }
 
@@ -178,11 +178,11 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                 val pageProps = props["pageProps"]!!.jsonObject
                 val data = pageProps["data"]!!.jsonObject
                 val playersElement = data["players"]
-                val players = if (playersElement !is JsonArray) JsonArray(parseJsonArray(playersElement)) else playersElement!!.jsonArray
+                val players = if (playersElement !is JsonArray) JsonArray(parseJsonArray(playersElement)) else playersElement.jsonArray
                 players.forEach { player ->
-                    val servers = player!!.jsonArray
+                    val servers = player.jsonArray
                     servers.forEach { server ->
-                        val item = server!!.jsonObject
+                        val item = server.jsonObject
                         val request = client.newCall(
                             GET(
                                 url = "https://api.animelatinohd.com/stream/${item["id"]!!.jsonPrimitive.content}",
@@ -193,9 +193,9 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                                     .build(),
                             ),
                         ).execute()
-                        val locationsDdh = request!!.networkResponse.toString()
+                        val locationsDdh = request.networkResponse.toString()
                         fetchUrls(locationsDdh).map { url ->
-                            val language = if (item["languaje"]!!.jsonPrimitive!!.content == "1") "[LAT]" else "[SUB]"
+                            val language = if (item["languaje"]!!.jsonPrimitive.content == "1") "[LAT]" else "[SUB]"
                             val embedUrl = url.lowercase()
                             if (embedUrl.contains("filemoon")) {
                                 val vidHeaders = headers.newBuilder()
@@ -211,7 +211,7 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                                 StreamTapeExtractor(client).videoFromUrl(url, "$language Streamtape")?.let { videoList.add(it) }
                             }
                             if (embedUrl.contains("dood")) {
-                                DoodExtractor(client).videoFromUrl(url, "$language DoodStream")?.let { videoList.add(it) }
+                                DoodExtractor(client).videoFromUrl(url, language)?.let { videoList.add(it) }
                             }
                             if (embedUrl.contains("okru") || embedUrl.contains("ok.ru")) {
                                 OkruExtractor(client).videosFromUrl(url, language).also(videoList::addAll)
@@ -281,11 +281,11 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
                 val data = pageProps["data"]!!.jsonObject
                 val arrData = data["data"]!!.jsonArray
                 arrData.forEach { item ->
-                    val animeItem = item!!.jsonObject
+                    val animeItem = item.jsonObject
                     val anime = SAnime.create()
-                    anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive!!.content}"))
-                    anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive!!.content}"
-                    anime.title = animeItem["name"]!!.jsonPrimitive!!.content
+                    anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive.content}"))
+                    anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive.content}"
+                    anime.title = animeItem["name"]!!.jsonPrimitive.content
                     animeList.add(anime)
                 }
             }
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/JsUnpacker.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/JsUnpacker.kt
index f685f1e5..c6e46fd5 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/JsUnpacker.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/JsUnpacker.kt
@@ -31,28 +31,32 @@ class JsUnpacker(packedJS: String?) {
                 Pattern.compile("""\}\s*\('(.*)',\s*(.*?),\s*(\d+),\s*'(.*?)'\.split\('\|'\)""", Pattern.DOTALL)
             var m = p.matcher(js)
             if (m.find() && m.groupCount() == 4) {
-                val payload = m.group(1).replace("\\'", "'")
+                val payload = m.group(1)?.replace("\\'", "'")
                 val radixStr = m.group(2)
                 val countStr = m.group(3)
-                val symtab = m.group(4).split("\\|".toRegex()).toTypedArray()
-                val radix = radixStr.toIntOrNull() ?: 36
-                val count = countStr.toIntOrNull() ?: 0
-                if (symtab.size != count) {
-                    throw Exception("Unknown p.a.c.k.e.r. encoding")
+                val symtab = m.group(4)?.split("\\|".toRegex())?.toTypedArray()
+                val radix = radixStr?.toIntOrNull() ?: 36
+                val count = countStr?.toIntOrNull() ?: 0
+                if (symtab != null) {
+                    if (symtab.size != count) {
+                        throw Exception("Unknown p.a.c.k.e.r. encoding")
+                    }
                 }
                 val unbase = Unbase(radix)
                 p = Pattern.compile("\\b\\w+\\b")
-                m = p.matcher(payload)
+                m = payload?.let { p.matcher(it) }!!
                 val decoded = StringBuilder(payload)
                 var replaceOffset = 0
                 while (m.find()) {
                     val word = m.group(0)
                     val x = unbase.unbase(word)
                     var value: String? = null
-                    if (x < symtab.size && x >= 0) {
-                        value = symtab[x]
+                    if (symtab != null) {
+                        if (x < symtab.size && x >= 0) {
+                            value = symtab[x]
+                        }
                     }
-                    if (value != null && value.isNotEmpty()) {
+                    if (!value.isNullOrEmpty()) {
                         decoded.replace(m.start() + replaceOffset, m.end() + replaceOffset, value)
                         replaceOffset += value.length - word.length
                     }
diff --git a/src/es/animemovil/build.gradle b/src/es/animemovil/build.gradle
index db92c0dc..24f6b2da 100644
--- a/src/es/animemovil/build.gradle
+++ b/src/es/animemovil/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeMovil'
     extClass = '.AnimeMovil'
-    extVersionCode = 17
+    extVersionCode = 27
 }
 
 apply from: "$rootDir/common.gradle"
@@ -20,4 +20,5 @@ dependencies {
     implementation(project(':lib:streamtape-extractor'))
     implementation(project(':lib:playlist-utils'))
     implementation(project(':lib:streamlare-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
index 1427fe75..daddba4b 100644
--- a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
+++ b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animeextension.es.animemovil
 
 import android.app.Application
 import android.content.SharedPreferences
+import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -20,6 +21,7 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
@@ -233,50 +235,57 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
         try {
-            if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            return when {
+                embedUrl.contains("voe") -> {
+                    VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("filemoon") || embedUrl.contains("moonplayer") -> {
+                    FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:").also(videoList::addAll)
+                }
+                embedUrl.contains("uqload") -> {
+                    UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("mp4upload") -> {
+                    val newHeaders = headers.newBuilder().add("referer", "https://re.animepelix.net/").build()
+                    Mp4uploadExtractor(client).videosFromUrl(url, newHeaders).also(videoList::addAll)
+                }
+                embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("wish") -> {
+                    val docHeaders = headers.newBuilder()
+                        .add("Referer", "$baseUrl/")
+                        .build()
+                    StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
+                }
+                embedUrl.contains("doodstream") || embedUrl.contains("dood.") -> {
+                    DoodExtractor(client).videosFromUrl(url, "DoodStream").also(videoList::addAll)
+                }
+                embedUrl.contains("streamlare") -> {
+                    StreamlareExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("yourupload") -> {
+                    YourUploadExtractor(client).videoFromUrl(url, headers = headers).also(videoList::addAll)
+                }
+                embedUrl.contains("burstcloud") || embedUrl.contains("burst") -> {
+                    BurstCloudExtractor(client).videoFromUrl(url, headers = headers).also(videoList::addAll)
+                }
+                embedUrl.contains("fastream") -> {
+                    FastreamExtractor(client, headers).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("upstream") -> {
+                    UpstreamExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("streamtape") -> {
+                    StreamTapeExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                }
+                embedUrl.contains("filelions") || embedUrl.contains("lion") -> {
+                    StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
+                }
+                else -> {
+                    UniversalExtractor(client).videosFromUrl(url, headers).also(videoList::addAll)
+                }
             }
-            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
-                FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:").also(videoList::addAll)
-            }
-            if (embedUrl.contains("uqload")) {
-                UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
-            }
-            if (embedUrl.contains("mp4upload")) {
-                val newHeaders = headers.newBuilder().add("referer", "https://re.animepelix.net/").build()
-                Mp4uploadExtractor(client).videosFromUrl(url, newHeaders).also(videoList::addAll)
-            }
-            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("wish")) {
-                val docHeaders = headers.newBuilder()
-                    .add("Referer", "$baseUrl/")
-                    .build()
-                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
-            }
-            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-                DoodExtractor(client).videoFromUrl(url, "DoodStream", false)?.let { videoList.add(it) }
-            }
-            if (embedUrl.contains("streamlare")) {
-                StreamlareExtractor(client).videosFromUrl(url).also(videoList::addAll)
-            }
-            if (embedUrl.contains("yourupload")) {
-                YourUploadExtractor(client).videoFromUrl(url, headers = headers).also(videoList::addAll)
-            }
-            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
-                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).also(videoList::addAll)
-            }
-            if (embedUrl.contains("fastream")) {
-                FastreamExtractor(client, headers).videosFromUrl(url).also(videoList::addAll)
-            }
-            if (embedUrl.contains("upstream")) {
-                UpstreamExtractor(client).videosFromUrl(url).also(videoList::addAll)
-            }
-            if (embedUrl.contains("streamtape")) {
-                StreamTapeExtractor(client).videoFromUrl(url)?.also(videoList::add)
-            }
-            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
-                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
-            }
-        } catch (_: Exception) {}
+        } catch (_: Exception) {
+            Log.e("AnimeMovil", "Error: Server not supported")
+        }
         return videoList
     }
 
diff --git a/src/es/animenix/build.gradle b/src/es/animenix/build.gradle
new file mode 100644
index 00000000..15b1ad89
--- /dev/null
+++ b/src/es/animenix/build.gradle
@@ -0,0 +1,15 @@
+ext {
+    extName = 'Animenix'
+    extClass = '.Animenix'
+    themePkg = 'dooplay'
+    baseUrl = 'https://animenix.com'
+    overrideVersionCode = 8
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(":lib:filemoon-extractor"))
+    implementation(project(":lib:streamwish-extractor"))
+    implementation(project(":lib:universal-extractor"))
+}
\ No newline at end of file
diff --git a/src/es/animenix/res/mipmap-hdpi/ic_launcher.png b/src/es/animenix/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..caf3dc56
Binary files /dev/null and b/src/es/animenix/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/animenix/res/mipmap-mdpi/ic_launcher.png b/src/es/animenix/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..b17cffd7
Binary files /dev/null and b/src/es/animenix/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/animenix/res/mipmap-xhdpi/ic_launcher.png b/src/es/animenix/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..c991edc6
Binary files /dev/null and b/src/es/animenix/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/animenix/res/mipmap-xxhdpi/ic_launcher.png b/src/es/animenix/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..470bd482
Binary files /dev/null and b/src/es/animenix/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/animenix/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/animenix/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..6d55ed3d
Binary files /dev/null and b/src/es/animenix/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/animenix/src/eu/kanade/tachiyomi/animeextension/es/animenix/Animenix.kt b/src/es/animenix/src/eu/kanade/tachiyomi/animeextension/es/animenix/Animenix.kt
new file mode 100644
index 00000000..02f9bf3d
--- /dev/null
+++ b/src/es/animenix/src/eu/kanade/tachiyomi/animeextension/es/animenix/Animenix.kt
@@ -0,0 +1,215 @@
+package eu.kanade.tachiyomi.animeextension.es.animenix
+
+import androidx.preference.CheckBoxPreference
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+
+class Animenix : DooPlay(
+    "es",
+    "Animenix",
+    "https://animenix.com",
+) {
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/ratings/$page")
+
+    override fun popularAnimeSelector() = latestUpdatesSelector()
+
+    override fun popularAnimeNextPageSelector() = latestUpdatesNextPageSelector()
+
+    // =============================== Search ===============================
+
+    // ============================== Episodes ==============================
+    override val episodeMovieText = "Película"
+
+    override fun videoListParse(response: Response): List<Video> {
+        val players = response.asJsoup().select("li.dooplay_player_option")
+        return players.flatMap { player ->
+            runCatching {
+                val link = getPlayerUrl(player)
+                getPlayerVideos(link)
+            }.getOrElse { emptyList() }
+        }
+    }
+
+    private fun getPlayerUrl(player: Element): String {
+        val body = FormBody.Builder()
+            .add("action", "doo_player_ajax")
+            .add("post", player.attr("data-post"))
+            .add("nume", player.attr("data-nume"))
+            .add("type", player.attr("data-type"))
+            .build()
+        return client.newCall(POST("$baseUrl/wp-admin/admin-ajax.php", headers, body))
+            .execute()
+            .let { response ->
+                response.body.string()
+                    .substringAfter("\"embed_url\":\"")
+                    .substringBefore("\",")
+                    .replace("\\", "")
+            }
+    }
+
+    private val filemoonExtractor by lazy { FilemoonExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(headers = headers, client = client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+
+    private fun getPlayerVideos(link: String): List<Video> {
+        return when {
+            link.contains("filemoon") -> filemoonExtractor.videosFromUrl(link)
+            link.contains("swdyu") -> streamWishExtractor.videosFromUrl(link)
+            link.contains("wishembed") || link.contains("cdnwish") || link.contains("flaswish") || link.contains("sfastwish") || link.contains("streamwish") || link.contains("asnwish") -> streamWishExtractor.videosFromUrl(link)
+            else -> universalExtractor.videosFromUrl(link, headers)
+        }
+    }
+
+    // =========================== Anime Details ============================
+    override fun Document.getDescription(): String {
+        return select("$additionalInfoSelector div.wp-content p")
+            .eachText()
+            .joinToString("\n")
+    }
+
+    override val additionalInfoItems = listOf("Título", "Temporadas", "Episodios", "Duración media")
+
+    // =============================== Latest ===============================
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/ver/page/$page", headers)
+
+    override fun latestUpdatesNextPageSelector() = "div.pagination > *:last-child:not(span):not(.current)"
+
+    // =============================== Search ===============================
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = AnimenixFilters.getSearchParameters(filters)
+        val path = when {
+            params.genre.isNotBlank() -> {
+                if (params.genre in listOf("tendencias", "ratings")) {
+                    "/" + params.genre
+                } else {
+                    "/genero/${params.genre}"
+                }
+            }
+            params.language.isNotBlank() -> "/genero/${params.language}"
+            params.year.isNotBlank() -> "/release/${params.year}"
+            params.movie.isNotBlank() -> {
+                if (params.movie == "pelicula") {
+                    "/pelicula"
+                } else {
+                    "/genero/${params.movie}"
+                }
+            }
+            else -> buildString {
+                append(
+                    when {
+                        query.isNotBlank() -> "/?s=$query"
+                        params.letter.isNotBlank() -> "/letra/${params.letter}/?"
+                        else -> "/tendencias/?"
+                    },
+                )
+
+                append(
+                    if (contains("tendencias")) {
+                        "&get=${when (params.type){
+                            "anime" -> "serie"
+                            "pelicula" -> "pelicula"
+                            else -> "todos"
+                        }}"
+                    } else {
+                        "&tipo=${params.type}"
+                    },
+                )
+
+                if (params.isInverted) append("&orden=asc")
+            }
+        }
+
+        return if (path.startsWith("/?s=")) {
+            GET("$baseUrl/page/$page$path")
+        } else if (path.startsWith("/letra") || path.startsWith("/tendencias")) {
+            val before = path.substringBeforeLast("/")
+            val after = path.substringAfterLast("/")
+            GET("$baseUrl$before/page/$page/$after")
+        } else {
+            GET("$baseUrl$path/page/$page")
+        }
+    }
+
+    // ============================== Filters ===============================
+    override val fetchGenres = false
+
+    override fun getFilterList() = AnimenixFilters.FILTER_LIST
+
+    // ============================== Settings ==============================
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        super.setupPreferenceScreen(screen) // Quality preference
+
+        val langPref = ListPreference(screen.context).apply {
+            key = PREF_LANG_KEY
+            title = PREF_LANG_TITLE
+            entries = PREF_LANG_ENTRIES
+            entryValues = PREF_LANG_VALUES
+            setDefaultValue(PREF_LANG_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()
+            }
+        }
+
+        val vrfIterceptPref = CheckBoxPreference(screen.context).apply {
+            key = PREF_VRF_INTERCEPT_KEY
+            title = PREF_VRF_INTERCEPT_TITLE
+            summary = PREF_VRF_INTERCEPT_SUMMARY
+            setDefaultValue(PREF_VRF_INTERCEPT_DEFAULT)
+        }
+
+        screen.addPreference(vrfIterceptPref)
+        screen.addPreference(langPref)
+    }
+
+    // ============================= Utilities ==============================
+    override fun String.toDate() = 0L
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(prefQualityKey, prefQualityDefault)!!
+        val lang = preferences.getString(PREF_LANG_KEY, PREF_LANG_DEFAULT)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(quality) },
+            ),
+        ).reversed()
+    }
+
+    override val prefQualityValues = arrayOf("480p", "720p", "1080p")
+    override val prefQualityEntries = prefQualityValues
+
+    companion object {
+        private const val PREF_LANG_KEY = "preferred_lang"
+        private const val PREF_LANG_TITLE = "Preferred language"
+        private const val PREF_LANG_DEFAULT = "SUB"
+        private val PREF_LANG_ENTRIES = arrayOf("SUB", "All", "ES", "LAT")
+        private val PREF_LANG_VALUES = arrayOf("SUB", "", "ES", "LAT")
+
+        private const val PREF_VRF_INTERCEPT_KEY = "vrf_intercept"
+        private const val PREF_VRF_INTERCEPT_TITLE = "Intercept VRF links (Requiere Reiniciar)"
+        private const val PREF_VRF_INTERCEPT_SUMMARY = "Intercept VRF links and open them in the browser"
+        private const val PREF_VRF_INTERCEPT_DEFAULT = false
+    }
+}
diff --git a/src/es/animenix/src/eu/kanade/tachiyomi/animeextension/es/animenix/AnimenixFilters.kt b/src/es/animenix/src/eu/kanade/tachiyomi/animeextension/es/animenix/AnimenixFilters.kt
new file mode 100644
index 00000000..3b3e0923
--- /dev/null
+++ b/src/es/animenix/src/eu/kanade/tachiyomi/animeextension/es/animenix/AnimenixFilters.kt
@@ -0,0 +1,152 @@
+package eu.kanade.tachiyomi.animeextension.es.animenix
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object AnimenixFilters {
+
+    open class UriPartFilter(
+        displayName: String,
+        val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+
+        fun toUriPart() = vals[state].second
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return first { it is R } as R
+    }
+
+    private inline fun <reified R> AnimeFilterList.asUriPart(): String {
+        return getFirst<R>().let {
+            (it as UriPartFilter).toUriPart()
+        }
+    }
+
+    class InvertedResultsFilter : AnimeFilter.CheckBox("Invertir resultados", false)
+    class TypeFilter : UriPartFilter("Tipo", AnimesOnlineNinjaData.TYPES)
+    class LetterFilter : UriPartFilter("Filtrar por letra", AnimesOnlineNinjaData.LETTERS)
+
+    class GenreFilter : UriPartFilter("Generos", AnimesOnlineNinjaData.GENRES)
+    class YearFilter : UriPartFilter("Año", AnimesOnlineNinjaData.YEARS)
+
+    class OtherOptionsGroup : AnimeFilter.Group<UriPartFilter>(
+        "Otros filtros",
+        listOf(
+            GenreFilter(),
+            YearFilter(),
+        ),
+    )
+
+    private inline fun <reified R> AnimeFilter.Group<UriPartFilter>.getItemUri(): String {
+        return state.first { it is R }.toUriPart()
+    }
+
+    val FILTER_LIST get() = AnimeFilterList(
+        InvertedResultsFilter(),
+        TypeFilter(),
+        LetterFilter(),
+        AnimeFilter.Separator(),
+        AnimeFilter.Header("Estos filtros no afectan a la busqueda por texto"),
+        OtherOptionsGroup(),
+    )
+
+    data class FilterSearchParams(
+        val isInverted: Boolean = false,
+        val type: String = "",
+        val letter: String = "",
+        val genre: String = "",
+        val language: String = "",
+        val year: String = "",
+        val movie: String = "",
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        val others = filters.getFirst<OtherOptionsGroup>()
+
+        return FilterSearchParams(
+            filters.getFirst<InvertedResultsFilter>().state,
+            filters.asUriPart<TypeFilter>(),
+            filters.asUriPart<LetterFilter>(),
+            others.getItemUri<GenreFilter>(),
+            others.getItemUri<YearFilter>(),
+        )
+    }
+
+    private object AnimesOnlineNinjaData {
+        val EVERY = Pair("Seleccionar", "")
+
+        val TYPES = arrayOf(
+            Pair("Seleccionar", ""),
+            Pair("Anime", "anime"),
+            Pair("Peliculas", "pelicula"),
+        )
+
+        val LETTERS = arrayOf(EVERY) + ('a'..'z').map {
+            Pair(it.toString(), it.toString())
+        }.toTypedArray()
+
+        val GENRES = arrayOf(
+            EVERY,
+            Pair("Acción", "accion"),
+            Pair("Action", "action"),
+            Pair("Action-Adventure", "action-adventure"),
+            Pair("Aventura", "aventura"),
+            Pair("Adventure", "adventure"),
+            Pair("Animación", "animacion"),
+            Pair("Animation", "animation"),
+            Pair("Aventura (Torrent)", "aventura-torrent"),
+            Pair("Bélica", "belica"),
+            Pair("Ciencia Ficción", "ciencia-ficcion"),
+            Pair("Comedia", "comedia"),
+            Pair("Comedy", "comedy"),
+            Pair("Crimen", "crimen"),
+            Pair("Demonios", "demonios"),
+            Pair("Deportes", "deportes"),
+            Pair("Documental", "documental"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("En Emisión", "en-emision"),
+            Pair("Escolares", "escolares"),
+            Pair("Familia", "familia"),
+            Pair("Fantasía", "fantasia"),
+            Pair("Fantasy", "fantasy"),
+            Pair("Harem", "harem"),
+            Pair("Historia", "historia"),
+            Pair("Histórico", "historico"),
+            Pair("History", "history"),
+            Pair("Horror", "horror"),
+            Pair("Kids", "kids"),
+            Pair("Magia", "magia"),
+            Pair("Misterio", "misterio"),
+            Pair("Música", "musica"),
+            Pair("Parodia", "parodia"),
+            Pair("Película de TV", "pelicula-de-tv"),
+            Pair("Reality", "reality"),
+            Pair("Recuerdos de la Vida", "recuerdos-de-la-vida"),
+            Pair("Romance", "romance"),
+            Pair("Sci-Fi Fantasy", "sci-fi-fantasy"),
+            Pair("Science Fiction", "science-fiction"),
+            Pair("Seinen", "seinen"),
+            Pair("Shojo", "shojo"),
+            Pair("Shounen", "shounen"),
+            Pair("Soap", "soap"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Suspense", "suspense"),
+            Pair("Terror", "terror"),
+            Pair("Thriller", "thriller"),
+            Pair("War & Politics", "war-politics"),
+            Pair("Western", "western"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri"),
+        )
+        val YEARS = arrayOf(EVERY) + (2024 downTo 1979).map {
+            Pair(it.toString(), it.toString())
+        }.toTypedArray()
+    }
+}
diff --git a/src/es/animeytes/build.gradle b/src/es/animeytes/build.gradle
index 8b0be06a..765bf985 100644
--- a/src/es/animeytes/build.gradle
+++ b/src/es/animeytes/build.gradle
@@ -2,8 +2,8 @@ ext {
     extName = 'AnimeYT.es'
     extClass = '.AnimeYTES'
     themePkg = 'animestream'
-    baseUrl = 'https://animeyt.es'
-    overrideVersionCode = 3
+    baseUrl = 'https://animeyt.pro'
+    overrideVersionCode = 8
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,8 @@ dependencies {
     implementation(project(":lib:okru-extractor"))
     implementation(project(":lib:streamtape-extractor"))
     implementation(project(":lib:sendvid-extractor"))
+    implementation(project(":lib:yourupload-extractor"))
+    implementation(project(":lib:burstcloud-extractor"))
+    implementation(project(":lib:filemoon-extractor"))
+    implementation(project(":lib:universal-extractor"))
 }
\ No newline at end of file
diff --git a/src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes/AnimeYTES.kt b/src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes/AnimeYTES.kt
index af918c13..ea5e8abb 100644
--- a/src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes/AnimeYTES.kt
+++ b/src/es/animeytes/src/eu/kanade/tachiyomi/animeextension/es/animeytes/AnimeYTES.kt
@@ -1,29 +1,111 @@
 package eu.kanade.tachiyomi.animeextension.es.animeytes
 
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 class AnimeYTES : AnimeStream(
     "es",
     "AnimeYT.es",
     "https://animeyt.es",
 ) {
+    override 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 = "Amazon"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload",
+            "SendVid",
+            "BurstCloud",
+            "StreamTape",
+            "Filemoon",
+            "Okru",
+        )
+    }
+
     override val animeListUrl = "$baseUrl/tv"
 
     // ============================ Video Links =============================
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
     private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
+    private val youruploadExtractor by lazy { YourUploadExtractor(client) }
+    private val burstcloudExtractor by lazy { BurstCloudExtractor(client) }
+    private val filemoonExtractor by lazy { FilemoonExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun getVideoList(url: String, name: String): List<Video> {
         return when (name) {
             "OK" -> okruExtractor.videosFromUrl(url)
             "Stream" -> streamtapeExtractor.videosFromUrl(url)
             "Send" -> sendvidExtractor.videosFromUrl(url)
-            else -> emptyList()
+            "Your" -> youruploadExtractor.videoFromUrl(url, headers)
+            "Alpha" -> burstcloudExtractor.videoFromUrl(url, headers)
+            "Moon" -> filemoonExtractor.videosFromUrl(url)
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        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)
+
+        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)
+    }
 }
diff --git a/src/es/azanimex/AndroidManifest.xml b/src/es/azanimex/AndroidManifest.xml
new file mode 100644
index 00000000..f55148bd
--- /dev/null
+++ b/src/es/azanimex/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".es.azanimex.AzanimexUrlActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="www.az-animex.com"
+                    android:pathPattern="/anime/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/src/es/azanimex/build.gradle b/src/es/azanimex/build.gradle
new file mode 100644
index 00000000..f8972e24
--- /dev/null
+++ b/src/es/azanimex/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'az-animex'
+    extClass = '.Azanimex'
+    extVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/es/azanimex/res/mipmap-hdpi/ic_launcher.png b/src/es/azanimex/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..2f83610d
Binary files /dev/null and b/src/es/azanimex/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/azanimex/res/mipmap-mdpi/ic_launcher.png b/src/es/azanimex/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..c01af01b
Binary files /dev/null and b/src/es/azanimex/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/azanimex/res/mipmap-xhdpi/ic_launcher.png b/src/es/azanimex/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..da77b927
Binary files /dev/null and b/src/es/azanimex/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/azanimex/res/mipmap-xxhdpi/ic_launcher.png b/src/es/azanimex/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..cbef2527
Binary files /dev/null and b/src/es/azanimex/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/azanimex/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/azanimex/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..17562feb
Binary files /dev/null and b/src/es/azanimex/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/Azanimex.kt b/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/Azanimex.kt
new file mode 100644
index 00000000..3a9fa53f
--- /dev/null
+++ b/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/Azanimex.kt
@@ -0,0 +1,242 @@
+package eu.kanade.tachiyomi.animeextension.es.azanimex
+
+import android.util.Log
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.net.URLEncoder
+
+class Azanimex : ParsedAnimeHttpSource() {
+
+    override val name = "az-animex"
+
+    override val baseUrl = "https://www.az-animex.com"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int): Request {
+        val url = if (page > 1) "$baseUrl/?query-22-page=$page" else baseUrl
+        return GET(url)
+    }
+    override fun popularAnimeSelector(): String = "li.wp-block-post"
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        return SAnime.create().apply {
+            setUrlWithoutDomain(element.selectFirst("h2.wp-block-post-title a")?.attr("href") ?: "")
+            title =
+                element.selectFirst("h2.wp-block-post-title a")?.text()?.substringBefore("[") ?: ""
+            thumbnail_url =
+                element.selectFirst("figure.wp-block-post-featured-image img")?.attr("data-src")
+
+            val genres = mutableListOf<String>()
+            element.select("div[class*=taxonomy-genero] a").forEach { genres.add(it.text()) }
+            element.select("div[class*=taxonomy-tipo] a")
+                .forEach { genres.add("Tipo: ${it.text()}") }
+            genre = genres.joinToString(", ")
+        }
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "a.page-numbers:not(.prev):not(.next)"
+
+    // ============================== Episodes ==============================
+    override fun episodeListSelector() = throw Exception("Not used")
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        throw Exception("Not used")
+    }
+
+    private fun getPathFromUrl(url: String): String {
+        val cleanUrl = url.replace("https://", "").replace("http://", "")
+        return cleanUrl.substringAfter("/").replace("//", "/").replaceFirst("es/", "")
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+
+        val mainUrl = document.select("a.su-button[href*='.az-animex.com']").firstOrNull()
+            ?.attr("href") ?: throw Exception("No se encontró la URL de los episodios")
+
+        val updatedUrl = updateDomainInUrl(mainUrl)
+
+        val path = getPathFromUrl(updatedUrl)
+
+        val url1 = updatedUrl.substringAfter("https://").substringBefore("/")
+
+        val apiUrl = "https://$url1/api?path=$path"
+
+        val apiResponse = client.newCall(
+            GET(apiUrl, headers = headers),
+        ).execute()
+
+        return try {
+            val json = Json { ignoreUnknownKeys = true }
+            val responseBody = apiResponse.body.string()
+            val result = json.decodeFromString<OneDriveResponse>(responseBody)
+
+            val episodes = mutableListOf<SEpisode>()
+
+            result.file?.let { file ->
+                if (file.name.endsWith(".mp4")) {
+                    val episode = SEpisode.create().apply {
+                        val animeurl = "https://$url1/api/raw/?path=$path"
+                        name = file.name.substringAfter("] ").substringBeforeLast(" [")
+                        episode_number = parseEpisodeNumber(file.name)
+                        Log.d("Azanimex", "URL del anime: $animeurl")
+
+                        url = animeurl
+                    }
+                    episodes.add(episode)
+                }
+            }
+
+            result.folder?.value?.forEach { file ->
+                if (file.name.endsWith(".mp4")) {
+                    val episode = SEpisode.create().apply {
+                        val fileUrl = URLEncoder.encode(file.name, "UTF-8")
+                        val animeurl = "https://$url1/api/raw/?path=$path/$fileUrl"
+
+                        // Ajuste para extraer correctamente el nombre del episodio
+                        name = file.name.substringAfter("] ").substringBeforeLast(" [")
+                        episode_number = parseEpisodeNumber(file.name)
+                        Log.d("Azanimex", "URL del anime: $animeurl")
+
+                        url = animeurl
+                    }
+                    episodes.add(episode)
+                }
+            }
+            episodes.sortedByDescending { it.name }
+        } catch (e: Exception) {
+            throw Exception("Error al procesar los episodios: ${e.message}, Respuesta JSON: ")
+        }
+    }
+
+    private fun parseEpisodeNumber(filename: String): Float {
+        val regex = Regex("""-(\d+)\s*\[""")
+        return regex.find(filename)?.groupValues?.get(1)?.toFloatOrNull() ?: 0f
+    }
+
+    private fun updateDomainInUrl(url: String): String {
+        return when {
+            url.contains("series-am") -> url.replace("series-am", "series-am2")
+            url.contains("series-nz") -> url.replace("series-nz", "series-nz2")
+            else -> url
+        }
+    }
+
+    // =========================== Anime Details ===========================
+    override fun animeDetailsParse(document: Document): SAnime {
+        return SAnime.create().apply {
+            title = document.select("span.post-info:contains(Título) + br").first()?.previousSibling()?.toString()?.trim() ?: ""
+
+            val infoMap = document.select("span.post-info").associate { span ->
+                val label = span.text().trim()
+                val value = span.nextSibling()?.toString()?.trim() ?: ""
+                label to value
+            }
+
+            description = document.select("div.su-spoiler-content").first()?.text()?.trim() ?: ""
+
+            genre = infoMap["Géneros"]?.substringBefore(".")
+            author = infoMap["Estudio"]
+            status = when (infoMap["Episodios"]?.substringAfter("de ")?.trim()) {
+                infoMap["Episodios"]?.substringBefore(" de")?.trim() -> SAnime.COMPLETED
+                else -> SAnime.ONGOING
+            }
+
+            // Información adicional para la descripción
+            val additionalInfo = buildString {
+                appendLine("\n\nInformación:")
+                if (!infoMap["Año"].isNullOrBlank()) appendLine("• Año: ${infoMap["Año"]}")
+                if (!infoMap["Episodios"].isNullOrBlank()) appendLine("• Episodios: ${infoMap["Episodios"]}")
+                if (!infoMap["Duración"].isNullOrBlank()) appendLine("• Duración: ${infoMap["Duración"]}")
+                if (!infoMap["Fansub"].isNullOrBlank()) appendLine("• Fansub: ${infoMap["Fansub"]}")
+                if (!infoMap["Versión"].isNullOrBlank()) appendLine("• Versión: ${infoMap["Versión"]}")
+                if (!infoMap["Resolución"].isNullOrBlank()) appendLine("• Resolución: ${infoMap["Resolución"]}")
+                if (!infoMap["Formato"].isNullOrBlank()) appendLine("• Formato: ${infoMap["Formato"]}")
+            }
+
+            description += additionalInfo
+        }
+    }
+
+    // =============================== Search ===============================
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+
+        val urlElement = element.selectFirst("h2.wp-block-post-title a")
+        anime.setUrlWithoutDomain(urlElement?.attr("href") ?: "")
+
+        anime.title = urlElement?.text() ?: "Título desconocido"
+
+        anime.thumbnail_url = element.selectFirst("figure.gs-hover-scale-img img")?.attr("src") ?: ""
+        Log.d("Azanimex", "URL de la imagen: ${anime.thumbnail_url}")
+
+        val genres = element.select("div.taxonomy-tipo a, div.taxonomy-version a").joinToString { it.text() }
+        anime.genre = genres.ifEmpty { "Desconocido" }
+
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val url = if (page > 1) {
+            "$baseUrl/page/$page/?s=$query"
+        } else {
+            "$baseUrl/?s=$query"
+        }
+
+        return GET(url, headers)
+    }
+
+    // ============================ Video URLS =============================
+
+    override fun videoListSelector() = throw Exception("Not used")
+
+    override fun videoFromElement(element: Element) = throw Exception("Not used")
+    override fun videoUrlParse(document: Document): String {
+        throw Exception("Not used")
+    }
+
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        val videoUrl = episode.url
+        val video = Video(videoUrl, "az-animex", videoUrl)
+        return listOf(video)
+    }
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesSelector(): String {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesNextPageSelector(): String? {
+        throw UnsupportedOperationException()
+    }
+
+    companion object {
+        const val PREFIX_SEARCH = "id:"
+    }
+}
diff --git a/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/AzanimexUrlActivity.kt b/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/AzanimexUrlActivity.kt
new file mode 100644
index 00000000..a949bc3d
--- /dev/null
+++ b/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/AzanimexUrlActivity.kt
@@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.animeextension.es.azanimex
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+
+/**
+ * Springboard that accepts https://www.az-animex.com/anime/<item> intents
+ * and redirects them to the main Aniyomi process.
+ */
+class AzanimexUrlActivity : Activity() {
+
+    private val tag = javaClass.simpleName
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null && pathSegments.size > 1) {
+            val item = pathSegments[1]
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", "${Azanimex.PREFIX_SEARCH}$item")
+                putExtra("filter", packageName)
+            }
+
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {
+                Log.e(tag, e.toString())
+            }
+        } else {
+            Log.e(tag, "could not parse uri from intent $intent")
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/Serializable.kt b/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/Serializable.kt
new file mode 100644
index 00000000..1d1b392e
--- /dev/null
+++ b/src/es/azanimex/src/eu/kanade/tachiyomi/animeextension/es/azanimex/Serializable.kt
@@ -0,0 +1,38 @@
+package eu.kanade.tachiyomi.animeextension.es.azanimex
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OneDriveResponse(
+    val file: FileItem? = null, // El archivo puede ser null
+    val folder: Folder? = null, // La carpeta también puede ser null
+)
+
+@Serializable
+data class Folder(
+    val value: List<FileItem>,
+)
+
+@Serializable
+data class FileInfo(
+    val mimeType: String,
+)
+
+@Serializable
+data class FileItem(
+    val id: String,
+    val name: String,
+    val file: FileInfo,
+    val video: VideoInfo?,
+)
+
+@Serializable
+data class VideoInfo(
+    val height: Int,
+    val width: Int,
+    val audioChannels: Int,
+    val audioBitsPerSample: Int,
+    val frameRate: Double,
+    val bitRate: Int,
+    val duration: Int,
+)
diff --git a/src/es/cine24h/build.gradle b/src/es/cine24h/build.gradle
index eeb31005..c0ccea68 100644
--- a/src/es/cine24h/build.gradle
+++ b/src/es/cine24h/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Cine24h'
     extClass = '.Cine24h'
-    extVersionCode = 4
+    extVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,5 @@ dependencies {
     implementation(project(':lib:filemoon-extractor'))
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/cine24h/src/eu/kanade/tachiyomi/animeextension/es/cine24h/Cine24h.kt b/src/es/cine24h/src/eu/kanade/tachiyomi/animeextension/es/cine24h/Cine24h.kt
index 61e366af..ccb2dddb 100644
--- a/src/es/cine24h/src/eu/kanade/tachiyomi/animeextension/es/cine24h/Cine24h.kt
+++ b/src/es/cine24h/src/eu/kanade/tachiyomi/animeextension/es/cine24h/Cine24h.kt
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -155,6 +156,7 @@ open class Cine24h : ConfigurableAnimeSource, AnimeHttpSource() {
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val voeExtractor by lazy { VoeExtractor(client) }
     private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -167,7 +169,7 @@ open class Cine24h : ConfigurableAnimeSource, AnimeHttpSource() {
             arrayOf("voe").any(url) -> voeExtractor.videosFromUrl(url)
             arrayOf("doodstream", "dood.", "ds2play", "doods.").any(url) -> doodExtractor.videosFromUrl(url)
             arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/cinecalidad/build.gradle b/src/es/cinecalidad/build.gradle
index 4da981c6..060f84eb 100644
--- a/src/es/cinecalidad/build.gradle
+++ b/src/es/cinecalidad/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'CineCalidad'
     extClass = '.CineCalidad'
-    extVersionCode = 5
+    extVersionCode = 16
 }
 
 apply from: "$rootDir/common.gradle"
@@ -23,4 +23,6 @@ dependencies {
     implementation(project(':lib:fastream-extractor'))
     implementation(project(':lib:upstream-extractor'))
     implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:goodstream-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher.png b/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher.png
index f49aa9e2..e167e8d6 100644
Binary files a/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher.png and b/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 00000000..a31f7028
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 00000000..3ce663b6
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher.png b/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher.png
index daa2b9a2..95338ec6 100644
Binary files a/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher.png and b/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 00000000..21d5008b
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 00000000..49b2a43e
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher.png b/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher.png
index 91cfbccc..e1de508a 100644
Binary files a/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher.png and b/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 00000000..776ce9a3
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 00000000..e18190fe
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher.png b/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher.png
index b35d4f8b..a70cf2cd 100644
Binary files a/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher.png and b/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 00000000..9de1ea8f
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 00000000..b65fd053
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher.png
index e4312f48..5d84dcce 100644
Binary files a/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher.png and b/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 00000000..81b316ba
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 00000000..13dcfcb4
Binary files /dev/null and b/src/es/cinecalidad/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/es/cinecalidad/src/eu/kanade/tachiyomi/animeextension/es/cinecalidad/CineCalidad.kt b/src/es/cinecalidad/src/eu/kanade/tachiyomi/animeextension/es/cinecalidad/CineCalidad.kt
index e2343bef..9123ed8e 100644
--- a/src/es/cinecalidad/src/eu/kanade/tachiyomi/animeextension/es/cinecalidad/CineCalidad.kt
+++ b/src/es/cinecalidad/src/eu/kanade/tachiyomi/animeextension/es/cinecalidad/CineCalidad.kt
@@ -15,12 +15,14 @@ import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.goodstramextractor.GoodStreamExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
@@ -167,7 +169,7 @@ class CineCalidad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
                 }
                 embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> {
-                    DoodExtractor(client).videosFromUrl(url.replace("https://doodstream.com/e/", "https://dood.to/e/"), "DoodStream", false)
+                    DoodExtractor(client).videosFromUrl(url.replace("https://doodstream.com/e/", "https://dood.to/e/"), "DoodStream")
                 }
                 embedUrl.contains("streamlare") -> StreamlareExtractor(client).videosFromUrl(url)
                 embedUrl.contains("yourupload") || embedUrl.contains("upload") -> YourUploadExtractor(client).videoFromUrl(url, headers = headers)
@@ -175,8 +177,9 @@ class CineCalidad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 embedUrl.contains("fastream") -> FastreamExtractor(client, headers).videosFromUrl(url, prefix = "Fastream:")
                 embedUrl.contains("upstream") -> UpstreamExtractor(client).videosFromUrl(url)
                 embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape") -> listOf(StreamTapeExtractor(client).videoFromUrl(url, quality = "StreamTape")!!)
-                embedUrl.contains("ahvsh") || embedUrl.contains("streamhide") || embedUrl.contains("guccihide") || embedUrl.contains("streamvid") || embedUrl.contains("vidhide") -> StreamHideVidExtractor(client).videosFromUrl(url)
-                else -> emptyList()
+                embedUrl.contains("ahvsh") || embedUrl.contains("streamhide") || embedUrl.contains("guccihide") || embedUrl.contains("streamvid") || embedUrl.contains("vidhide") -> StreamHideVidExtractor(client, headers).videosFromUrl(url)
+                embedUrl.contains("goodstream") -> GoodStreamExtractor(client, headers).videosFromUrl(url, name = "GoodStream: ")
+                else -> UniversalExtractor(client).videosFromUrl(url, headers)
             }
         }.getOrNull() ?: emptyList()
     }
diff --git a/src/es/cineplus123/build.gradle b/src/es/cineplus123/build.gradle
index 3f8af1e5..a9e91f46 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 = 3
+    overrideVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
@@ -11,4 +11,5 @@ apply from: "$rootDir/common.gradle"
 dependencies {
     implementation(project(":lib:streamwish-extractor"))
     implementation(project(":lib:uqload-extractor"))
+    implementation(project(":lib:universal-extractor"))
 }
\ No newline at end of file
diff --git a/src/es/cineplus123/src/eu/kanade/tachiyomi/animeextension/es/cineplus123/Cineplus123.kt b/src/es/cineplus123/src/eu/kanade/tachiyomi/animeextension/es/cineplus123/Cineplus123.kt
index eea76637..4cf62d6f 100644
--- a/src/es/cineplus123/src/eu/kanade/tachiyomi/animeextension/es/cineplus123/Cineplus123.kt
+++ b/src/es/cineplus123/src/eu/kanade/tachiyomi/animeextension/es/cineplus123/Cineplus123.kt
@@ -5,6 +5,7 @@ import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
@@ -39,6 +40,7 @@ class Cineplus123 : DooPlay(
 
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     // ============================ Video Links =============================
     override fun videoListParse(response: Response): List<Video> {
@@ -56,8 +58,8 @@ class Cineplus123 : DooPlay(
         return when {
             "uqload" in url -> uqloadExtractor.videosFromUrl(url, "$lang -")
             "strwish" in url -> streamWishExtractor.videosFromUrl(url, lang)
-            else -> null
-        } ?: emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers, prefix = lang)
+        }
     }
 
     private fun getPlayerUrl(player: Element): String? {
diff --git a/src/es/cuevana/build.gradle b/src/es/cuevana/build.gradle
index 35160fc3..6d6de8a1 100644
--- a/src/es/cuevana/build.gradle
+++ b/src/es/cuevana/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Cuevana'
     extClass = '.CuevanaFactory'
-    extVersionCode = 36
+    extVersionCode = 45
 }
 
 apply from: "$rootDir/common.gradle"
@@ -22,5 +22,6 @@ dependencies {
     implementation(project(':lib:burstcloud-extractor'))
     implementation(project(':lib:fastream-extractor'))
     implementation(project(':lib:upstream-extractor'))
+    implementation(project(':lib:universal-extractor'))
     implementation(libs.jsunpacker)
 }
\ No newline at end of file
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
index 0e477dda..aa36692e 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
@@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
@@ -160,98 +161,121 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
         try {
-            if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
-            }
-            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
-                val body = client.newCall(GET(url)).execute().asJsoup()
-                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
-                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
-                        .substringAfter("shareId = \"").substringBefore("\"")
-                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
-                        .execute().asJsoup()
-                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
-                    val amazonApi =
-                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+            return when {
+                embedUrl.contains("voe") -> {
+                    VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+                    videoList
+                }
+                (embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable") -> {
+                    val body = client.newCall(GET(url)).execute().asJsoup()
+                    if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                        val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                            .substringAfter("shareId = \"").substringBefore("\"")
+                        val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
                             .execute().asJsoup()
-                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
-                    videoList.add(Video(videoUrl, "$prefix Amazon", videoUrl))
+                        val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                        val amazonApi =
+                            client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                                .execute().asJsoup()
+                        val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                        videoList.add(Video(videoUrl, "$prefix Amazon", videoUrl))
+                    }
+                    videoList
                 }
-            }
-            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
-                OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
-            }
-            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
-                val vidHeaders = headers.newBuilder()
-                    .add("Origin", "https://${url.toHttpUrl().host}")
-                    .add("Referer", "https://${url.toHttpUrl().host}/")
-                    .build()
-                FilemoonExtractor(client).videosFromUrl(url, prefix = "$prefix Filemoon:", headers = vidHeaders).also(videoList::addAll)
-            }
-            if (embedUrl.contains("uqload")) {
-                UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
-            }
-            if (embedUrl.contains("mp4upload")) {
-                Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
-            }
-            if (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 = { "$prefix StreamWish:$it" }).also(videoList::addAll)
-            }
-            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
-                DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream", false)?.let { videoList.add(it) }
-            }
-            if (embedUrl.contains("streamlare")) {
-                StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
-            }
-            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
-                YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
-            }
-            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
-                BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
-            }
-            if (embedUrl.contains("fastream")) {
-                FastreamExtractor(client, headers).videosFromUrl(url, prefix = "$prefix Fastream:").also(videoList::addAll)
-            }
-            if (embedUrl.contains("upstream")) {
-                UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
-            }
-            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
-                StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
-            }
-            if (embedUrl.contains("tomatomatela")) {
-                runCatching {
-                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
-                    val headers = headers.newBuilder()
-                        .set("authority", mainUrl)
-                        .set("accept", "application/json, text/javascript, */*; q=0.01")
-                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
-                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
-                        .set("sec-ch-ua-mobile", "?0")
-                        .set("sec-ch-ua-platform", "Windows")
-                        .set("sec-fetch-dest", "empty")
-                        .set("sec-fetch-mode", "cors")
-                        .set("sec-fetch-site", "same-origin")
-                        .set("x-requested-with", "XMLHttpRequest")
+                embedUrl.contains("ok.ru") || embedUrl.contains("okru") -> {
+                    OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+                    videoList
+                }
+                embedUrl.contains("filemoon") || embedUrl.contains("moonplayer") -> {
+                    val vidHeaders = headers.newBuilder()
+                        .add("Origin", "https://${url.toHttpUrl().host}")
+                        .add("Referer", "https://${url.toHttpUrl().host}/")
                         .build()
-                    val token = url.substringAfter("/embed.html#")
-                    val urlRequest = "https://$mainUrl/details.php?v=$token"
-                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
-                    val bodyText = response.select("body").text()
-                    val json = json.decodeFromString<JsonObject>(bodyText)
-                    val status = json["status"]!!.jsonPrimitive!!.content
-                    val file = json["file"]!!.jsonPrimitive!!.content
-                    if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
+                    FilemoonExtractor(client).videosFromUrl(url, prefix = "$prefix Filemoon:", headers = vidHeaders).also(videoList::addAll)
+                    videoList
+                }
+                embedUrl.contains("uqload") -> {
+                    UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
+                    videoList
+                }
+                embedUrl.contains("mp4upload") -> {
+                    Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
+                    videoList
+                }
+                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 = { "$prefix StreamWish:$it" }).also(videoList::addAll)
+                    videoList
+                }
+                embedUrl.contains("doodstream") || embedUrl.contains("dood.") -> {
+                    val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                    DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream")?.let { videoList.add(it) }
+                    videoList
+                }
+                embedUrl.contains("streamlare") -> {
+                    StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+                    videoList
+                }
+                embedUrl.contains("yourupload") || embedUrl.contains("upload") -> {
+                    YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+                    videoList
+                }
+                embedUrl.contains("burstcloud") || embedUrl.contains("burst") -> {
+                    BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+                    videoList
+                }
+                embedUrl.contains("fastream") -> {
+                    FastreamExtractor(client, headers).videosFromUrl(url, prefix = "$prefix Fastream:").also(videoList::addAll)
+                    videoList
+                }
+                embedUrl.contains("upstream") -> {
+                    UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+                    videoList
+                }
+                embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape") -> {
+                    StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
+                    videoList
+                }
+                embedUrl.contains("tomatomatela") -> {
+                    runCatching {
+                        val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                        val headers = headers.newBuilder()
+                            .set("authority", mainUrl)
+                            .set("accept", "application/json, text/javascript, */*; q=0.01")
+                            .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                            .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                            .set("sec-ch-ua-mobile", "?0")
+                            .set("sec-ch-ua-platform", "Windows")
+                            .set("sec-fetch-dest", "empty")
+                            .set("sec-fetch-mode", "cors")
+                            .set("sec-fetch-site", "same-origin")
+                            .set("x-requested-with", "XMLHttpRequest")
+                            .build()
+                        val token = url.substringAfter("/embed.html#")
+                        val urlRequest = "https://$mainUrl/details.php?v=$token"
+                        val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                        val bodyText = response.select("body").text()
+                        val json = json.decodeFromString<JsonObject>(bodyText)
+                        val status = json["status"]!!.jsonPrimitive.content
+                        val file = json["file"]!!.jsonPrimitive.content
+                        if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
+                    }
+                    videoList
+                }
+                embedUrl.contains("filelions") || embedUrl.contains("lion") -> {
+                    StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
+                    videoList
+                }
+                else -> {
+                    UniversalExtractor(client).videosFromUrl(url, headers, prefix = prefix).also(videoList::addAll)
                 }
             }
-            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
-                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
-            }
-        } catch (_: Exception) { }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
         return videoList
     }
 
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
index 45fc33b5..e8749167 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
@@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -180,34 +181,47 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
     private fun loadExtractor(url: String, prefix: String = ""): List<Video> {
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
-        if (embedUrl.contains("yourupload")) {
-            val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            videoList.addAll(videos)
+        return when {
+            embedUrl.contains("yourupload") -> {
+                val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers)
+                videoList.addAll(videos)
+                videoList
+            }
+            embedUrl.contains("doodstream") || embedUrl.contains("dood.") -> {
+                DoodExtractor(client).videoFromUrl(url, "$prefix DoodStream")
+                    ?.let { videoList.add(it) }
+                videoList
+            }
+            embedUrl.contains("okru") || embedUrl.contains("ok.ru") -> {
+                OkruExtractor(client).videosFromUrl(url, prefix, true).also(videoList::addAll)
+                videoList
+            }
+            embedUrl.contains("voe") -> {
+                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+                videoList
+            }
+            embedUrl.contains("streamtape") -> {
+                StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) }
+                videoList
+            }
+            embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("wish") -> {
+                StreamWishExtractor(client, headers).videosFromUrl(url) { "$prefix StreamWish:$it" }
+                    .also(videoList::addAll)
+                videoList
+            }
+            embedUrl.contains("filemoon") || embedUrl.contains("moonplayer") -> {
+                FilemoonExtractor(client).videosFromUrl(url, "$prefix Filemoon:").also(videoList::addAll)
+                videoList
+            }
+            embedUrl.contains("filelions") || embedUrl.contains("lion") -> {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
+                videoList
+            }
+            else -> {
+                UniversalExtractor(client).videosFromUrl(url, headers, prefix = prefix).also(videoList::addAll)
+                videoList
+            }
         }
-        if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-            DoodExtractor(client).videoFromUrl(url, "$prefix DoodStream", false)
-                ?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("okru") || embedUrl.contains("ok.ru")) {
-            OkruExtractor(client).videosFromUrl(url, prefix, true).also(videoList::addAll)
-        }
-        if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
-        }
-        if (embedUrl.contains("streamtape")) {
-            StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("wish")) {
-            StreamWishExtractor(client, headers).videosFromUrl(url) { "$prefix StreamWish:$it" }
-                .also(videoList::addAll)
-        }
-        if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
-            FilemoonExtractor(client).videosFromUrl(url, "$prefix Filemoon:").also(videoList::addAll)
-        }
-        if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
-            StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
-        }
-        return videoList
     }
 
     override fun videoListSelector() = throw UnsupportedOperationException()
diff --git a/src/es/detodopeliculas/build.gradle b/src/es/detodopeliculas/build.gradle
new file mode 100644
index 00000000..39d46d20
--- /dev/null
+++ b/src/es/detodopeliculas/build.gradle
@@ -0,0 +1,18 @@
+ext {
+    extName = 'DeTodoPeliculas'
+    extClass = '.DeTodoPeliculas'
+    themePkg = 'dooplay'
+    baseUrl = 'https://detodopeliculas.nu'
+    overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(":lib:streamwish-extractor"))
+    implementation(project(":lib:uqload-extractor"))
+    implementation(project(":lib:universal-extractor"))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:voe-extractor'))
+}
\ No newline at end of file
diff --git a/src/es/detodopeliculas/res/mipmap-hdpi/ic_launcher.png b/src/es/detodopeliculas/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..d3be7cb5
Binary files /dev/null and b/src/es/detodopeliculas/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/detodopeliculas/res/mipmap-mdpi/ic_launcher.png b/src/es/detodopeliculas/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..37e830f8
Binary files /dev/null and b/src/es/detodopeliculas/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/detodopeliculas/res/mipmap-xhdpi/ic_launcher.png b/src/es/detodopeliculas/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..4dbe71d7
Binary files /dev/null and b/src/es/detodopeliculas/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/detodopeliculas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/detodopeliculas/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..5e55f78b
Binary files /dev/null and b/src/es/detodopeliculas/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/detodopeliculas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/detodopeliculas/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..caa2b46d
Binary files /dev/null and b/src/es/detodopeliculas/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/detodopeliculas/src/eu/kanade/tachiyomi/animeextension/es/detodopeliculas/DeTodoPeliculas.kt b/src/es/detodopeliculas/src/eu/kanade/tachiyomi/animeextension/es/detodopeliculas/DeTodoPeliculas.kt
new file mode 100644
index 00000000..2f1ad245
--- /dev/null
+++ b/src/es/detodopeliculas/src/eu/kanade/tachiyomi/animeextension/es/detodopeliculas/DeTodoPeliculas.kt
@@ -0,0 +1,205 @@
+package eu.kanade.tachiyomi.animeextension.es.detodopeliculas
+
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
+import okhttp3.FormBody
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Element
+
+class DeTodoPeliculas : DooPlay(
+    "es",
+    "DeTodo Peliculas",
+    "https://detodopeliculas.nu",
+) {
+// ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/novedades/page/$page")
+
+    override fun popularAnimeSelector() = latestUpdatesSelector()
+
+    override fun popularAnimeNextPageSelector() = latestUpdatesNextPageSelector()
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/peliculas-de-estreno/page/$page", headers)
+
+    override fun videoListSelector() = "li.dooplay_player_option" // ul#playeroptionsul
+
+    override val episodeMovieText = "Película"
+
+    override val episodeSeasonPrefix = "Temporada"
+    override val prefQualityTitle = "Calidad preferida"
+
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+
+// ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val players = document.select("ul#playeroptionsul li")
+        return players.parallelFlatMapBlocking { player ->
+            val flagSrc = player.selectFirst("span.flag img")?.attr("data-lazy-src") ?: ""
+            val lang = when {
+                "sub.png" in flagSrc -> "[SUB]"
+                "cas.png" in flagSrc -> "[CAST]"
+                "lat.png" in flagSrc -> "[LAT]"
+                else -> "UNKNOWN"
+            }
+            val url = getPlayerUrl(player)
+                ?: return@parallelFlatMapBlocking emptyList<Video>()
+            extractVideos(url, lang)
+        }
+    }
+
+    private fun extractVideos(url: String, lang: String): List<Video> {
+        val vidHideDomains = listOf("vidhide", "VidHidePro", "luluvdo", "vidhideplus")
+        try {
+            val videos = vidHideDomains.firstOrNull { it in url }?.let { domain ->
+                streamHideVidExtractor.videosFromUrl(url, videoNameGen = { "$lang - $domain : $it" })
+            } ?: emptyList()
+            return when {
+                videos.isNotEmpty() -> videos
+                "uqload" in url -> uqloadExtractor.videosFromUrl(url, "$lang - ")
+                "strwish" in url -> streamWishExtractor.videosFromUrl(url, "$lang - ")
+                "vidguard" in url || "listeamed" in url -> vidGuardExtractor.videosFromUrl(url, "$lang - ")
+                "voe" in url -> voeExtractor.videosFromUrl(url, "$lang - ")
+
+                else -> emptyList()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return emptyList()
+        }
+    }
+
+    private fun getPlayerUrl(player: Element): String? {
+        val body = FormBody.Builder()
+            .add("action", "doo_player_ajax")
+            .add("post", player.attr("data-post"))
+            .add("nume", player.attr("data-nume"))
+            .add("type", player.attr("data-type"))
+            .build()
+
+        return client.newCall(POST("$baseUrl/wp-admin/admin-ajax.php", headers, body))
+            .execute().body.string()
+            .substringAfter("\"embed_url\":\"")
+            .substringBefore("\",")
+            .replace("\\", "")
+            .takeIf(String::isNotBlank)
+    }
+
+// ============================== Filters ===============================
+    override val fetchGenres = false
+
+    override fun getFilterList() = DeTodoPeliculasFilters.FILTER_LIST
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = DeTodoPeliculasFilters.getSearchParameters(filters)
+        val path = when {
+            params.genre.isNotBlank() -> {
+                if (params.genre in listOf("peliculas-de-estreno", "novedades", "peliculas-recomendadas", "peliculas")) {
+                    "/${params.genre}"
+                } else {
+                    "/genero/${params.genre}"
+                }
+            }
+            else -> buildString {
+                append(
+                    when {
+                        query.isNotBlank() -> "/?s=$query"
+                        else -> "/"
+                    },
+                )
+
+                if (params.isInverted) append("&orden=asc")
+            }
+        }
+
+        return if (path.startsWith("/?s=")) {
+            GET("$baseUrl/page/$page$path")
+        } else {
+            GET("$baseUrl$path/page/$page")
+        }
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        super.setupPreferenceScreen(screen) // Quality preference
+
+        val langPref = ListPreference(screen.context).apply {
+            key = PREF_LANG_KEY
+            title = PREF_LANG_TITLE
+            entries = PREF_LANG_ENTRIES
+            entryValues = PREF_LANG_VALUES
+            setDefaultValue(PREF_LANG_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()
+            }
+        }
+        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)
+        screen.addPreference(langPref)
+    }
+
+// ============================= Utilities ==============================
+    override fun String.toDate() = 0L
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(prefQualityKey, prefQualityDefault)!!
+        val lang = preferences.getString(PREF_LANG_KEY, PREF_LANG_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+            ),
+        ).reversed()
+    }
+
+    override val prefQualityValues = arrayOf("480p", "720p", "1080p")
+    override val prefQualityEntries = prefQualityValues
+
+    companion object {
+        private const val PREF_LANG_KEY = "preferred_lang"
+        private const val PREF_LANG_TITLE = "Preferred language"
+        private const val PREF_LANG_DEFAULT = "[LAT]"
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Uqload"
+        private val PREF_LANG_ENTRIES = arrayOf("[LAT]", "[SUB]", "[CAST]")
+        private val PREF_LANG_VALUES = arrayOf("[LAT]", "[SUB]", "[CAST]")
+        private val SERVER_LIST = arrayOf("StreamWish", "Uqload", "VidGuard", "StreamHideVid", "Voe")
+    }
+}
diff --git a/src/es/detodopeliculas/src/eu/kanade/tachiyomi/animeextension/es/detodopeliculas/DeTodoPeliculasFilters.kt b/src/es/detodopeliculas/src/eu/kanade/tachiyomi/animeextension/es/detodopeliculas/DeTodoPeliculasFilters.kt
new file mode 100644
index 00000000..7dc7cd08
--- /dev/null
+++ b/src/es/detodopeliculas/src/eu/kanade/tachiyomi/animeextension/es/detodopeliculas/DeTodoPeliculasFilters.kt
@@ -0,0 +1,74 @@
+package eu.kanade.tachiyomi.animeextension.es.detodopeliculas
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object DeTodoPeliculasFilters {
+
+    open class UriPartFilter(
+        displayName: String,
+        private val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+
+        fun toUriPart() = vals[state].second
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return first { it is R } as R
+    }
+
+    private inline fun <reified R> AnimeFilterList.asUriPart(): String {
+        return getFirst<R>().let {
+            (it as UriPartFilter).toUriPart()
+        }
+    }
+
+    class GenreFilter : UriPartFilter("Generos", AnimesOnlineNinjaData.GENRES)
+    class YearFilter : UriPartFilter("Año", AnimesOnlineNinjaData.YEARS)
+
+    val FILTER_LIST get() = AnimeFilterList(
+        GenreFilter(),
+        YearFilter(),
+    )
+
+    data class FilterSearchParams(
+        val isInverted: Boolean = false,
+        val genre: String = "",
+        val year: String = "",
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        return FilterSearchParams(
+            genre = filters.asUriPart<GenreFilter>(),
+            year = filters.asUriPart<YearFilter>(),
+
+        )
+    }
+
+    private object AnimesOnlineNinjaData {
+        val EVERY = Pair("Seleccionar", "")
+
+        val GENRES = arrayOf(
+            EVERY,
+            Pair("Acción", "accion"),
+            Pair("Animación", "animacion"),
+            Pair("Aventura", "aventura"),
+            Pair("Bélica", "belica"),
+            Pair("Ciencia ficción", "ciencia-ficcion"),
+            Pair("Comedia", "comedia"),
+            Pair("Crimen", "crimen"),
+            Pair("Documental", "documental"),
+            Pair("Drama", "drama"),
+            Pair("Familia", "familia"),
+        )
+
+        val YEARS = arrayOf(EVERY) + (2024 downTo 1979).map {
+            Pair(it.toString(), it.toString())
+        }.toTypedArray()
+    }
+}
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index 0edbae34..63c217eb 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasflix'
     extClass = '.Doramasflix'
-    extVersionCode = 25
+    extVersionCode = 32
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
index 97ecaea9..b1b4041b 100644
--- a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
+++ b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
@@ -498,7 +498,7 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
             "uqload" in embedUrl -> UqloadExtractor(client).videosFromUrl(url, prefix = prefix)
             "mp4upload" in embedUrl -> Mp4uploadExtractor(client).videosFromUrl(url, prefix = "$prefix ", headers = headers)
             "doodstream" in embedUrl || "dood." in embedUrl ->
-                listOf(DoodExtractor(client).videoFromUrl(url.replace("https://doodstream.com/e/", "https://dood.to/e/"), "$prefix DoodStream", false)!!)
+                listOf(DoodExtractor(client).videoFromUrl(url.replace("https://doodstream.com/e/", "https://dood.to/e/"), "$prefix DoodStream")!!)
             "streamlare" in embedUrl -> StreamlareExtractor(client).videosFromUrl(url, prefix = prefix)
             "yourupload" in embedUrl || "upload" in embedUrl -> YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = "$prefix ")
             "wishembed" in embedUrl || "streamwish" in embedUrl || "strwish" in embedUrl || "wish" in embedUrl -> {
@@ -512,7 +512,7 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
             "fastream" in embedUrl -> FastreamExtractor(client, headers).videosFromUrl(url, prefix = "$prefix Fastream:")
             "upstream" in embedUrl -> UpstreamExtractor(client).videosFromUrl(url, prefix = "$prefix ")
             "streamtape" in embedUrl || "stp" in embedUrl || "stape" in embedUrl -> listOf(StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")!!)
-            "ahvsh" in embedUrl || "streamhide" in embedUrl -> StreamHideVidExtractor(client).videosFromUrl(url, "$prefix ")
+            "ahvsh" in embedUrl || "streamhide" in embedUrl -> StreamHideVidExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix StreamHide:$it" })
             "filelions" in embedUrl || "lion" in embedUrl -> StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" })
             "vudeo" in embedUrl || "vudea" in embedUrl -> VudeoExtractor(client).videosFromUrl(url, "$prefix ")
             else -> emptyList()
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index 5fb37821..d28a033e 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasyt'
     extClass = '.Doramasyt'
-    extVersionCode = 17
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:streamwish-extractor'))
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
index 762c2f86..fb8c48cd 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -190,6 +191,7 @@ class Doramasyt : ConfigurableAnimeSource, AnimeHttpSource() {
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -200,10 +202,10 @@ class Doramasyt : ConfigurableAnimeSource, AnimeHttpSource() {
             embedUrl.contains("filemoon") || embedUrl.contains("moonplayer") -> filemoonExtractor.videosFromUrl(url, prefix = "Filemoon:")
             embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish") || embedUrl.contains("wishfast") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
             embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape") -> streamTapeExtractor.videosFromUrl(url)
-            embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> doodExtractor.videosFromUrl(url, "DoodStream", false)
+            embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> doodExtractor.videosFromUrl(url)
             embedUrl.contains("filelions") || embedUrl.contains("lion") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "FileLions:$it" })
             embedUrl.contains("mix") -> mixdropExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt
new file mode 100644
index 00000000..ccb634e6
--- /dev/null
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt
@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class SolidFilesExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
+        val videoList = mutableListOf<Video>()
+        return try {
+            val document = client.newCall(GET(url)).execute().asJsoup()
+            document.select("script").forEach { script ->
+                if (script.data().contains("\"downloadUrl\":")) {
+                    val data = script.data().substringAfter("\"downloadUrl\":").substringBefore(",")
+                    val url = data.replace("\"", "")
+                    val videoUrl = url
+                    val quality = prefix + "SolidFiles"
+                    videoList.add(Video(videoUrl, quality, videoUrl))
+                }
+            }
+            videoList
+        } catch (e: Exception) {
+            videoList
+        }
+    }
+}
diff --git a/src/es/ennovelas/build.gradle b/src/es/ennovelas/build.gradle
index f8f3e452..bff5a07f 100644
--- a/src/es/ennovelas/build.gradle
+++ b/src/es/ennovelas/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'EnNovelas'
     extClass = '.EnNovelas'
-    extVersionCode = 12
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
@@ -14,4 +14,5 @@ dependencies {
     implementation(project(':lib:streamlare-extractor'))
     implementation(project(':lib:uqload-extractor'))
     implementation(project(':lib:vudeo-extractor'))
+    implementation(project(':lib:dailymotion-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt b/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
index 6e555ded..e27cb979 100644
--- a/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
+++ b/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
@@ -5,12 +5,14 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.dailymotionextractor.DailymotionExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
@@ -20,6 +22,7 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 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 okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
@@ -38,7 +41,7 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "EnNovelas"
 
-    override val baseUrl = "https://u.ennovelas.net"
+    override val baseUrl = "https://tv.ennovelas.net/"
 
     override val lang = "es"
 
@@ -50,7 +53,7 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun popularAnimeSelector(): String = ".block-post"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/telenovelas/page/$page")
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/category/novelas-completas/page/$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
@@ -146,7 +149,7 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .add("upgrade-insecure-requests", "1")
             .build()
 
-        client.newCall(POST(urlRequest, headers, body)).execute().asJsoup().select(".serversList li").map {
+        client.newCall(POST(urlRequest, headers, body)).execute().asJsoup().select(".serversList li").map { it ->
             val frameString = it.attr("abs:data-server")
             val link = frameString.substringAfter("src='").substringBefore("'")
                 .replace("https://api.mycdn.moe/sblink.php?id=", "https://streamsb.net/e/")
@@ -188,7 +191,12 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             if (link.contains("streamlare")) {
                 try {
-                    StreamlareExtractor(client).videosFromUrl(link)?.let { videoList.addAll(it) }
+                    StreamlareExtractor(client).videosFromUrl(link).let { videoList.addAll(it) }
+                } catch (_: Exception) {}
+            }
+            if (link.contains("dailymotion")) {
+                try {
+                    DailymotionExtractor(client, headers).videosFromUrl(link).let { videoList.addAll(it) }
                 } catch (_: Exception) {}
             }
         }
@@ -219,13 +227,6 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return this
     }
 
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        return when {
-            query.isNotBlank() -> GET("$baseUrl/search/$query/page/$page/")
-            else -> popularAnimeRequest(page)
-        }
-    }
-
     override fun searchAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
         val animeList = mutableListOf<SAnime>()
@@ -242,9 +243,48 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
         return AnimesPage(animeList, hasNextPage)
     }
-    override fun searchAnimeFromElement(element: Element): SAnime = throw UnsupportedOperationException()
-    override fun searchAnimeNextPageSelector(): String = throw UnsupportedOperationException()
-    override fun searchAnimeSelector(): String = throw UnsupportedOperationException()
+
+    // =============================== Search ===============================
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
+        return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
+            val id = query.removePrefix(PREFIX_SEARCH)
+            client.newCall(GET("$baseUrl/search/$id", headers))
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
+        } else {
+            super.getSearchAnime(page, query, filters)
+        }
+    }
+
+    private fun searchAnimeByIdParse(response: Response): AnimesPage {
+        val details = animeDetailsParse(response.asJsoup())
+            .apply {
+                setUrlWithoutDomain(response.request.url.toString())
+                initialized = true
+            }
+        return AnimesPage(listOf(details), false)
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+        val yearFilter = filterList.find { it is YearFilter } as YearFilter
+        val typeFilter = filterList.find { it is TypeFilter } as TypeFilter
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/search/$query/page/$page/")
+            genreFilter.state != 0 -> GET("$baseUrl/${genreFilter.toUriPart()}/page/$page/")
+            yearFilter.state != 0 -> GET("$baseUrl/${yearFilter.toUriPart()}/page/$page/")
+            typeFilter.state != 0 -> GET("$baseUrl/${typeFilter.toUriPart()}/page/$page/")
+
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
 
     override fun animeDetailsParse(document: Document): SAnime {
         val anime = SAnime.create()
@@ -267,6 +307,62 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La búsqueda por texto ignora el filtro"),
+        GenreFilter(),
+        YearFilter(),
+        TypeFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Categorías",
+        arrayOf(
+            Pair("Seleccionar", ""),
+            Pair("Novelas Mexicanas", "genre/novelas-mexicanas"),
+            Pair("Novelas Colombianas", "genre/novelas-colombianas"),
+            Pair("Series Y Novelas Turcas", "genre/series-y-novelas-turcas"),
+            Pair("Novelas Brasileñas", "genre/novelas-brasilenas"),
+            Pair("Novelas Americanas", "genre/novelas-americanas"),
+            Pair("Novelas Españolas", "genre/novelas-espanolas"),
+            Pair("Novelas Chilenas", "genre/telenovelas-chilenas"),
+            Pair("Novelas Peruanas", "genre/novelas-peruanas"),
+            Pair("Novelas Venezolanas", "genre/novelas-venezolanas"),
+            Pair("Novelas Reino Unido", "genre/novelas-reino-unido"),
+            Pair("Novelas Argentinas", "genre/novelas-argentinas"),
+            Pair("Novelas Filipinas", "genre/novelas-filipinas"),
+            Pair("Novelas Indias", "genre/novelas-indias"),
+        ),
+    )
+
+    private class YearFilter : UriPartFilter(
+        "Años",
+        arrayOf(
+            Pair("Seleccionar", ""),
+            Pair("2024", "years/2024"),
+            Pair("2023", "years/2023"),
+            Pair("2022", "years/2022"),
+            Pair("2021", "years/2021"),
+            Pair("2020", "years/2020"),
+            Pair("2019", "years/2019"),
+            Pair("2018", "years/2018"),
+            Pair("2017", "years/2017"),
+            Pair("2016", "years/2016"),
+            Pair("2015", "years/2015"),
+        ),
+    )
+    private class TypeFilter : UriPartFilter(
+        "Tipo",
+        arrayOf(
+            Pair("Seleccionar", ""),
+            Pair("Peliculas", "movies"),
+        ),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
     override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
 
     override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
@@ -275,6 +371,10 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
+    companion object {
+        const val PREFIX_SEARCH = "id:"
+    }
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val qualities = arrayOf(
             "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
diff --git a/src/es/estrenosdoramas/build.gradle b/src/es/estrenosdoramas/build.gradle
index 4d83e851..afbb78ed 100644
--- a/src/es/estrenosdoramas/build.gradle
+++ b/src/es/estrenosdoramas/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'EstrenosDoramas'
     extClass = '.EstrenosDoramas'
-    extVersionCode = 3
+    extVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramas.kt b/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramas.kt
index 8f94f8c2..7a85d1c0 100644
--- a/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramas.kt
+++ b/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramas.kt
@@ -135,7 +135,7 @@ class EstrenosDoramas : ConfigurableAnimeSource, AnimeHttpSource() {
     /*--------------------------------Video extractors------------------------------------*/
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
     private val voeExtractor by lazy { VoeExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
diff --git a/src/es/fanpelis/build.gradle b/src/es/fanpelis/build.gradle
index 53b2eb97..789b60b6 100644
--- a/src/es/fanpelis/build.gradle
+++ b/src/es/fanpelis/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'FanPelis'
     extClass = '.FanPelis'
-    extVersionCode = 12
+    extVersionCode = 15
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt b/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt
index c8645711..a98dfbe2 100644
--- a/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt
+++ b/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt
@@ -116,7 +116,7 @@ class FanPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             if (embedUrl.contains("doodstream") || embedUrl.contains("dood")) {
                 val video = try {
-                    DoodExtractor(client).videoFromUrl(url, "DoodStream", true)
+                    DoodExtractor(client).videoFromUrl(url, "DoodStream")
                 } catch (e: Exception) {
                     null
                 }
diff --git a/src/es/flixlatam/build.gradle b/src/es/flixlatam/build.gradle
new file mode 100644
index 00000000..9ee04ee3
--- /dev/null
+++ b/src/es/flixlatam/build.gradle
@@ -0,0 +1,33 @@
+ext {
+    extName = 'FlixLatam'
+    extClass = '.FlixLatam'
+    themePkg = 'dooplay'
+    baseUrl = 'https://flixlatam.com'
+    overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:vudeo-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:streamlare-extractor'))
+    implementation(project(':lib:yourupload-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:burstcloud-extractor'))
+    implementation(project(':lib:fastream-extractor'))
+    implementation(project(':lib:upstream-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:streamsilk-extractor'))
+    implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
+    implementation(project(':lib:cryptoaes'))
+    implementation(libs.jsunpacker)
+}
\ No newline at end of file
diff --git a/src/es/flixlatam/res/mipmap-hdpi/ic_launcher.png b/src/es/flixlatam/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..662c9021
Binary files /dev/null and b/src/es/flixlatam/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/flixlatam/res/mipmap-mdpi/ic_launcher.png b/src/es/flixlatam/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..536beea9
Binary files /dev/null and b/src/es/flixlatam/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/flixlatam/res/mipmap-xhdpi/ic_launcher.png b/src/es/flixlatam/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..398f5d33
Binary files /dev/null and b/src/es/flixlatam/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/flixlatam/res/mipmap-xxhdpi/ic_launcher.png b/src/es/flixlatam/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b072df7a
Binary files /dev/null and b/src/es/flixlatam/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/flixlatam/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/flixlatam/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..3dad5c71
Binary files /dev/null and b/src/es/flixlatam/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/flixlatam/src/eu/kanade/tachiyomi/animeextension/es/flixlatam/FlixLatam.kt b/src/es/flixlatam/src/eu/kanade/tachiyomi/animeextension/es/flixlatam/FlixLatam.kt
new file mode 100644
index 00000000..26d99f77
--- /dev/null
+++ b/src/es/flixlatam/src/eu/kanade/tachiyomi/animeextension/es/flixlatam/FlixLatam.kt
@@ -0,0 +1,298 @@
+package eu.kanade.tachiyomi.animeextension.es.flixlatam
+
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamsilkextractor.StreamSilkExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
+import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import okhttp3.FormBody
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+
+class FlixLatam : DooPlay(
+    "es",
+    "FlixLatam",
+    "https://flixlatam.com",
+) {
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/pelicula/page/$page")
+
+    override fun popularAnimeSelector() = latestUpdatesSelector()
+
+    override fun popularAnimeNextPageSelector() = latestUpdatesNextPageSelector()
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/lanzamiento/2024/page/$page")
+
+    override val episodeMovieText = "Película"
+
+    override val episodeSeasonPrefix = "Temporada"
+    override val prefQualityTitle = "Calidad preferida"
+
+    override fun videoListSelector() = "li.dooplay_player_option" // ul#playeroptionsul
+
+    // ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoSet = mutableSetOf<Video>()
+        val players = document.select("ul#playeroptionsul li")
+
+        // Iterar sobre cada player
+        players.parallelFlatMapBlocking { player ->
+            val url = getPlayerUrl(player)
+                ?: return@parallelFlatMapBlocking emptyList<Video>()
+            if (url.contains("embed69")) {
+                val htmlContent = client.newCall(GET(url)).execute().body.string()
+                val links = extractNewExtractorLinks(document, htmlContent) ?: return@parallelFlatMapBlocking emptyList<Video>()
+                links.forEach { (link, language) ->
+                    videoSet.addAll(serverVideoResolver(link, " $language"))
+                }
+            }
+            return@parallelFlatMapBlocking emptyList<Video>()
+        }
+
+        return videoSet.toList()
+    }
+
+    private fun getPlayerUrl(player: Element): String? {
+        val body = FormBody.Builder()
+            .add("action", "doo_player_ajax")
+            .add("post", player.attr("data-post"))
+            .add("nume", player.attr("data-nume"))
+            .add("type", player.attr("data-type"))
+            .build()
+
+        return client.newCall(POST("$baseUrl/wp-admin/admin-ajax.php", headers, body))
+            .execute().body?.string()
+            ?.substringAfter("\"embed_url\":\"")
+            ?.substringBefore("\",")
+            ?.replace("\\", "")
+            ?.takeIf(String::isNotBlank)
+    }
+
+    /*-------------------------------- Video extractors ------------------------------------*/
+    private val voeExtractor by lazy { VoeExtractor(client) }
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val filemoonExtractor by lazy { FilemoonExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val streamlareExtractor by lazy { StreamlareExtractor(client) }
+    private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
+    private val burstCloudExtractor by lazy { BurstCloudExtractor(client) }
+    private val fastreamExtractor by lazy { FastreamExtractor(client, headers) }
+    private val upstreamExtractor by lazy { UpstreamExtractor(client) }
+    private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val streamSilkExtractor by lazy { StreamSilkExtractor(client) }
+    private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
+        return runCatching {
+            Log.d("SoloLatino", "URL: $url")
+            when {
+                "voe" in url -> voeExtractor.videosFromUrl(url, "$prefix ")
+                "ok.ru" in url || "okru" in url -> okruExtractor.videosFromUrl(url, prefix)
+                "filemoon" in url || "moonplayer" in url -> filemoonExtractor.videosFromUrl(url, "$prefix Filemoon:")
+                "amazon" in url || "amz" in url -> extractAmazonVideo(url, prefix)
+                "uqload" in url -> uqloadExtractor.videosFromUrl(url, prefix)
+                "mp4upload" in url -> mp4uploadExtractor.videosFromUrl(url, headers, "$prefix ")
+                "streamwish" in url || "wish" in url -> streamWishExtractor.videosFromUrl(url, "$prefix StreamWish:")
+                "doodstream" in url || "dood." in url -> doodExtractor.videosFromUrl(url.replace("https://doodstream.com/e/", "https://d0000d.com/e/"), "$prefix DoodStream")
+                "streamlare" in url -> streamlareExtractor.videosFromUrl(url, prefix)
+                "yourupload" in url -> yourUploadExtractor.videoFromUrl(url, headers, "$prefix ")
+                "burstcloud" in url -> burstCloudExtractor.videoFromUrl(url, headers, "$prefix ")
+                "fastream" in url -> fastreamExtractor.videosFromUrl(url, "$prefix Fastream:")
+                "upstream" in url -> upstreamExtractor.videosFromUrl(url, "$prefix ")
+                "streamsilk" in url -> streamSilkExtractor.videosFromUrl(url, "$prefix StreamSilk:")
+                "streamtape" in url || "stp" in url -> streamTapeExtractor.videosFromUrl(url, "$prefix StreamTape")
+                arrayOf("ahvsh", "streamhide", "guccihide", "streamvid", "vidhide").any(url) -> streamHideVidExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamHideVid:$it" })
+                arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url, prefix = "$prefix ")
+                else -> emptyList()
+            }
+        }.getOrElse { emptyList() }
+    }
+
+    private fun extractAmazonVideo(url: String, prefix: String): List<Video> {
+        val body = client.newCall(GET(url)).execute().asJsoup()
+        val shareId = body.selectFirst("script:containsData(var shareId)")
+            ?.data()
+            ?.substringAfter("shareId = \"")
+            ?.substringBefore("\"") ?: return emptyList()
+
+        val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+            .execute().asJsoup()
+
+        val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+        val amazonApi = client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+            .execute().asJsoup()
+
+        val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+        return listOf(Video(videoUrl, "$prefix Amazon", videoUrl))
+    }
+
+    private fun extractNewExtractorLinks(doc: Document, htmlContent: String): List<Pair<String, String>>? {
+        val links = mutableListOf<Pair<String, String>>()
+        val jsLinksMatch = getFirstMatch("""dataLink = (\[.+?\]);""".toRegex(), htmlContent) ?: return null
+
+        val items = Json.decodeFromString<List<Item>>(jsLinksMatch)
+        val idiomas = mapOf("LAT" to "[LAT]", "ESP" to "[CAST]", "SUB" to "[SUB]")
+
+        items.forEach { item ->
+            val languageCode = idiomas[item.video_language] ?: "unknown"
+            item.sortedEmbeds.forEach { embed ->
+                val decryptedLink = CryptoAES.decrypt(embed.link, "Ak7qrvvH4WKYxV2OgaeHAEg2a5eh16vE")
+                links.add(Pair(decryptedLink, languageCode))
+            }
+        }
+
+        return links.ifEmpty { null }
+    }
+
+    private fun getFirstMatch(regex: Regex, input: String): String? {
+        return regex.find(input)?.groupValues?.get(1)
+    }
+
+    // ============================== Filters ===============================
+    override val fetchGenres = false
+
+    override fun getFilterList() = FlixLatamFilters.FILTER_LIST
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = FlixLatamFilters.getSearchParameters(filters)
+        val path = when {
+            params.genre.isNotBlank() -> {
+                if (params.genre in listOf("ratings", "tendencias", "pelicula")) {
+                    "/${params.genre}"
+                } else {
+                    "/genero/${params.genre}"
+                }
+            }
+            else -> buildString {
+                append(
+                    when {
+                        query.isNotBlank() -> "/?s=$query"
+                        else -> "/"
+                    },
+                )
+
+                if (params.isInverted) append("&orden=asc")
+            }
+        }
+
+        return if (path.startsWith("/?s=")) {
+            GET("$baseUrl/page/$page$path")
+        } else {
+            GET("$baseUrl$path/page/$page")
+        }
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        super.setupPreferenceScreen(screen) // Quality preference
+
+        val langPref = ListPreference(screen.context).apply {
+            key = PREF_LANG_KEY
+            title = PREF_LANG_TITLE
+            entries = PREF_LANG_ENTRIES
+            entryValues = PREF_LANG_VALUES
+            setDefaultValue(PREF_LANG_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()
+            }
+        }
+        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)
+        screen.addPreference(langPref)
+    }
+
+    // ============================= Utilities ==============================
+    override fun String.toDate() = 0L
+
+    @Serializable
+    data class Item(
+        val file_id: Int,
+        val video_language: String, // Campo nuevo para almacenar el idioma
+        val sortedEmbeds: List<Embed>,
+    )
+
+    @Serializable
+    data class Embed(
+        val servername: String,
+        val link: String,
+        val type: String,
+    )
+
+    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(prefQualityKey, prefQualityDefault)!!
+        val lang = preferences.getString(PREF_LANG_KEY, PREF_LANG_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+            ),
+        ).reversed()
+    }
+
+    override val prefQualityValues = arrayOf("480p", "720p", "1080p")
+    override val prefQualityEntries = prefQualityValues
+
+    companion object {
+        private const val PREF_LANG_KEY = "preferred_lang"
+        private const val PREF_LANG_TITLE = "Preferred language"
+        private const val PREF_LANG_DEFAULT = "[LAT]"
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Uqload"
+        private val PREF_LANG_ENTRIES = arrayOf("[LAT]", "[SUB]", "[CAST]")
+        private val PREF_LANG_VALUES = arrayOf("[LAT]", "[SUB]", "[CAST]")
+        private val SERVER_LIST = arrayOf("StreamWish", "Uqload", "VidGuard", "StreamHideVid", "Voe")
+    }
+}
diff --git a/src/es/flixlatam/src/eu/kanade/tachiyomi/animeextension/es/flixlatam/FlixLatamFilters.kt b/src/es/flixlatam/src/eu/kanade/tachiyomi/animeextension/es/flixlatam/FlixLatamFilters.kt
new file mode 100644
index 00000000..6bbffa55
--- /dev/null
+++ b/src/es/flixlatam/src/eu/kanade/tachiyomi/animeextension/es/flixlatam/FlixLatamFilters.kt
@@ -0,0 +1,108 @@
+package eu.kanade.tachiyomi.animeextension.es.flixlatam
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object FlixLatamFilters {
+
+    open class UriPartFilter(
+        displayName: String,
+        private val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+
+        fun toUriPart() = vals[state].second
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return first { it is R } as R
+    }
+
+    private inline fun <reified R> AnimeFilterList.asUriPart(): String {
+        return getFirst<R>().let {
+            (it as UriPartFilter).toUriPart()
+        }
+    }
+
+    class GenreFilter : UriPartFilter("Generos", FlixLatamFiltersData.GENRES)
+
+    val FILTER_LIST get() = AnimeFilterList(
+        GenreFilter(),
+    )
+
+    data class FilterSearchParams(
+        val isInverted: Boolean = false,
+        val genre: String = "",
+        val year: String = "",
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        return FilterSearchParams(
+            genre = filters.asUriPart<GenreFilter>(),
+
+        )
+    }
+
+    private object FlixLatamFiltersData {
+        val EVERY = Pair("Seleccionar", "")
+
+        val GENRES = arrayOf(
+            EVERY,
+            Pair("Acción", "accion"),
+            Pair("Action & Adventure", "action-adventure"),
+            Pair("Adolescencia", "adolescencia"),
+            Pair("Animación", "animacion"),
+            Pair("Anime", "anime"),
+            Pair("Artes Marciales", "artes-marciales"),
+            Pair("Aventura", "aventura"),
+            Pair("Aventuras", "aventuras"),
+            Pair("Bélica", "belica"),
+            Pair("Bélico", "belico"),
+            Pair("Ciencia Ficción", "ciencia-ficcion"),
+            Pair("Comedia", "comedia"),
+            Pair("Comedia de Situación", "comedia-de-situacion"),
+            Pair("Crimen", "crimen"),
+            Pair("Deporte", "deporte"),
+            Pair("Dibujo Animado", "dibujo-animado"),
+            Pair("Documental", "documental"),
+            Pair("Drama", "drama"),
+            Pair("Drama Adolescente", "drama-adolescente"),
+            Pair("Drama Médico", "drama-medico"),
+            Pair("Familia", "familia"),
+            Pair("Fantasía", "fantasia"),
+            Pair("Ficción Histórica", "ficcion-historica"),
+            Pair("Hentai", "hentai"),
+            Pair("Historia", "historia"),
+            Pair("Humor Negro", "humor-negro"),
+            Pair("Infantil", "infantil"),
+            Pair("Kids", "kids"),
+            Pair("Misterio", "misterio"),
+            Pair("Música", "musica"),
+            Pair("Película de TV", "pelicula-de-tv"),
+            Pair("Política", "politica"),
+            Pair("Psicológico", "psicologico"),
+            Pair("Reality", "reality"),
+            Pair("Romance", "romance"),
+            Pair("Sátira", "satira"),
+            Pair("Sci-Fi & Fantasy", "sci-fi-fantasy"),
+            Pair("Sexualidad y Pornografía", "sexualidad-y-pornografia"),
+            Pair("Soap", "soap"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Superhéroes", "superheroes"),
+            Pair("Suspense", "suspense"),
+            Pair("Suspenso", "suspenso"),
+            Pair("Talk", "talk"),
+            Pair("Telecomedia", "telecomedia"),
+            Pair("Telenovela", "telenovela"),
+            Pair("Terror", "terror"),
+            Pair("TV Asiática", "tv-asiatica"),
+            Pair("TV Latina", "tv-latina"),
+            Pair("War & Politics", "war-politics"),
+            Pair("Western", "western"),
+        )
+    }
+}
diff --git a/src/es/gnula/build.gradle b/src/es/gnula/build.gradle
index 2e6c5ccc..dc1ca526 100644
--- a/src/es/gnula/build.gradle
+++ b/src/es/gnula/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Gnula'
     extClass = '.Gnula'
-    extVersionCode = 21
+    extVersionCode = 30
 }
 
 apply from: "$rootDir/common.gradle"
@@ -21,4 +21,5 @@ dependencies {
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:filemoon-extractor'))
     implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
index 42420404..21380b41 100644
--- a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
+++ b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
@@ -22,6 +22,7 @@ import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
@@ -182,7 +183,7 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> {
                 val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
-                listOf(DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream", false)!!)
+                listOf(DoodExtractor(client).videosFromUrl(url2, quality = prefix, redirect = false)).flatten()
             }
             embedUrl.contains("streamlare") -> StreamlareExtractor(client).videosFromUrl(url, prefix = prefix)
             embedUrl.contains("yourupload") || embedUrl.contains("upload") -> YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix)
@@ -190,8 +191,8 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             embedUrl.contains("fastream") -> FastreamExtractor(client, headers).videosFromUrl(url, prefix = "$prefix Fastream:")
             embedUrl.contains("upstream") -> UpstreamExtractor(client).videosFromUrl(url, prefix = prefix)
             embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape") -> listOf(StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")!!)
-            embedUrl.contains("ahvsh") || embedUrl.contains("streamhide") || embedUrl.contains("guccihide") || embedUrl.contains("streamvid") -> StreamHideVidExtractor(client).videosFromUrl(url, "$prefix StreamHide")
-            else -> emptyList()
+            embedUrl.contains("ahvsh") || embedUrl.contains("streamhide") || embedUrl.contains("guccihide") || embedUrl.contains("streamvid") -> StreamHideVidExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix StreamHideVid:$it" })
+            else -> UniversalExtractor(client).videosFromUrl(url, headers, prefix = prefix)
         }
     }
 
diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle
index 71e6b63c..d819d622 100644
--- a/src/es/hackstore/build.gradle
+++ b/src/es/hackstore/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hackstore'
     extClass = '.Hackstore'
-    extVersionCode = 15
+    extVersionCode = 24
 }
 
 apply from: "$rootDir/common.gradle"
@@ -13,4 +13,6 @@ dependencies {
     implementation(project(':lib:streamwish-extractor'))
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:vidhide-extractor'))
+    implementation(project(':lib:goodstream-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/hackstore/res/mipmap-hdpi/ic_launcher.png b/src/es/hackstore/res/mipmap-hdpi/ic_launcher.png
index d2fbdb73..091be8dc 100644
Binary files a/src/es/hackstore/res/mipmap-hdpi/ic_launcher.png and b/src/es/hackstore/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/hackstore/res/mipmap-mdpi/ic_launcher.png b/src/es/hackstore/res/mipmap-mdpi/ic_launcher.png
index 3002a1dd..ca3f73db 100644
Binary files a/src/es/hackstore/res/mipmap-mdpi/ic_launcher.png and b/src/es/hackstore/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/hackstore/res/mipmap-xhdpi/ic_launcher.png b/src/es/hackstore/res/mipmap-xhdpi/ic_launcher.png
index 202e1a0c..ed5c3107 100644
Binary files a/src/es/hackstore/res/mipmap-xhdpi/ic_launcher.png and b/src/es/hackstore/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/hackstore/res/mipmap-xxhdpi/ic_launcher.png b/src/es/hackstore/res/mipmap-xxhdpi/ic_launcher.png
index eefb441e..9a81927b 100644
Binary files a/src/es/hackstore/res/mipmap-xxhdpi/ic_launcher.png and b/src/es/hackstore/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/hackstore/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/hackstore/res/mipmap-xxxhdpi/ic_launcher.png
index 8372cf23..6dc3361b 100644
Binary files a/src/es/hackstore/res/mipmap-xxxhdpi/ic_launcher.png and b/src/es/hackstore/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
index 795fa1b1..bef8d4cb 100644
--- a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
+++ b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
@@ -14,8 +14,10 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.goodstramextractor.GoodStreamExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -200,6 +202,8 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
+    private val goodStreamExtractor by lazy { GoodStreamExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -223,12 +227,15 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     streamWishExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" })
                 }
                 server.contains("doodstream") || server.contains("dood.") || server.contains("ds2play") || server.contains("doods.") -> {
-                    doodExtractor.videosFromUrl(url, "$prefix DoodStream")
+                    doodExtractor.videosFromUrl(url, prefix)
                 }
                 server.contains("vidhide") || server.contains("vid.") -> {
                     vidHideExtractor.videosFromUrl(url) { "$prefix VidHide:$it" }
                 }
-                else -> emptyList()
+                server.contains("goodstream") || server.contains("vidstream") -> {
+                    goodStreamExtractor.videosFromUrl(url, "$prefix GoodStream")
+                }
+                else -> universalExtractor.videosFromUrl(url, headers, prefix = prefix)
             }
         }
     }
@@ -268,7 +275,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         private const val PREF_SERVER_KEY = "preferred_server"
         private const val PREF_SERVER_DEFAULT = "StreamWish"
-        private val SERVER_LIST = arrayOf("DoodStream", "StreamTape", "Voe", "Filemoon", "StreamWish")
+        private val SERVER_LIST = arrayOf("DoodStream", "StreamTape", "Voe", "Filemoon", "StreamWish", "VidHide", "GoodStream")
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index 746e07db..791ffd55 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiLA'
     extClass = '.Hentaila'
-    extVersionCode = 29
+    extVersionCode = 33
     isNsfw = true
 }
 
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:sendvid-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
index 5edc725e..1939a913 100644
--- a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
+++ b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -73,25 +74,35 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
-    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/directorio?filter=popular&p=$page", headers)
+    override fun popularAnimeRequest(page: Int) = GET(baseUrl, headers)
 
     override fun popularAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
-        val elements = document.select(".hentais .hentai")
-        val nextPage = document.select(".pagination .fa-arrow-right").any()
-        val animeList = elements.map { element ->
+        val elements = document.select("section.latest-hentais div.slider > div.item")
+        val animes = elements.map { element ->
             SAnime.create().apply {
-                setUrlWithoutDomain(element.select("a").attr("abs:href"))
-                title = element.selectFirst(".h-header .h-title")!!.text()
-                thumbnail_url = element.selectFirst(".h-thumb img")!!.attr("abs:src").replace("/fondos/", "/portadas/")
+                setUrlWithoutDomain(element.select("h2.h-title a").attr("abs:href"))
+                title = element.selectFirst("h2.h-title a")!!.text()
+                thumbnail_url = element.selectFirst("figure.bg img")!!.attr("abs:src").replace("/fondos/", "/portadas/")
             }
         }
-        return AnimesPage(animeList, nextPage)
+        return AnimesPage(animes, false)
     }
 
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/directorio?filter=recent&p=$page", headers)
+    override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers)
 
-    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
+    override fun latestUpdatesParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        val elements = document.select("section.episodes div.grid article.hentai")
+        val animes = elements.map { element ->
+            SAnime.create().apply {
+                setUrlWithoutDomain(element.select("a").attr("abs:href").replace("/ver/", "/hentai-").substringBeforeLast("-"))
+                title = element.selectFirst("h2.h-title")!!.text()
+                thumbnail_url = element.selectFirst("img")!!.attr("abs:src").replace("/thumbs/", "/portadas/")
+            }
+        }
+        return AnimesPage(animes.distinctBy { it.url }, false)
+    }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
@@ -188,7 +199,8 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
     private val burstCloudExtractor by lazy { BurstCloudExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
     private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
@@ -212,7 +224,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
                 "burst" -> burstCloudExtractor.videoFromUrl(urlServer, headers = headers)
                 "vidhide", "streamhide", "guccihide", "streamvid" -> streamHideVidExtractor.videosFromUrl(urlServer)
                 "sendvid" -> sendvidExtractor.videosFromUrl(urlServer)
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(urlServer, headers)
             }
         }
     }
@@ -265,8 +277,8 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
             Pair("Chikan", "chikan"),
             Pair("Ecchi", "ecchi"),
             Pair("Enfermeras", "enfermeras"),
-            Pair("Escolares", "escolares"),
             Pair("Futanari", "futanari"),
+            Pair("Escolares", "escolares"),
             Pair("Gore", "gore"),
             Pair("Hardcore", "hardcore"),
             Pair("Harem", "harem"),
diff --git a/src/es/hentaitk/build.gradle b/src/es/hentaitk/build.gradle
index 6ff2652b..1aebc0e6 100644
--- a/src/es/hentaitk/build.gradle
+++ b/src/es/hentaitk/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiTk'
     extClass = '.Hentaitk'
-    extVersionCode = 4
+    extVersionCode = 12
     isNsfw = true
 }
 
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt b/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt
index 3973a3b2..0016b10c 100644
--- a/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt
+++ b/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -138,9 +139,10 @@ class Hentaitk : ConfigurableAnimeSource, AnimeHttpSource() {
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
     private val voeExtractor by lazy { VoeExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -161,11 +163,11 @@ class Hentaitk : ConfigurableAnimeSource, AnimeHttpSource() {
             embedUrl.contains("doodstream") || embedUrl.contains("dood.") ||
                 embedUrl.contains("d000d") || embedUrl.contains("d0000d") ||
                 embedUrl.contains("ds2play") || embedUrl.contains("doods")
-            -> doodExtractor.videosFromUrl(url, "DoodStream")
+            -> doodExtractor.videosFromUrl(url)
             embedUrl.contains("streamtape") || embedUrl.contains("stp") ||
                 embedUrl.contains("stape")
             -> streamTapeExtractor.videosFromUrl(url, quality = "StreamTape")
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/homecine/build.gradle b/src/es/homecine/build.gradle
index f6877e02..a6c09108 100644
--- a/src/es/homecine/build.gradle
+++ b/src/es/homecine/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HomeCine'
     extClass = '.HomeCine'
-    extVersionCode = 4
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/homecine/src/eu/kanade/tachiyomi/animeextension/es/homecine/HomeCine.kt b/src/es/homecine/src/eu/kanade/tachiyomi/animeextension/es/homecine/HomeCine.kt
index 187b50ef..eb6010b6 100644
--- a/src/es/homecine/src/eu/kanade/tachiyomi/animeextension/es/homecine/HomeCine.kt
+++ b/src/es/homecine/src/eu/kanade/tachiyomi/animeextension/es/homecine/HomeCine.kt
@@ -1,3 +1,4 @@
+
 package eu.kanade.tachiyomi.animeextension.es.homecine
 
 import android.app.Application
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index 82bf6d5a..21a56ee1 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Jkanime'
     extClass = '.Jkanime'
-    extVersionCode = 28
+    extVersionCode = 34
 }
 
 apply from: "$rootDir/common.gradle"
@@ -14,6 +14,5 @@ dependencies {
     implementation(project(':lib:filemoon-extractor'))
     implementation(project(':lib:streamtape-extractor'))
     implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib:vidhide-extractor'))
-    implementation 'org.mozilla:rhino:1.7.14'
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
index 0b305cb4..3a7d4314 100644
--- a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
+++ b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
@@ -20,21 +20,18 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
-import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import org.mozilla.javascript.Context
-import org.mozilla.javascript.Scriptable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -48,12 +45,43 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    private val json = Json {
-        ignoreUnknownKeys = true
-        isLenient = true
-        prettyPrint = true
-        coerceInputValues = true
-    }
+    private val noRedirectClient = network.client.newBuilder()
+        .followRedirects(false)
+        .addInterceptor { chain ->
+            val request = chain.request()
+            val response = chain.proceed(request)
+            if (response.isRedirect) {
+                val location = response.header("Location")
+                    ?: return@addInterceptor response
+
+                val originalParams = request.url.queryParameterNames
+                    .associateWith { request.url.queryParameter(it) }
+
+                val redirectUrl = location.toHttpUrl().newBuilder().apply {
+                    originalParams.forEach { (key, value) ->
+                        if (value != null) addQueryParameter(key, value)
+                    }
+                }.build()
+
+                val newRequest = request.newBuilder()
+                    .url(redirectUrl)
+                    .build()
+
+                response.close()
+
+                return@addInterceptor chain.proceed(newRequest)
+            }
+            response
+        }.build()
+
+    override val client = network.client.newBuilder()
+        .addInterceptor { chain ->
+            val request = chain.request()
+            if (request.url.pathSegments.first() == "buscar") {
+                return@addInterceptor noRedirectClient.newCall(request).execute()
+            }
+            chain.proceed(request)
+        }.build()
 
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
@@ -83,21 +111,161 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         )
     }
 
-    override fun popularAnimeSelector(): String = "div.col-lg-12 div.list"
+    override fun popularAnimeSelector(): String = "div.row div.row.page_mirando div.anime__item"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/top/")
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/ranking/", headers)
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         return SAnime.create().apply {
-            title = element.select("div#conb a").attr("title")
-            thumbnail_url = element.select("div#conb a img").attr("src")
-            description = element.select("div#conb div#animinfo p").text()
-            setUrlWithoutDomain(element.select("div#conb a").attr("href"))
+            title = element.select("div.title").text()
+            thumbnail_url = element.select("div.g-0").attr("abs:data-setbg")
+            // description = element.select("div#conb div#animinfo p").text()
+            setUrlWithoutDomain(baseUrl + element.selectFirst("div.anime__item > a")!!.attr("href"))
         }
     }
 
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val document = super.popularAnimeParse(response)
+        val distinctList = document.animes.distinctBy { it.url }
+        return AnimesPage(distinctList, false)
+    }
+
     override fun popularAnimeNextPageSelector(): String = "uwu"
 
+    override fun latestUpdatesSelector(): String = "div.maximoaltura div a.bloqq"
+
+    override fun latestUpdatesRequest(page: Int): Request = GET(baseUrl, headers)
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        return SAnime.create().apply {
+            setUrlWithoutDomain(element.select("a.bloqq").attr("abs:href").substringBeforeLast("/").substringBeforeLast("/"))
+            title = element.select("a.bloqq h5").text()
+            thumbnail_url = element.select("img").attr("abs:src")
+        }
+    }
+
+    override fun latestUpdatesParse(response: Response): AnimesPage {
+        val vista = super.latestUpdatesParse(response)
+        val distinctList = vista.animes.distinctBy { it.title }
+        return AnimesPage(distinctList, false)
+    }
+    override fun latestUpdatesNextPageSelector(): String? = null
+
+    override suspend fun getSearchAnime(
+        page: Int,
+        query: String,
+        filters: AnimeFilterList,
+    ): AnimesPage {
+        return super.getSearchAnime(page, query, filters)
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+        val typeFilter = filterList.find { it is TypeFilter } as TypeFilter
+        val stateFilter = filterList.find { it is StateFilter } as StateFilter
+        val seasonFilter = filterList.find { it is SeasonFilter } as SeasonFilter
+        val orderByFilter = filterList.find { it is OrderByFilter } as OrderByFilter
+        val sortModifiers = filterList.find { it is SortModifiers } as SortModifiers
+        val tagFilter = filters.find { it is Tags } as Tags
+        val dayFilter = filters.find { it is DayFilter } as DayFilter
+
+        var url = baseUrl
+
+        if (dayFilter.state != 0) {
+            val day = dayFilter.toUriPart()
+            return GET("$url/horario/#$day", headers)
+        }
+
+        if (query.isNotBlank()) {
+            val parseQuery = query.replace(" ", "_")
+            val types = listOf("TV", "Movie", "Special", "OVA", "ONA")
+            url += "/buscar/$parseQuery/$page/"
+            url += if (orderByFilter.state != 0) "?filtro=${orderByFilter.toUriPart()}" else "?filtro=nombre"
+            url += if (typeFilter.state != 0) "&tipo=${ types.first {t -> t.lowercase() == typeFilter.toUriPart()} }" else "&tipo=none"
+            url += if (stateFilter.state != 0) "&estado=${ if (stateFilter.toUriPart() == "emision") "1" else "2" }" else "&estado=none"
+            url += if (sortModifiers.state != 0) "&orden=${sortModifiers.toUriPart()}" else "&orden=desc"
+        } else {
+            url += "/directorio/$page/${orderByFilter.toUriPart()}"
+            url += if (genreFilter.state != 0) "/${genreFilter.toUriPart()}" else ""
+            url += if (typeFilter.state != 0) "/${typeFilter.toUriPart() }" else ""
+            url += if (stateFilter.state != 0) "/${stateFilter.toUriPart()}" else ""
+            url += if (tagFilter.state.isNotBlank()) "/${tagFilter.state}" else ""
+            url += if (seasonFilter.state != 0) "/${seasonFilter.toUriPart()}" else ""
+            url += "/${sortModifiers.toUriPart()}"
+        }
+
+        return GET(url, headers)
+    }
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        if (document.location().startsWith("$baseUrl/horario")) {
+            val day = document.location().substringAfterLast("#")
+            val animeBox = document.selectFirst("div.horarybox div.box.semana:has(h2:contains($day))")
+            val animeList = animeBox!!.select("div.box.img").map {
+                SAnime.create().apply {
+                    setUrlWithoutDomain(it.select("a").attr("abs:href"))
+                    title = it.select("a > h3").text()
+                    thumbnail_url = it.select("a > img").attr("abs:src")
+                }
+            }
+            return AnimesPage(animeList, false)
+        }
+        val hasNextPage = document.select("section.contenido.spad div.container div.navigation a.nav-next").any()
+        val isSearch = document.select(".col-lg-2.col-md-6.col-sm-6").any()
+        val animeList = if (isSearch) {
+            document.select(".col-lg-2.col-md-6.col-sm-6").map { animeData ->
+                val anime = SAnime.create()
+                anime.title = animeData.select("div.anime__item #ainfo div.title").html()
+                anime.thumbnail_url = animeData.select("div.anime__item a div.anime__item__pic").attr("data-setbg")
+                anime.setUrlWithoutDomain(animeData.select("div.anime__item a").attr("href"))
+                anime.status = parseStatus(animeData.select("div.anime__item div.anime__item__text ul li:nth-child(1)").html())
+                anime.genre = animeData.select("div.anime__item div.anime__item__text ul li").joinToString { it.text() }
+                anime
+            }
+        } else { // is filtered
+            document.select(".card.mb-3.custom_item2").map { animeData ->
+                latestUpdates(animeData)
+            }
+        }
+        return AnimesPage(animeList, hasNextPage)
+    }
+
+    private fun latestUpdates(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select(".custom_thumb2 > a").attr("abs:href"))
+        anime.title = element.select(".card-title > a").text()
+        anime.thumbnail_url = element.select(".custom_thumb2 a img").attr("abs:src")
+        anime.description = element.select(".synopsis").text()
+        return anime
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime = throw UnsupportedOperationException()
+    override fun searchAnimeNextPageSelector(): String = throw UnsupportedOperationException()
+    override fun searchAnimeSelector(): String = throw UnsupportedOperationException()
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.selectFirst("div.col-lg-3 div.anime__details__pic.set-bg")!!.attr("data-setbg")
+        anime.title = document.selectFirst("div.anime__details__text div.anime__details__title h3")!!.text()
+        anime.description = document.selectFirst("div.col-lg-9 div.anime__details__text p")!!.ownText()
+        document.select("div.row div.col-lg-6.col-md-6 ul li").forEach { animeData ->
+            val data = animeData.select("span").text()
+            if (data.contains("Genero")) {
+                anime.genre = animeData.select("a").joinToString { it.text() }
+            }
+            if (data.contains("Estado")) {
+                anime.status = parseStatus(animeData.select("span").text())
+            }
+            if (data.contains("Studios")) {
+                anime.author = animeData.select("a").text()
+            }
+        }
+
+        return anime
+    }
+
     override fun episodeListParse(response: Response): List<SEpisode> {
         val episodes = mutableListOf<SEpisode>()
         val episodeLink = response.request.url
@@ -184,8 +352,8 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
     private val mixDropExtractor by lazy { MixDropExtractor(client) }
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
     private val jkanimeExtractor by lazy { JkanimeExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -193,16 +361,16 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             when {
                 "ok" in url -> okruExtractor.videosFromUrl(url, "$lang ")
                 "voe" in url -> voeExtractor.videosFromUrl(url, "$lang ")
-                arrayOf("filemoon", "filemooon", "moon").any(url) -> filemoonExtractor.videosFromUrl(url, "$lang Filemoon:")
-                arrayOf("streamtape", "stp", "stape").any(url) -> listOf(streamTapeExtractor.videoFromUrl(url, quality = "$lang StreamTape")!!)
-                arrayOf("mp4upload").any(url) -> mp4uploadExtractor.videosFromUrl(url, prefix = "$lang ", headers = headers)
-                arrayOf("vidhide", "filelions.top", "vid.").any(url) -> vidHideExtractor.videosFromUrl(url) { "$lang VidHide:$it" }
-                arrayOf("mixdrop", "mdbekjwqa").any(url) -> mixDropExtractor.videosFromUrl(url, prefix = "$lang ")
-                arrayOf("wishembed", "streamwish", "strwish", "wish").any(url) -> streamWishExtractor.videosFromUrl(url, videoNameGen = { "$lang StreamWish:$it" })
+                "filemoon" in url || "moonplayer" in url -> filemoonExtractor.videosFromUrl(url, "$lang Filemoon:")
+                "streamtape" in url || "stp" in url || "stape" in url -> listOf(streamTapeExtractor.videoFromUrl(url, quality = "$lang StreamTape")!!)
+                "mp4upload" in url -> mp4uploadExtractor.videosFromUrl(url, prefix = "$lang ", headers = headers)
+                "mixdrop" in url || "mdbekjwqa" in url -> mixDropExtractor.videosFromUrl(url, prefix = "$lang ")
+                "sfastwish" in url || "wishembed" in url || "streamwish" in url || "strwish" in url || "wish" in url
+                -> streamWishExtractor.videosFromUrl(url, videoNameGen = { "$lang StreamWish:$it" })
                 "stream/jkmedia" in url -> jkanimeExtractor.getDesukaFromUrl(url, "$lang ")
                 "um2.php" in url -> jkanimeExtractor.getNozomiFromUrl(url, "$lang ")
                 "um.php" in url -> jkanimeExtractor.getDesuFromUrl(url, "$lang ")
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(url, headers, prefix = lang)
             }
         }
     }
@@ -225,136 +393,6 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         ).reversed()
     }
 
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val filterList = if (filters.isEmpty()) getFilterList() else filters
-        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
-        val typeFilter = filterList.find { it is TypeFilter } as TypeFilter
-        val stateFilter = filterList.find { it is StateFilter } as StateFilter
-        val seasonFilter = filterList.find { it is SeasonFilter } as SeasonFilter
-        val orderByFilter = filterList.find { it is OrderByFilter } as OrderByFilter
-        val sortModifiers = filterList.find { it is SortModifiers } as SortModifiers
-        val tagFilter = filters.find { it is Tags } as Tags
-        val dayFilter = filters.find { it is DayFilter } as DayFilter
-
-        var url = baseUrl
-
-        if (dayFilter.state != 0) {
-            val day = dayFilter.toUriPart()
-            return GET("$url/horario/#$day", headers)
-        }
-
-        if (query.isNotBlank()) {
-            val types = listOf("TV", "Movie", "Special", "OVA", "ONA")
-            url += "/buscar/$query/$page/"
-            url += if (orderByFilter.state != 0) "?filtro=${orderByFilter.toUriPart()}" else "?filtro=nombre"
-            url += if (typeFilter.state != 0) "&tipo=${ types.first {t -> t.lowercase() == typeFilter.toUriPart()} }" else "&tipo=none"
-            url += if (stateFilter.state != 0) "&estado=${ if (stateFilter.toUriPart() == "emision") "1" else "2" }" else "&estado=none"
-            url += if (sortModifiers.state != 0) "&orden=${sortModifiers.toUriPart()}" else "&orden=none"
-        } else {
-            url += "/directorio/$page/${orderByFilter.toUriPart()}"
-            url += if (genreFilter.state != 0) "/${genreFilter.toUriPart()}" else ""
-            url += if (typeFilter.state != 0) "/${typeFilter.toUriPart() }" else ""
-            url += if (stateFilter.state != 0) "/${stateFilter.toUriPart()}" else ""
-            url += if (tagFilter.state.isNotBlank()) "/${tagFilter.state}" else ""
-            url += if (seasonFilter.state != 0) "/${seasonFilter.toUriPart()}" else ""
-            url += "/${sortModifiers.toUriPart()}"
-        }
-
-        return GET(url, headers)
-    }
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        if (document.location().startsWith("$baseUrl/horario")) {
-            val day = document.location().substringAfterLast("#")
-            val animeBox = document.selectFirst("div.horarybox div.box.semana:has(h2:contains($day))")
-            val animeList = animeBox!!.select("div.box.img").map {
-                SAnime.create().apply {
-                    setUrlWithoutDomain(it.select("a").attr("abs:href"))
-                    title = it.select("a > h3").text()
-                    thumbnail_url = it.select("a > img").attr("abs:src")
-                }
-            }
-            return AnimesPage(animeList, false)
-        }
-        val hasNextPage = document.select("section.contenido.spad div.container div.navigation a.nav-next").any()
-        val isSearch = document.select(".col-lg-2.col-md-6.col-sm-6").any()
-        val animeList = if (isSearch) {
-            document.select(".col-lg-2.col-md-6.col-sm-6").map { animeData ->
-                val anime = SAnime.create()
-                anime.title = animeData.select("div.anime__item #ainfo div.title").html()
-                anime.thumbnail_url = animeData.select("div.anime__item a div.anime__item__pic").attr("data-setbg")
-                anime.setUrlWithoutDomain(animeData.select("div.anime__item a").attr("href"))
-                anime.status = parseStatus(animeData.select("div.anime__item div.anime__item__text ul li:nth-child(1)").html())
-                anime.genre = animeData.select("div.anime__item div.anime__item__text ul li").joinToString { it.text() }
-                anime
-            }
-        } else { // is filtered
-            document.selectFirst("script:containsData(var animes =)")?.data()?.let { script ->
-                parseJavaScriptArray(decodeUnicode(script.substringAfter("var animes = ").substringBefore("];")) + "]")?.let { jsonData ->
-                    json.decodeFromString<List<SearchAnimeDto>>(jsonData).map {
-                        SAnime.create().apply {
-                            title = it.title ?: ""
-                            thumbnail_url = it.image
-                            setUrlWithoutDomain("$baseUrl/${it.slug}")
-                        }
-                    }
-                }
-            } ?: emptyList()
-        }
-        return AnimesPage(animeList, hasNextPage)
-    }
-
-    private fun parseJavaScriptArray(jsCode: String): String? {
-        return try {
-            val cx = Context.enter()
-            cx.optimizationLevel = -1
-            val scope: Scriptable = cx.initStandardObjects()
-            val script = """
-                var animes = $jsCode;
-                JSON.stringify(animes);
-            """.trimIndent()
-            cx.evaluateString(scope, script, "script", 1, null) as String
-        } catch (e: Exception) {
-            null
-        } finally {
-            Context.exit()
-        }
-    }
-
-    private fun decodeUnicode(input: String): String {
-        val unicodePattern = Regex("""\\u([0-9a-fA-F]{4})""")
-        return unicodePattern.replace(input) { match ->
-            val charCode = match.groupValues[1].toInt(16)
-            charCode.toChar().toString()
-        }
-    }
-
-    override fun searchAnimeFromElement(element: Element): SAnime = throw UnsupportedOperationException()
-    override fun searchAnimeNextPageSelector(): String = throw UnsupportedOperationException()
-    override fun searchAnimeSelector(): String = throw UnsupportedOperationException()
-
-    override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
-        anime.thumbnail_url = document.selectFirst(".anime__details__content .set-bg")?.attr("data-setbg")
-        anime.title = document.selectFirst(".anime__details__title h3")?.text() ?: ""
-        anime.description = document.selectFirst(".sinopsis")?.ownText()
-        document.select(".aninfo li").forEach { animeData ->
-            val data = animeData.select("span").text()
-            if (data.contains("Genero")) {
-                anime.genre = animeData.select("a").joinToString { it.text() }
-            }
-            if (data.contains("Estado")) {
-                anime.status = parseStatus(animeData.select("span").text())
-            }
-            if (data.contains("Studios")) {
-                anime.author = animeData.select("a").text()
-            }
-        }
-
-        return anime
-    }
-
     private fun parseStatus(statusString: String): Int {
         return when {
             statusString.contains("Por estrenar") -> SAnime.ONGOING
@@ -364,14 +402,6 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/directorio/$page/desc/")
-
-    override fun latestUpdatesParse(response: Response): AnimesPage = searchAnimeParse(response)
-
-    override fun latestUpdatesFromElement(element: Element): SAnime = throw UnsupportedOperationException()
-    override fun latestUpdatesNextPageSelector(): String = throw UnsupportedOperationException()
-    override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
-
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
         AnimeFilter.Header("La busqueda por texto no incluye todos los filtros"),
         DayFilter(),
@@ -498,8 +528,6 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private class Tags(name: String) : AnimeFilter.Text(name)
 
-    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
-
     private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
         AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
         fun toUriPart() = vals[state].second
@@ -562,11 +590,4 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val lang: Long? = null,
         val slug: String? = null,
     )
-
-    @Serializable
-    data class SearchAnimeDto(
-        @SerialName("title") var title: String? = null,
-        @SerialName("image") var image: String? = null,
-        @SerialName("slug") var slug: String? = null,
-    )
 }
diff --git a/src/es/lacartoons/build.gradle b/src/es/lacartoons/build.gradle
index ed8d2838..1d48652c 100644
--- a/src/es/lacartoons/build.gradle
+++ b/src/es/lacartoons/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'LACartoons'
     extClass = '.Lacartoons'
-    extVersionCode = 6
+    extVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,5 @@ dependencies {
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:yourupload-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt b/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt
index 0d0ceeda..ec789ee9 100644
--- a/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt
+++ b/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt
@@ -15,6 +15,7 @@ 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.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -144,10 +145,10 @@ class Lacartoons : ConfigurableAnimeSource, AnimeHttpSource() {
                 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("guccihide") || embedUrl.contains("streamvid") -> StreamHideVidExtractor(client, headers).videosFromUrl(url)
             embedUrl.contains("voe") -> VoeExtractor(client).videosFromUrl(url)
             embedUrl.contains("yourupload") || embedUrl.contains("upload") -> YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            else -> emptyList()
+            else -> UniversalExtractor(client).videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/latanime/build.gradle b/src/es/latanime/build.gradle
index 273f3300..d4cd1c6d 100644
--- a/src/es/latanime/build.gradle
+++ b/src/es/latanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Latanime'
     extClass = '.Latanime'
-    extVersionCode = 18
+    extVersionCode = 23
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,5 +12,6 @@ dependencies {
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:okru-extractor'))
     implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:universal-extractor'))
     implementation(libs.jsunpacker)
 }
\ No newline at end of file
diff --git a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
index 0f7630ae..2a534db0 100644
--- a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
+++ b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -304,6 +305,10 @@ class Latanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers, name = "Original", prefix = prefix)
                     videoList.addAll(videos)
                 }
+                else -> {
+                    val videos = UniversalExtractor(client).videosFromUrl(url, headers)
+                    videoList.addAll(videos)
+                }
             }
         }
 
diff --git a/src/es/locopelis/build.gradle b/src/es/locopelis/build.gradle
index c397c6f2..76f022b9 100644
--- a/src/es/locopelis/build.gradle
+++ b/src/es/locopelis/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'LocoPelis'
     extClass = '.LocoPelis'
-    extVersionCode = 24
+    extVersionCode = 28
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt b/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
index e3de1251..139d8188 100644
--- a/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
+++ b/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
@@ -95,10 +95,10 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     contains("streamtape") || contains("stp") || contains("stape")
                     -> StreamTapeExtractor(client).videosFromUrl(this, quality = "StreamTape")
                     contains("doodstream") || contains("dood.") || contains("d000d") || contains("ds2play") || contains("doods.")
-                    -> DoodExtractor(client).videosFromUrl(this, "DoodStream", true)
+                    -> DoodExtractor(client).videosFromUrl(this, "DoodStream")
                     contains("ok.ru") || contains("okru") -> OkruExtractor(client).videosFromUrl(this)
                     contains("vidhide") || contains("streamhide") || contains("guccihide") || contains("streamvid")
-                    -> StreamHideVidExtractor(client).videosFromUrl(this)
+                    -> StreamHideVidExtractor(client, headers).videosFromUrl(this)
                     else -> emptyList()
                 }
             }
diff --git a/src/es/metroseries/build.gradle b/src/es/metroseries/build.gradle
index 3c74aeba..d41d1bac 100644
--- a/src/es/metroseries/build.gradle
+++ b/src/es/metroseries/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MetroSeries'
     extClass = '.MetroSeries'
-    extVersionCode = 14
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:fastream-extractor'))
     implementation(project(':lib:upstream-extractor'))
     implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/mhdflix/build.gradle b/src/es/mhdflix/build.gradle
new file mode 100644
index 00000000..87cd30fd
--- /dev/null
+++ b/src/es/mhdflix/build.gradle
@@ -0,0 +1,17 @@
+ext {
+    extName = 'MhdFlix'
+    extClass = '.MhdFlix'
+    extVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
+dependencies {
+    implementation(project(':lib:vidhide-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:universal-extractor'))
+}
\ No newline at end of file
diff --git a/src/es/mhdflix/res/mipmap-hdpi/ic_launcher.png b/src/es/mhdflix/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..55074439
Binary files /dev/null and b/src/es/mhdflix/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/mhdflix/res/mipmap-mdpi/ic_launcher.png b/src/es/mhdflix/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..ac037b12
Binary files /dev/null and b/src/es/mhdflix/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/mhdflix/res/mipmap-xhdpi/ic_launcher.png b/src/es/mhdflix/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..f618f58b
Binary files /dev/null and b/src/es/mhdflix/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/mhdflix/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mhdflix/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..5063279f
Binary files /dev/null and b/src/es/mhdflix/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/mhdflix/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mhdflix/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b5db4a37
Binary files /dev/null and b/src/es/mhdflix/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/mhdflix/src/eu/kanade/tachiyomi/animeextension/es/mhdflix/MhdFlix.kt b/src/es/mhdflix/src/eu/kanade/tachiyomi/animeextension/es/mhdflix/MhdFlix.kt
new file mode 100644
index 00000000..323e692a
--- /dev/null
+++ b/src/es/mhdflix/src/eu/kanade/tachiyomi/animeextension/es/mhdflix/MhdFlix.kt
@@ -0,0 +1,360 @@
+package eu.kanade.tachiyomi.animeextension.es.mhdflix
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
+import okhttp3.Request
+import okhttp3.Response
+import org.json.JSONArray
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+open class MhdFlix : AnimeHttpSource(), ConfigurableAnimeSource {
+
+    override val name = "MhdFlix"
+
+    override val baseUrl = "https://ww2.mhdflix.com"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[SUB]", "[CAST]", "[VOSE]")
+
+        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",
+            "VidHide",
+            "Voe",
+            "Uqload",
+            "StreamTape",
+            "Doodstream",
+            "MixDrop",
+            "filelions",
+        )
+    }
+
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/movies/page/$page", headers)
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        val elements = document.select("#movies-a li[id*=post-]")
+        val nextPage = document.select(".pagination .nav-links .current ~ a:not(.page-link)").any()
+        val animeList = elements.map { element ->
+            SAnime.create().apply {
+                setUrlWithoutDomain(element.selectFirst("article > a")?.attr("abs:href") ?: "")
+                title = element.selectFirst("article .entry-header .entry-title")?.text() ?: ""
+                thumbnail_url = element.selectFirst("article .post-thumbnail figure img")?.getImageUrl()
+            }
+        }
+        return AnimesPage(animeList, nextPage)
+    }
+
+    protected open fun Element.getImageUrl(): String? {
+        return if (hasAttr("srcset")) {
+            try {
+                fetchUrls(attr("abs:srcset")).maxOrNull()
+            } catch (_: Exception) {
+                attr("abs:src")
+            }
+        } else {
+            attr("abs:src")
+        }
+    }
+
+    override fun latestUpdatesRequest(page: Int) = popularAnimeRequest(page)
+
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = MhdFlixFilters.getSearchParameters(filters)
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/?s=$query&page=$page")
+            params.path.isNotEmpty() -> GET("$baseUrl${params.getFullUrl()}/page/$page/${params.query()}")
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val document = response.asJsoup()
+        val animeDetails = SAnime.create().apply {
+            title = document.selectFirst(".alg-cr .entry-header .entry-title")?.text() ?: ""
+            description = document.select(".alg-cr .description").text()
+            thumbnail_url = document.selectFirst(".alg-cr .post-thumbnail img")?.getImageUrl()
+            genre = document.select(".genres a").joinToString { it.text() }
+            status = SAnime.UNKNOWN
+        }
+
+        document.select(".cast-lst li").map {
+            if (it.select("span").text().contains("Director", true)) {
+                animeDetails.author = it.selectFirst("p > a")?.text()
+            }
+            if (it.select("span").text().contains("Actores", true)) {
+                animeDetails.artist = it.selectFirst("p > a")?.text()
+            }
+        }
+        return animeDetails
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = Jsoup.parse(response.body.string())
+        val referer = response.request.url.toString()
+        val allEpisodes = mutableListOf<SEpisode>()
+
+        val episodeElements = document.select("section.episodes ul#episode_by_temp li")
+        if (episodeElements.isEmpty()) {
+            return listOf(
+                SEpisode.create().apply {
+                    setUrlWithoutDomain(response.request.url.toString())
+                    name = "Película"
+                    episode_number = 1F
+                },
+            )
+        }
+
+        val seasonElements = document.select("ul.aa-cnt.sub-menu li.sel-temp a")
+            .sortedBy { it.attr("data-season") }
+
+        for (season in seasonElements) {
+            val post = season.attr("data-post")
+            val seasonNumber = season.attr("data-season")
+
+            val formBody = FormBody.Builder()
+                .add("action", "action_select_season")
+                .add("season", seasonNumber)
+                .add("post", post)
+                .build()
+
+            val request = Request.Builder()
+                .url("https://ww2.mhdflix.com/wp-admin/admin-ajax.php")
+                .post(formBody)
+                .header("Origin", baseUrl)
+                .header("Referer", referer)
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .build()
+
+            val detailResponse = client.newCall(request).execute()
+
+            if (detailResponse.isSuccessful) {
+                val detailDocument = Jsoup.parse(detailResponse.body.string())
+                val episodeElements = detailDocument.select("article.post.episodes")
+
+                episodeElements.forEach { element ->
+                    println(element) // Imprime el HTML del elemento
+
+                    val episode = SEpisode.create().apply {
+                        val url = element.selectFirst("a.lnk-blk")?.attr("href") ?: ""
+                        val headerElement = element.selectFirst("header.entry-header")
+                        val title = headerElement?.selectFirst("h2.entry-title")?.text() ?: "Episodio Desconocido"
+                        val episodeNumber = headerElement?.selectFirst("span.num-epi")?.text()?.substringAfter("x")?.toFloatOrNull() ?: 0F
+                        Log.d("MhdFlix", "Número de episodio: $episodeNumber")
+                        setUrlWithoutDomain(url)
+                        name = "- $title"
+                        episode_number = episodeNumber
+                    }
+                    allEpisodes.add(episode)
+                }
+            } else {
+                Log.e("MhdFlix", "Error en la solicitud de detalles de la temporada: ${detailResponse.code}")
+            }
+        }
+
+        return allEpisodes.sortedByDescending { it.name }
+    }
+
+    private fun fetchUrls(text: String?): List<String> {
+        if (text.isNullOrEmpty()) return listOf()
+        val linkRegex = "(http|ftp|https):\\/\\/([\\w_-]+(?:(?:\\.[\\w_-]+)+))([\\w.,@?^=%&:\\/~+#-]*[\\w@?^=%&\\/~+#-])".toRegex()
+        return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+
+        val title = document.title()
+        val seasonEpisodeRegex = Regex("""(\d+)x(\d+)""")
+        val seasonEpisodeMatch = seasonEpisodeRegex.find(title)
+
+        val season = seasonEpisodeMatch?.groups?.get(1)?.value?.toIntOrNull()
+        val episode = seasonEpisodeMatch?.groups?.get(2)?.value?.toIntOrNull()
+
+        document.select(".video-player iframe").forEach { iframe ->
+            try {
+                val src = iframe.attr("src").ifEmpty { iframe.attr("data-src") }
+                val idRegex = Regex("""\/e\/(\d+)""")
+                val matchResult = idRegex.find(src)
+                val videoId = matchResult?.groupValues?.get(1) ?: return@forEach
+
+                val videoUrl = if (season != null && episode != null) {
+                    "$baseUrl/wp-json/enlace/v1/e?id=$videoId&season=$season&episode=$episode"
+                } else {
+                    "$baseUrl/wp-json/enlace/v1/e?id=$videoId"
+                }
+
+                val videoResponse = client.newCall(GET(videoUrl)).execute()
+                val jsonResponse = videoResponse.body.string()
+                val jsonArray = JSONArray(jsonResponse)
+                for (i in 0 until jsonArray.length()) {
+                    val videoObj = jsonArray.getJSONObject(i)
+                    val videoLink = videoObj.getString("url")
+                    val type = when (videoObj.getString("tipo")) {
+                        "Sub lat" -> "SUB"
+                        "Castellano" -> "CAST"
+                        "Latino" -> "LAT"
+                        else -> videoObj.getString("tipo")
+                    }
+
+                    serverVideoResolver(videoLink, type).forEach { videoList.add(it) }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
+        return videoList.sort()
+    }
+
+    private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val mixDropExtractor by lazy { MixDropExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
+        val embedUrl = url.lowercase()
+        Log.d("MhdFlix", "URL: $url")
+        return when {
+            embedUrl.contains("vidhide") -> {
+                vidHideExtractor.videosFromUrl(url, videoNameGen = { "[$prefix] - VidHide: $it " })
+            }
+            embedUrl.contains("voe") -> {
+                voeExtractor.videosFromUrl(url, prefix = "[$prefix] - ")
+            }
+            embedUrl.contains("uqload") -> {
+                uqloadExtractor.videosFromUrl(url, prefix = "[$prefix] - ")
+            }
+            embedUrl.contains("streamtape") -> {
+                streamTapeExtractor.videosFromUrl(url, quality = "[$prefix] - StreamTape")
+            }
+            embedUrl.contains("dood") -> {
+                doodExtractor.videosFromUrl(url, quality = "[$prefix] - Doodstream")
+            }
+            embedUrl.contains("streamwish") -> {
+                streamWishExtractor.videosFromUrl(url, prefix = "[$prefix] - StreamWish")
+            }
+            embedUrl.contains("mixdrop") -> {
+                mixDropExtractor.videosFromUrl(url, lang = "[$prefix] - ")
+            }
+            embedUrl.contains("filelions") -> {
+                universalExtractor.videosFromUrl(url, headers, prefix = "[$prefix] - ")
+            }
+            else -> emptyList()
+        }
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
+    override fun getFilterList(): AnimeFilterList = MhdFlixFilters.FILTER_LIST
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_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)
+
+        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)
+    }
+}
diff --git a/src/es/mhdflix/src/eu/kanade/tachiyomi/animeextension/es/mhdflix/MhdFlixFilters.kt b/src/es/mhdflix/src/eu/kanade/tachiyomi/animeextension/es/mhdflix/MhdFlixFilters.kt
new file mode 100644
index 00000000..5b0772c6
--- /dev/null
+++ b/src/es/mhdflix/src/eu/kanade/tachiyomi/animeextension/es/mhdflix/MhdFlixFilters.kt
@@ -0,0 +1,124 @@
+package eu.kanade.tachiyomi.animeextension.es.mhdflix
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object MhdFlixFilters {
+    open class QueryPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart() = vals[state].second.takeIf { it.isNotEmpty() } ?: run { "" }
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return this.filterIsInstance<R>().first()
+    }
+
+    private fun String.changePrefix() = this.takeIf { it.startsWith("&") }?.let { this.replaceFirst("&", "?") } ?: run { this }
+
+    data class FilterSearchParams(val path: String = "", val queryParams: String = "") {
+        fun getFullUrl() = path.changePrefix()
+        fun query() = queryParams
+    }
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        // Obtiene el path de la URL para el género y el año
+        val genrePath = filters.getFirst<GenresFilter>().toQueryPart()
+        val generalPath = filters.getFirst<GeneralFilter>().toQueryPart()
+
+        // Si hay año, añadimos "release" a la ruta
+        val path = when {
+            genrePath.isNotEmpty() -> "/category/$genrePath"
+            generalPath.isNotEmpty() -> "/category/$generalPath"
+            else -> "/"
+        }
+
+        // Parámetros de consulta (type=movies/series, order)
+        val queryParams = filters.getFirst<TypesFilter>().toQueryPart()
+
+        return FilterSearchParams(path, queryParams)
+    }
+
+    val FILTER_LIST get() = AnimeFilterList(
+        AnimeFilter.Header("La búsqueda por texto ignora el filtro"),
+        GenresFilter(),
+        GeneralFilter(),
+        TypesFilter(),
+    )
+
+    class GenresFilter : QueryPartFilter("Género", AnimeFlvFiltersData.GENRES)
+    class GeneralFilter : QueryPartFilter("Plataformas", AnimeFlvFiltersData.GENERAL)
+    class TypesFilter : QueryPartFilter("Tipo", AnimeFlvFiltersData.TYPES)
+
+    private object AnimeFlvFiltersData {
+        val TYPES = arrayOf(
+            Pair("Seleccione un tipo", ""),
+            Pair("Películas", "/?type=movies"),
+            Pair("Series", "/?type=series"),
+        )
+        val GENERAL = arrayOf(
+            Pair("Seleccione un tipo", ""),
+            Pair("Netflix", "netflix"),
+            Pair("Disney Plus", "disney-plus"),
+            Pair("Amazon Prime Video", "amazon-prime-video"),
+            Pair("HBO Max", "hbo-max"),
+            Pair("Apple TV Plus", "apple-tv-plus"),
+            Pair("Movistar Plus", "movistar-plus"),
+            Pair("AMC Amazon Channel", "amc-amazon-channel"),
+            Pair("MGM Amazon Channel", "mgm-amazon-channel"),
+            Pair("Netflix Basic with Ads", "netflix-basic-with-ads"),
+            Pair("Crunchyroll", "crunchyroll"),
+            Pair("Max", "max"),
+            Pair("MGM Plus Amazon Channel", "mgm-plus-amazon-channel"),
+
+        )
+        val GENRES = arrayOf(
+            Pair("Seleccione un género", ""),
+            Pair("Acción", "accion"),
+            Pair("Comedia", "comedia"),
+            Pair("Crimen", "crimen"),
+            Pair("Suspense", "suspense"),
+            Pair("Animación", "animacion"),
+            Pair("Familia", "familia"),
+            Pair("Aventura", "aventura"),
+            Pair("Fantasía", "fantasia"),
+            Pair("Ciencia Ficción", "ciencia-ficcion"),
+            Pair("Drama", "drama"),
+            Pair("Disney", "disney"),
+            Pair("Romance", "romance"),
+            Pair("Película de TV", "pelicula-de-tv"),
+            Pair("Misterio", "misterio"),
+            Pair("Action Adventure", "action-adventure"),
+            Pair("Terror", "terror"),
+            Pair("Kids", "kids"),
+            Pair("Sci-Fi Fantasy", "sci-fi-fantasy"),
+            Pair("Documental", "documental"),
+            Pair("Marvel", "marvel"),
+            Pair("DC", "dc"),
+            Pair("Música", "musica"),
+            Pair("Flixole", "flixole"),
+            Pair("Western", "western"),
+            Pair("Bélica", "belica"),
+            Pair("Historia", "historia"),
+            Pair("Filmin", "filmin"),
+            Pair("Anime", "anime"),
+            Pair("Planet Horror Amazon Channel", "planet-horror-amazon-channel"),
+            Pair("Dorama", "dorama"),
+            Pair("Tivify", "tivify"),
+            Pair("Acontra Plus", "acontra-plus"),
+            Pair("FuboTV", "fubotv"),
+            Pair("Reality", "reality"),
+            Pair("War Politics", "war-politics"),
+            Pair("Mubi", "mubi"),
+            Pair("SkyShowtime", "skyshowtime"),
+            Pair("Soap", "soap"),
+            Pair("Filmbox", "filmbox"),
+            Pair("Kocowa", "kocowa"),
+            Pair("YouTube Premium", "youtube-premium"),
+            Pair("Hentai", "hentai"),
+        )
+    }
+}
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index 2789aeed..515d9a11 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MonosChinos'
     extClass = '.MonosChinos'
-    extVersionCode = 32
+    extVersionCode = 34
 }
 
 apply from: "$rootDir/common.gradle"
@@ -16,4 +16,5 @@ dependencies {
     implementation(project(':lib:streamwish-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
index 9f786cbe..f28a2636 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
@@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -177,7 +178,7 @@ class MonosChinos : ConfigurableAnimeSource, AnimeHttpSource() {
 
         return serverDocument.select("[data-player]")
             .map { String(Base64.decode(it.attr("data-player"), Base64.DEFAULT)) }
-            .parallelCatchingFlatMapBlocking { serverVideoResolver(it) }
+            .parallelCatchingFlatMapBlocking { serverVideoResolver(it) }.sort()
     }
 
     override fun getFilterList(): AnimeFilterList = MonosChinosFilters.FILTER_LIST
@@ -191,6 +192,7 @@ class MonosChinos : ConfigurableAnimeSource, AnimeHttpSource() {
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -201,11 +203,11 @@ class MonosChinos : ConfigurableAnimeSource, AnimeHttpSource() {
             embedUrl.contains("filemoon") || embedUrl.contains("moonplayer") -> filemoonExtractor.videosFromUrl(url, prefix = "Filemoon:")
             embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish") || embedUrl.contains("wishfast") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
             embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape") -> streamTapeExtractor.videosFromUrl(url)
-            embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> doodExtractor.videosFromUrl(url, "DoodStream", false)
+            embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> doodExtractor.videosFromUrl(url)
             embedUrl.contains("filelions") || embedUrl.contains("lion") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "FileLions:$it" })
             embedUrl.contains("mp4upload") || embedUrl.contains("mp4") -> mp4uploadExtractor.videosFromUrl(url, headers)
             embedUrl.contains("mix") -> mixdropExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt
new file mode 100644
index 00000000..45f37e7d
--- /dev/null
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt
@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.animeextension.es.monoschinos.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class SolidFilesExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
+        val videoList = mutableListOf<Video>()
+        return try {
+            val document = client.newCall(GET(url)).execute().asJsoup()
+            document.select("script").forEach { script ->
+                if (script.data().contains("\"downloadUrl\":")) {
+                    val data = script.data().substringAfter("\"downloadUrl\":").substringBefore(",")
+                    val url = data.replace("\"", "")
+                    val videoUrl = url
+                    val quality = prefix + "SolidFiles"
+                    videoList.add(Video(videoUrl, quality, videoUrl))
+                }
+            }
+            videoList
+        } catch (e: Exception) {
+            videoList
+        }
+    }
+}
diff --git a/src/es/mundodonghua/build.gradle b/src/es/mundodonghua/build.gradle
index 6cb8bb4b..817e7d75 100644
--- a/src/es/mundodonghua/build.gradle
+++ b/src/es/mundodonghua/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MundoDonghua'
     extClass = '.MundoDonghua'
-    extVersionCode = 24
+    extVersionCode = 27
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
index 0bcee0f3..c8669c80 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
@@ -164,7 +164,7 @@ class MundoDonghua : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
             }
         }
-        return videoList
+        return videoList.sort()
     }
 
     override fun videoListSelector() = throw UnsupportedOperationException()
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt
index 72190b40..b6118627 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt
@@ -18,14 +18,14 @@ class ProteaExtractor() {
         val videoList = mutableListOf<Video>()
         runCatching {
             val document = Jsoup.connect(url).headers(headers.toMap()).ignoreContentType(true).method(Connection.Method.POST).execute()
-            if (document!!.body()!!.isNotEmpty()) {
+            if (document.body().isNotEmpty()) {
                 val responseString = document.body().removePrefix("[").removeSuffix("]")
                 val jObject = json.decodeFromString<JsonObject>(responseString)
                 val sources = jObject["source"]!!.jsonArray
-                sources!!.forEach { source ->
-                    var item = source!!.jsonObject
+                sources.forEach { source ->
+                    var item = source.jsonObject
                     var quality = "$qualityPrefix:${ item["label"]!!.jsonPrimitive.content }"
-                    var urlVideo = item["file"]!!.jsonPrimitive!!.content.removePrefix("//")
+                    var urlVideo = item["file"]!!.jsonPrimitive.content.removePrefix("//")
                     var newHeaders = Headers.Builder()
                         .set("authority", "www.nemonicplayer.xyz")
                         .set("accept", "*/*")
diff --git a/src/es/pelisflix/build.gradle b/src/es/pelisflix/build.gradle
index b974c440..7e965a79 100644
--- a/src/es/pelisflix/build.gradle
+++ b/src/es/pelisflix/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Pelisflix'
     extClass = '.PelisflixFactory'
-    extVersionCode = 14
+    extVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
index 623aaffe..33fe2838 100644
--- a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
+++ b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
@@ -54,7 +54,7 @@ class SeriesflixClass : Pelisflix("Seriesflix", "https://seriesflix.video") {
         fetchUrls(urlResponse).map { serverUrl ->
             Log.i("bruh url", serverUrl)
             if (serverUrl.contains("doodstream")) {
-                val video = DoodExtractor(client).videoFromUrl(serverUrl.replace("https://doodstream.com", "https://dood.wf"), lang + "DoodStream", false)
+                val video = DoodExtractor(client).videoFromUrl(serverUrl.replace("https://doodstream.com", "https://dood.wf"), lang + "DoodStream")
                 if (video != null) videoList.add(video)
             }
             if (serverUrl.contains("streamtape")) {
diff --git a/src/es/pelisforte/build.gradle b/src/es/pelisforte/build.gradle
index e4a2ab93..e31ff64a 100644
--- a/src/es/pelisforte/build.gradle
+++ b/src/es/pelisforte/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'PelisForte'
     extClass = '.PelisForte'
-    extVersionCode = 20
+    extVersionCode = 28
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 476ffb47..678eb394 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Pelisplushd'
     extClass = '.PelisplushdFactory'
-    extVersionCode = 63
+    extVersionCode = 72
 }
 
 apply from: "$rootDir/common.gradle"
@@ -25,5 +25,6 @@ dependencies {
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:streamsilk-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
     implementation(libs.jsunpacker)
-}
+}
\ No newline at end of file
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
index 2f26c25d..69c63691 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
@@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsilkextractor.StreamSilkExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
@@ -151,7 +152,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                 }.also(videoList::addAll)
             }
         }
-        return videoList
+        return videoList.sort()
     }
 
     /*--------------------------------Video extractors------------------------------------*/
@@ -168,9 +169,10 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
     private val fastreamExtractor by lazy { FastreamExtractor(client, headers) }
     private val upstreamExtractor by lazy { UpstreamExtractor(client) }
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
     private val streamSilkExtractor by lazy { StreamSilkExtractor(client) }
     private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
         return runCatching {
@@ -211,9 +213,9 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                 arrayOf("upstream").any(url) -> upstreamExtractor.videosFromUrl(url, prefix = "$prefix ")
                 arrayOf("streamsilk").any(url) -> streamSilkExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamSilk:$it" })
                 arrayOf("streamtape", "stp", "stape").any(url) -> streamTapeExtractor.videosFromUrl(url, quality = "$prefix StreamTape")
-                arrayOf("ahvsh", "streamhide", "guccihide", "streamvid", "vidhide").any(url) -> streamHideVidExtractor.videosFromUrl(url, prefix = "$prefix ")
+                arrayOf("ahvsh", "streamhide", "guccihide", "streamvid", "vidhide").any(url) -> streamHideVidExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamHideVid:$it" })
                 arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url, prefix = "$prefix ")
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(url, headers, prefix = "$prefix ")
             }
         }.getOrNull() ?: emptyList()
     }
diff --git a/src/es/serieskao/build.gradle b/src/es/serieskao/build.gradle
new file mode 100644
index 00000000..cfe1f965
--- /dev/null
+++ b/src/es/serieskao/build.gradle
@@ -0,0 +1,31 @@
+ext {
+    extName = 'Serieskao'
+    extClass = '.Serieskao'
+    extVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:vudeo-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:streamlare-extractor'))
+    implementation(project(':lib:yourupload-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:burstcloud-extractor'))
+    implementation(project(':lib:fastream-extractor'))
+    implementation(project(':lib:upstream-extractor'))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:streamsilk-extractor'))
+    implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
+    implementation(project(':lib:cryptoaes'))
+    implementation(libs.jsunpacker)
+}
\ No newline at end of file
diff --git a/src/es/serieskao/res/mipmap-hdpi/ic_launcher.png b/src/es/serieskao/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..133bf1bb
Binary files /dev/null and b/src/es/serieskao/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/serieskao/res/mipmap-mdpi/ic_launcher.png b/src/es/serieskao/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..14e07068
Binary files /dev/null and b/src/es/serieskao/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/serieskao/res/mipmap-xhdpi/ic_launcher.png b/src/es/serieskao/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..4be93470
Binary files /dev/null and b/src/es/serieskao/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/serieskao/res/mipmap-xxhdpi/ic_launcher.png b/src/es/serieskao/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..70e9bc09
Binary files /dev/null and b/src/es/serieskao/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/serieskao/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/serieskao/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..60ec63b5
Binary files /dev/null and b/src/es/serieskao/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/serieskao/src/eu/kanade/tachiyomi/animeextension/es/serieskao/Serieskao.kt b/src/es/serieskao/src/eu/kanade/tachiyomi/animeextension/es/serieskao/Serieskao.kt
new file mode 100644
index 00000000..39a27d40
--- /dev/null
+++ b/src/es/serieskao/src/eu/kanade/tachiyomi/animeextension/es/serieskao/Serieskao.kt
@@ -0,0 +1,417 @@
+package eu.kanade.tachiyomi.animeextension.es.serieskao
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamsilkextractor.StreamSilkExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
+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 kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+open class Serieskao : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "SeriesKao"
+
+    override val baseUrl = "https://serieskao.top"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    companion object {
+        const val PREF_QUALITY_KEY = "preferred_quality"
+        const val PREF_QUALITY_DEFAULT = "1080"
+        val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[SUB]", "[CAST]")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+            "VidGuard",
+        )
+    }
+
+    override fun popularAnimeSelector(): String = "div.Posters a.Posters-link"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/series?page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        return SAnime.create().apply {
+            setUrlWithoutDomain(element.select("a").attr("abs:href"))
+            title = element.select("a div.listing-content p").text()
+            thumbnail_url = element.select("a img").attr("src").replace("/w154/", "/w200/")
+        }
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "a.page-link"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+        val jsoup = response.asJsoup()
+        if (response.request.url.toString().contains("/pelicula/")) {
+            val episode = SEpisode.create().apply {
+                episode_number = 1F
+                name = "PELÍCULA"
+                setUrlWithoutDomain(response.request.url.toString())
+            }
+            episodes.add(episode)
+        } else {
+            jsoup.select("div.tab-content div a").forEachIndexed { index, element ->
+                val episode = SEpisode.create().apply {
+                    episode_number = (index + 1).toFloat()
+                    name = element.text()
+                    setUrlWithoutDomain(element.attr("abs:href"))
+                }
+                episodes.add(episode)
+            }
+        }
+        return episodes.reversed()
+    }
+
+    override fun episodeListSelector() = throw UnsupportedOperationException()
+
+    override fun episodeFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        val data = document.selectFirst("script:containsData(video[1] = )")?.data() ?: return emptyList()
+
+        // Extrae los enlaces de video de `video` en el script
+        val videoUrls = Regex("video\\[\\d+\\] = '([^']+)'").findAll(data)
+            .map { it.groupValues[1] }
+            .toList()
+
+        // Itera a través de los enlaces de video encontrados
+        videoUrls.forEach { videoUrl ->
+            runCatching {
+                // Ejecuta la solicitud para obtener el cuerpo de la página del enlace de video
+                val body = client.newCall(GET(videoUrl)).execute().asJsoup()
+
+                // Extrae el idioma correspondiente basado en el contexto
+
+                // Extrae y desencripta los enlaces con `extractNewExtractorLinks`
+                extractNewExtractorLinks(body, body.toString())?.forEach { (url, lang) ->
+                    runCatching {
+                        // Envía el enlace desencriptado y el idioma al resolver
+                        serverVideoResolver(url, lang).also { videoList.addAll(it) }
+                    }.onFailure {
+                        // Log para depuración si falla el proceso
+                        Log.e("videoListParse", "Error al procesar URL de video: $url", it)
+                    }
+                }
+            }.onFailure {
+                // Log para depuración si falla la solicitud de video
+                Log.e("videoListParse", "Error al obtener cuerpo de videoUrl: $videoUrl", it)
+            }
+        }
+
+        return videoList
+    }
+
+    private fun extractNewExtractorLinks(doc: Document, htmlContent: String): List<Pair<String, String>>? {
+        val links = mutableListOf<Pair<String, String>>()
+        val jsLinksMatch = getFirstMatch("""dataLink = (\[.+?\]);""".toRegex(), htmlContent)
+        if (jsLinksMatch.isEmpty()) return null
+
+        val items = Json.decodeFromString<List<Item>>(jsLinksMatch)
+
+        // Diccionario de idiomas
+        val idiomas = mapOf("LAT" to "[LAT]", "ESP" to "[CAST]", "SUB" to "[SUB]")
+
+        items.forEach { item ->
+            val languageCode = idiomas[item.video_language] ?: "unknown"
+
+            item.sortedEmbeds.forEach { embed ->
+                val decryptedLink = CryptoAES.decrypt(embed.link, "Ak7qrvvH4WKYxV2OgaeHAEg2a5eh16vE")
+                links.add(Pair(decryptedLink, languageCode))
+            }
+        }
+
+        return links.ifEmpty { null }
+    }
+
+    /*--------------------------------Video extractors------------------------------------*/
+    private val voeExtractor by lazy { VoeExtractor(client) }
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val filemoonExtractor by lazy { FilemoonExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val streamlareExtractor by lazy { StreamlareExtractor(client) }
+    private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
+    private val burstCloudExtractor by lazy { BurstCloudExtractor(client) }
+    private val fastreamExtractor by lazy { FastreamExtractor(client, headers) }
+    private val upstreamExtractor by lazy { UpstreamExtractor(client) }
+    private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val streamSilkExtractor by lazy { StreamSilkExtractor(client) }
+    private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
+        return runCatching {
+            Log.d("SoloLatino", "URL: $url")
+            when {
+                arrayOf("voe").any(url) -> voeExtractor.videosFromUrl(url, "$prefix ")
+                arrayOf("ok.ru", "okru").any(url) -> okruExtractor.videosFromUrl(url, prefix)
+                arrayOf("filemoon", "moonplayer").any(url) -> filemoonExtractor.videosFromUrl(url, prefix = "$prefix Filemoon:")
+                !url.contains("disable") && (arrayOf("amazon", "amz").any(url)) -> {
+                    val body = client.newCall(GET(url)).execute().asJsoup()
+                    return if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                        val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                            .substringAfter("shareId = \"").substringBefore("\"")
+                        val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                            .execute().asJsoup()
+                        val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                        val amazonApi =
+                            client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                                .execute().asJsoup()
+                        val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                        listOf(Video(videoUrl, "$prefix Amazon", videoUrl))
+                    } else {
+                        emptyList()
+                    }
+                }
+                arrayOf("uqload").any(url) -> uqloadExtractor.videosFromUrl(url, prefix)
+                arrayOf("mp4upload").any(url) -> mp4uploadExtractor.videosFromUrl(url, headers, prefix = "$prefix ")
+                arrayOf("wishembed", "streamwish", "strwish", "wish").any(url) -> {
+                    streamWishExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" })
+                }
+                arrayOf("doodstream", "dood.", "ds2play", "doods.").any(url) -> {
+                    val url2 = url.replace("https://doodstream.com/e/", "https://d0000d.com/e/")
+                    doodExtractor.videosFromUrl(url2, "$prefix DoodStream")
+                }
+                arrayOf("streamlare").any(url) -> streamlareExtractor.videosFromUrl(url, prefix)
+                arrayOf("yourupload", "upload").any(url) -> yourUploadExtractor.videoFromUrl(url, headers = headers, prefix = "$prefix ")
+                arrayOf("burstcloud", "burst").any(url) -> burstCloudExtractor.videoFromUrl(url, headers = headers, prefix = "$prefix ")
+                arrayOf("fastream").any(url) -> fastreamExtractor.videosFromUrl(url, prefix = "$prefix Fastream:")
+                arrayOf("upstream").any(url) -> upstreamExtractor.videosFromUrl(url, prefix = "$prefix ")
+                arrayOf("streamsilk").any(url) -> streamSilkExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamSilk:$it" })
+                arrayOf("streamtape", "stp", "stape").any(url) -> streamTapeExtractor.videosFromUrl(url, quality = "$prefix StreamTape")
+                arrayOf("ahvsh", "streamhide", "guccihide", "streamvid", "vidhide").any(url) -> streamHideVidExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamHideVid:$it" })
+                arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url, prefix = "$prefix ")
+                else -> emptyList()
+            }
+        }.getOrNull() ?: emptyList()
+    }
+
+    private fun getFirstMatch(regex: Regex, input: String): String {
+        return regex.find(input)?.groupValues?.get(1) ?: ""
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+        val tagFilter = filterList.find { it is YearFilter } as YearFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/search?s=$query&page=$page", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/${genreFilter.toUriPart()}?page=$page")
+            tagFilter.state != 0 -> GET("$baseUrl/series?year=${tagFilter.toUriPart()}&page=$page")
+            else -> GET("$baseUrl/peliculas?page=$page")
+        }
+    }
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        return SAnime.create().apply {
+            title = document.selectFirst("h1.m-b-5")!!.text()
+            thumbnail_url = document.selectFirst("div.card-body div.row div.col-sm-3 img.img-fluid")!!
+                .attr("src").replace("/w154/", "/w500/")
+            description = document.selectFirst("div.col-sm-4 div.text-large")!!.ownText()
+            genre = document.select("div.p-v-20.p-h-15.text-center a span").joinToString { it.text() }
+            status = SAnime.COMPLETED
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = throw UnsupportedOperationException()
+
+    override fun latestUpdatesFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun latestUpdatesRequest(page: Int) = throw UnsupportedOperationException()
+
+    override fun latestUpdatesSelector() = throw UnsupportedOperationException()
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro de año"),
+        GenreFilter(),
+        AnimeFilter.Header("Busqueda por año"),
+        YearFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Géneros",
+        arrayOf(
+            Pair("<selecionar>", ""),
+            Pair("Peliculas", "peliculas"),
+            Pair("Series", "series"),
+            Pair("Doramas", "generos/dorama"),
+            Pair("Animes", "animes"),
+            Pair("Acción", "generos/accion"),
+            Pair("Animación", "generos/animacion"),
+            Pair("Aventura", "generos/aventura"),
+            Pair("Ciencia Ficción", "generos/ciencia-ficcion"),
+            Pair("Comedia", "generos/comedia"),
+            Pair("Crimen", "generos/crimen"),
+            Pair("Documental", "generos/documental"),
+            Pair("Drama", "generos/drama"),
+            Pair("Fantasía", "generos/fantasia"),
+            Pair("Foreign", "generos/foreign"),
+            Pair("Guerra", "generos/guerra"),
+            Pair("Historia", "generos/historia"),
+            Pair("Misterio", "generos/misterio"),
+            Pair("Pelicula de Televisión", "generos/pelicula-de-la-television"),
+            Pair("Romance", "generos/romance"),
+            Pair("Suspense", "generos/suspense"),
+            Pair("Terror", "generos/terror"),
+            Pair("Western", "generos/western"),
+        ),
+    )
+    private class YearFilter : UriPartFilter(
+        "Año",
+        arrayOf(Pair("<selecionar>", "")) +
+            (2024 downTo 1979).map {
+                Pair(it.toString(), it.toString())
+            }.toTypedArray(),
+    )
+
+    open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    @Serializable
+    data class Item(
+        val file_id: Int,
+        val video_language: String, // Campo nuevo para almacenar el idioma
+        val sortedEmbeds: List<Embed>,
+    )
+
+    @Serializable
+    data class Embed(
+        val servername: String,
+        val link: String,
+        val type: String,
+    )
+
+    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
+    }
+}
diff --git a/src/es/sololatino/build.gradle b/src/es/sololatino/build.gradle
new file mode 100644
index 00000000..e76f817a
--- /dev/null
+++ b/src/es/sololatino/build.gradle
@@ -0,0 +1,20 @@
+ext {
+    extName = 'SoloLatino'
+    extClass = '.SoloLatino'
+    themePkg = 'dooplay'
+    baseUrl = 'https://sololatino.net'
+    overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(":lib:streamwish-extractor"))
+    implementation(project(":lib:uqload-extractor"))
+    implementation(project(":lib:universal-extractor"))
+    implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(":lib:dood-extractor"))
+    implementation(project(':lib:cryptoaes'))
+}
\ No newline at end of file
diff --git a/src/es/sololatino/res/mipmap-hdpi/ic_launcher.png b/src/es/sololatino/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..3425bd2c
Binary files /dev/null and b/src/es/sololatino/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/sololatino/res/mipmap-mdpi/ic_launcher.png b/src/es/sololatino/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..c3b762c8
Binary files /dev/null and b/src/es/sololatino/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/sololatino/res/mipmap-xhdpi/ic_launcher.png b/src/es/sololatino/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..c4050b52
Binary files /dev/null and b/src/es/sololatino/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/sololatino/res/mipmap-xxhdpi/ic_launcher.png b/src/es/sololatino/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..ce5e048b
Binary files /dev/null and b/src/es/sololatino/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/sololatino/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/sololatino/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..9a1cfd82
Binary files /dev/null and b/src/es/sololatino/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/sololatino/src/eu/kanade/tachiyomi/animeextension/es/sololatino/SoloLatino.kt b/src/es/sololatino/src/eu/kanade/tachiyomi/animeextension/es/sololatino/SoloLatino.kt
new file mode 100644
index 00000000..d6751b9b
--- /dev/null
+++ b/src/es/sololatino/src/eu/kanade/tachiyomi/animeextension/es/sololatino/SoloLatino.kt
@@ -0,0 +1,510 @@
+package eu.kanade.tachiyomi.animeextension.es.sololatino
+
+import android.util.Base64
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.net.HttpURLConnection
+import java.net.URL
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class SoloLatino : DooPlay(
+    "es",
+    "SoloLatino",
+    "https://sololatino.net",
+) {
+    private val json by lazy { Json { ignoreUnknownKeys = true } }
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/tendencias/page/$page")
+
+    override fun popularAnimeSelector() = "article.item"
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/pelicula/estrenos/page/$page", headers)
+
+    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+
+    override fun latestUpdatesSelector() = popularAnimeSelector()
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        return SAnime.create().apply {
+            val img = element.selectFirst("img")!!
+            val url = element.selectFirst("a")?.attr("href") ?: element.attr("href")
+            setUrlWithoutDomain(url)
+            title = img.attr("alt")
+            thumbnail_url = img.attr("data-srcset")
+        }
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "div.pagMovidy a"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val doc = response.asJsoup()
+        val seasonList = doc.select("div#seasons div.se-c")
+        return if (seasonList.isEmpty()) {
+            SEpisode.create().apply {
+                setUrlWithoutDomain(doc.location())
+                episode_number = 1F
+                name = episodeMovieText
+                date_upload = doc.selectFirst("span.date")?.text()?.toDate() ?: 0L
+            }.let(::listOf)
+        } else {
+            seasonList.flatMap(::getSeasonEpisodes).reversed()
+        }
+    }
+
+    override fun getSeasonEpisodes(season: Element): List<SEpisode> {
+        val seasonName = season.attr("data-season")
+        return season.select("ul.episodios li").mapNotNull { element ->
+            runCatching {
+                episodeFromElement(element, seasonName)
+            }.onFailure { it.printStackTrace() }.getOrNull()
+        }
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
+
+    override fun episodeFromElement(element: Element, seasonName: String): SEpisode {
+        return SEpisode.create().apply {
+            val epNum = element.selectFirst("div.numerando")?.text()
+                ?.trim()
+                ?.let { episodeNumberRegex.find(it)?.groupValues?.last() } ?: "0"
+
+            val href = element.selectFirst("a[href]")!!.attr("href")
+            val episodeName = element.selectFirst("div.epst")?.text() ?: "Sin título"
+
+            episode_number = epNum.toFloatOrNull() ?: 0F
+            date_upload = element.selectFirst("span.date")?.text()?.toDate() ?: 0L
+
+            name = "T$seasonName - Episodio $epNum: $episodeName"
+            setUrlWithoutDomain(href)
+        }
+    }
+
+    override fun videoListSelector() = "li.dooplay_player_option"
+
+    override val episodeMovieText = "Película"
+
+    override val episodeSeasonPrefix = "Temporada"
+    override val prefQualityTitle = "Calidad preferida"
+
+    // ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val path = response.request.url.toString()
+        val links = mutableListOf<Pair<String, String>>()
+
+        runBlocking {
+            getLinks({ videoLinks -> links.addAll(videoLinks) }, { error ->
+                println("Error al obtener los enlaces: $error")
+            }, path)
+        }
+
+        if (links.isEmpty()) {
+            return emptyList()
+        }
+
+        return links.flatMap { (link, languageCode) ->
+            extractVideosSafely(link, languageCode)
+        }
+    }
+
+    private fun extractVideosSafely(link: String, languageCode: String): List<Video> {
+        return runCatching {
+            extractVideos(link, languageCode).sort()
+        }.onFailure { it.printStackTrace() }.getOrDefault(emptyList())
+    }
+
+    private suspend fun getLinks(after: (List<Pair<String, String>>) -> Unit, onError: (Throwable) -> Unit, path: String) {
+        try {
+            val result = httpGet(path)
+            val links = mutableListOf<Pair<String, String>>()
+
+            val linkPages = Regex("""data-type=["'](.+?)["'] data-post=["'](.+?)["'] data-nume=["'](.+?)["']""")
+                .findAll(result)
+                .toList()
+
+            coroutineScope {
+                val deferredResults = linkPages.map { matchResult ->
+                    async {
+                        processLinkPage(matchResult, path)
+                    }
+                }
+                deferredResults.awaitAll().forEach { newLinks ->
+                    links.addAll(newLinks)
+                }
+            }
+
+            if (links.isEmpty()) {
+                handleEmptyLinks(result, links)
+            }
+
+            after(links)
+        } catch (error: Throwable) {
+            onError(error)
+        }
+    }
+
+    private fun processLinkPage(matchResult: MatchResult, path: String): List<Pair<String, String>> {
+        return try {
+            val postParams = mapOf(
+                "action" to "doo_player_ajax",
+                "post" to (matchResult.groups[2]?.value ?: ""),
+                "nume" to (matchResult.groups[3]?.value ?: ""),
+                "type" to (matchResult.groups[1]?.value ?: ""),
+            )
+            val presp = httpPost("$baseUrl/wp-admin/admin-ajax.php", postParams, path)
+            val iframeUrl = getFirstMatch("""<iframe class='[^']+' src='([^']+)""".toRegex(), presp)
+            val bData = httpGet(iframeUrl)
+
+            parseLinks(bData)
+        } catch (e: Exception) {
+            emptyList()
+        }
+    }
+
+    private fun handleEmptyLinks(result: String, links: MutableList<Pair<String, String>>) {
+        val iframeUrl = Regex("""pframe"><iframe class="[^"]+" src="([^"]+)""").find(result)?.groups?.get(1)?.value
+        iframeUrl?.let { web ->
+            val newResult = httpGet(web)
+            links.addAll(parseLinks(newResult))
+
+            if (links.isEmpty() && web.contains("xyz")) {
+                links.add(Pair(web, "unknown"))
+            }
+        }
+    }
+
+    private fun httpRequest(
+        url: String,
+        method: String,
+        params: Map<String, String>? = null,
+        referer: String? = null,
+    ): String {
+        val urlObj = URL(url)
+        val connection = urlObj.openConnection() as HttpURLConnection
+        return try {
+            with(connection) {
+                requestMethod = method
+                setRequestProperty("User-Agent", "Mozilla/5.0")
+                referer?.let { setRequestProperty("Referer", it) }
+
+                if (method == "POST") {
+                    doOutput = true
+                    setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
+                    params?.let {
+                        val postData = it.map { entry -> "${entry.key}=${entry.value}" }.joinToString("&")
+                        outputStream.bufferedWriter().use { writer -> writer.write(postData) }
+                    }
+                }
+
+                inputStream.bufferedReader().use { it.readText() }
+            }
+        } catch (e: Exception) {
+            throw e
+        } finally {
+            connection.disconnect()
+        }
+    }
+
+    private fun httpGet(url: String): String {
+        return httpRequest(url, "GET")
+    }
+
+    private fun httpPost(url: String, params: Map<String, String>, referer: String): String {
+        return httpRequest(url, "POST", params, referer)
+    }
+
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+    private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+
+    private fun extractVideos(url: String, lang: String): List<Video> {
+        val vidHideDomains = listOf("vidhide", "VidHidePro", "luluvdo", "vidhideplus")
+        try {
+            val videos = vidHideDomains.firstOrNull { it in url }?.let { domain ->
+                streamHideVidExtractor.videosFromUrl(url, videoNameGen = { "$lang - $domain : $it" })
+            } ?: emptyList()
+            return when {
+                videos.isNotEmpty() -> videos
+                "streamwish" in url -> streamWishExtractor.videosFromUrl(url, lang)
+                "uqload" in url -> uqloadExtractor.videosFromUrl(url, lang)
+                "vidguard" in url -> vidGuardExtractor.videosFromUrl(url, lang)
+                "dood" in url -> doodExtractor.videosFromUrl(url, "$lang - ")
+                "voe" in url -> voeExtractor.videosFromUrl(url, "$lang - ")
+                else -> emptyList()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return emptyList()
+        }
+    }
+
+    private fun getFirstMatch(regex: Regex, input: String): String {
+        return regex.find(input)?.groupValues?.get(1) ?: ""
+    }
+
+    private fun parseLinks(htmlContent: String): List<Pair<String, String>> {
+        val links = mutableListOf<Pair<String, String>>()
+        val doc: Document = Jsoup.parse(htmlContent)
+
+        extractNewExtractorLinks(doc, htmlContent)?.let { newLinks ->
+            newLinks.forEach { links.add(it) }
+        }
+        extractOldExtractorLinks(doc)?.let { oldLinks ->
+            oldLinks.forEach { links.add(Pair(it, "unknown")) }
+        }
+
+        return links
+    }
+
+    private fun extractNewExtractorLinks(doc: Document, htmlContent: String): MutableList<Pair<String, String>>? {
+        val links = mutableListOf<Pair<String, String>>()
+        val jsLinksMatch = getFirstMatch("""dataLink = (\[.+?\]);""".toRegex(), htmlContent)
+        if (jsLinksMatch.isEmpty()) return null
+
+        val items = Json.decodeFromString<List<Item>>(jsLinksMatch)
+
+        // Diccionario de idiomas
+        val idiomas = mapOf("LAT" to "[LAT]", "ESP" to "[CAST]", "SUB" to "[SUB]")
+
+        items.forEach { item ->
+            val languageCode = idiomas[item.video_language] ?: "unknown"
+
+            item.sortedEmbeds.forEach { embed ->
+                val decryptedLink = CryptoAES.decrypt(embed.link, "Ak7qrvvH4WKYxV2OgaeHAEg2a5eh16vE")
+                links.add(Pair(decryptedLink, languageCode))
+            }
+        }
+
+        return links.ifEmpty { null }
+    }
+
+    private fun extractOldExtractorLinks(doc: Document): List<String>? {
+        val links = mutableListOf<String>()
+        doc.getElementsByTag("li").forEach { link ->
+            runCatching {
+                val onclickAttr = link.attr("onclick")
+                val decoded = getFirstMatch("""\.php\?link=(.+?)&servidor=""".toRegex(), onclickAttr)
+                links.add(String(Base64.decode(decoded, Base64.DEFAULT)))
+
+                extractPlayerLink(onclickAttr, """go_to_playerVast\('(.+?)'""")?.let { links.add(it) }
+                extractPlayerLink(onclickAttr, """go_to_player\('(.+?)'""")?.let { links.add(it) }
+            }.onFailure {
+                Log.e("SoloLatino", "Error al procesar enlace antiguo: ${it.message}")
+            }
+        }
+        return links.ifEmpty { null }
+    }
+
+    private fun extractPlayerLink(onclickAttr: String, pattern: String): String? {
+        return pattern.toRegex().find(onclickAttr)?.groupValues?.get(1)
+    }
+
+    // ============================== Filters ===============================
+    override val fetchGenres = false
+    override fun getFilterList() = SoloLatinoFilters.FILTER_LIST
+
+    // ============================== Search ================================
+
+    override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+
+    override fun searchAnimeSelector() = popularAnimeSelector()
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = SoloLatinoFilters.getSearchParameters(filters)
+        val path = when {
+            params.genre.isNotBlank() -> {
+                when (params.genre) {
+                    "animes" -> "/genres_animes"
+                    "peliculas" -> "/genres"
+                    "series" -> "/genres_series"
+                    "tendencias", "ratings", "genre_series/toons" -> "/${params.genre}"
+                    else -> "/genres/${params.genre}"
+                }
+            }
+            params.platform.isNotBlank() -> "/network/${params.platform}"
+            params.year.isNotBlank() -> "/year/${params.year}"
+            else -> buildString {
+                append(
+                    when {
+                        query.isNotBlank() -> "/?s=$query"
+                        else -> "/"
+                    },
+                )
+
+                append(
+                    when (params.type) {
+                        "serie" -> "series"
+                        "pelicula" -> "peliculas"
+                        "anime" -> "animes"
+                        "toon" -> "genre_series/toons"
+                        "todos" -> ""
+                        else -> "tendencias"
+                    },
+
+                )
+
+                if (params.isInverted) append("&orden=asc")
+            }
+        }
+
+        return if (path.startsWith("/?s=")) {
+            GET("$baseUrl/page/$page$path")
+        } else {
+            GET("$baseUrl$path/page/$page")
+        }
+    }
+
+    // ============================= Details ================================
+    override val additionalInfoSelector = "#single > div.content > div.wp-content"
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val doc = getRealAnimeDoc(document)
+        val sheader = doc.selectFirst("div.sheader")!!
+        return SAnime.create().apply {
+            setUrlWithoutDomain(doc.location())
+            sheader.selectFirst("div.poster > img")!!.let {
+                thumbnail_url = it.getImageUrl()
+                title = it.attr("alt").ifEmpty {
+                    sheader.selectFirst("div.data > h1")!!.text()
+                }
+            }
+
+            genre = sheader.select("div.data > div.sgeneros > a")
+                .eachText()
+                .joinToString()
+
+            doc.selectFirst(additionalInfoSelector)?.let { info ->
+                description = buildString {
+                    append(doc.getDescription())
+                    additionalInfoItems.forEach {
+                        info.getInfo(it)?.let(::append)
+                    }
+                }
+            }
+        }
+    }
+
+    // ============================= Serialization ===========================
+    @Serializable
+    data class Item(
+        val file_id: Int,
+        val video_language: String, // Campo nuevo para almacenar el idioma
+        val sortedEmbeds: List<Embed>,
+    )
+
+    @Serializable
+    data class Embed(
+        val servername: String,
+        val link: String,
+        val type: String,
+    )
+
+    // ============================= Preferences ============================
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        super.setupPreferenceScreen(screen) // Quality preference
+
+        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)
+
+        val langPref = ListPreference(screen.context).apply {
+            key = PREF_LANG_KEY
+            title = PREF_LANG_TITLE
+            entries = PREF_LANG_ENTRIES
+            entryValues = PREF_LANG_VALUES
+            setDefaultValue(PREF_LANG_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()
+            }
+        }
+        screen.addPreference(langPref)
+    }
+
+    // ============================= Utilities ==============================
+
+    override fun String.toDate(): Long {
+        return try {
+            val dateFormat = SimpleDateFormat("MMM. dd, yyyy", Locale.ENGLISH)
+            val date = dateFormat.parse(this)
+            date?.time ?: 0L
+        } catch (e: Exception) {
+            0L
+        }
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(prefQualityKey, prefQualityDefault)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANG_TITLE, PREF_LANG_DEFAULT)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+            ),
+        ).reversed()
+    }
+
+    override val prefQualityValues = arrayOf("480p", "720p", "1080p")
+    override val prefQualityEntries = prefQualityValues
+
+    companion object {
+        private const val PREF_LANG_KEY = "preferred_lang"
+        private const val PREF_LANG_TITLE = "Preferred language"
+        private const val PREF_LANG_DEFAULT = "[LAT]"
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "StreamWish"
+        private val SERVER_LIST = arrayOf("StreamWish", "Uqload", "VidGuard", "Dood", "StreamHideVid", "Voe, VidHide, Luluvdo, VidHidePro, VidHidePlus")
+        private val PREF_LANG_ENTRIES = arrayOf("[LAT]", "[SUB]", "[CAST]")
+        private val PREF_LANG_VALUES = arrayOf("[LAT]", "[SUB]", "[CAST]")
+    }
+}
diff --git a/src/es/sololatino/src/eu/kanade/tachiyomi/animeextension/es/sololatino/SoloLatinoFilters.kt b/src/es/sololatino/src/eu/kanade/tachiyomi/animeextension/es/sololatino/SoloLatinoFilters.kt
new file mode 100644
index 00000000..daedd60a
--- /dev/null
+++ b/src/es/sololatino/src/eu/kanade/tachiyomi/animeextension/es/sololatino/SoloLatinoFilters.kt
@@ -0,0 +1,140 @@
+package eu.kanade.tachiyomi.animeextension.es.sololatino
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object SoloLatinoFilters {
+
+    open class UriPartFilter(
+        displayName: String,
+        private val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+
+        fun toUriPart() = vals[state].second
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return first { it is R } as R
+    }
+
+    private inline fun <reified R> AnimeFilterList.asUriPart(): String {
+        return getFirst<R>().let {
+            (it as UriPartFilter).toUriPart()
+        }
+    }
+
+    class InvertedResultsFilter : AnimeFilter.CheckBox("Invertir resultados", false)
+    class TypeFilter : UriPartFilter("Tipo", AnimesOnlineNinjaData.TYPES)
+
+    class GenreFilter : UriPartFilter("Generos", AnimesOnlineNinjaData.GENRES)
+    class PlatformFilter : UriPartFilter("Plataformas", AnimesOnlineNinjaData.PLATFORMS)
+    class YearFilter : UriPartFilter("Año", AnimesOnlineNinjaData.YEARS)
+
+    class OtherOptionsGroup : AnimeFilter.Group<UriPartFilter>(
+        "Otros filtros",
+        listOf(
+            GenreFilter(),
+            PlatformFilter(),
+            YearFilter(),
+        ),
+    )
+
+    private inline fun <reified R> AnimeFilter.Group<UriPartFilter>.getItemUri(): String {
+        return state.first { it is R }.toUriPart()
+    }
+
+    val FILTER_LIST get() = AnimeFilterList(
+        InvertedResultsFilter(),
+        TypeFilter(),
+        AnimeFilter.Separator(),
+        AnimeFilter.Header("Estos filtros no afectan a la busqueda por texto"),
+        OtherOptionsGroup(),
+    )
+
+    data class FilterSearchParams(
+        val isInverted: Boolean = false,
+        val type: String = "",
+        val genre: String = "",
+        val platform: String = "",
+        val year: String = "",
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        val others = filters.getFirst<OtherOptionsGroup>()
+
+        return FilterSearchParams(
+            filters.getFirst<InvertedResultsFilter>().state,
+            filters.asUriPart<TypeFilter>(),
+            others.getItemUri<GenreFilter>(),
+            others.getItemUri<PlatformFilter>(),
+            others.getItemUri<YearFilter>(),
+        )
+    }
+
+    private object AnimesOnlineNinjaData {
+        val EVERY = Pair("Seleccionar", "")
+
+        val TYPES = arrayOf(
+            Pair("Todos", "todos"),
+            Pair("Series", "serie"),
+            Pair("Peliculas", "pelicula"),
+            Pair("Animes", "anime"),
+            Pair("Toons", "toon"),
+        )
+
+        val GENRES = arrayOf(
+            EVERY,
+            Pair("accion", "accion"),
+            Pair("action-adventure", "action-adventure"),
+            Pair("animacion", "animacion"),
+            Pair("aventura", "aventura"),
+            Pair("bajalogratis", "bajalogratis"),
+            Pair("belica", "belica"),
+            Pair("ciencia-ficcion", "ciencia-ficcion"),
+            Pair("comedia", "comedia"),
+            Pair("crimen", "crimen"),
+            Pair("disney", "disney"),
+            Pair("documental", "documental"),
+            Pair("don-torrent", "don-torrent"),
+            Pair("drama", "drama"),
+            Pair("familia", "familia"),
+            Pair("fantasia", "fantasia"),
+            Pair("gran-torrent", "gran-torrent"),
+            Pair("hbo", "hbo"),
+            Pair("historia", "historia"),
+            Pair("kids", "kids"),
+            Pair("misterio", "misterio"),
+            Pair("musica", "musica"),
+            Pair("romance", "romance"),
+            Pair("sci-fi-fantasy", "sci-fi-fantasy"),
+            Pair("series-de-amazon-prime-video", "series-de-amazon-prime-video"),
+            Pair("soap", "soap"),
+            Pair("suspense", "suspense"),
+            Pair("talk", "talk"),
+            Pair("terror", "terror"),
+            Pair("war-politics", "war-politics"),
+            Pair("western", "western"),
+        )
+
+        val PLATFORMS = arrayOf(
+            EVERY,
+            Pair("Amazon-Prime-Video", "amazon"),
+            Pair("Netflix", "netflix"),
+            Pair("Apple-TV", "apple"),
+            Pair("Disney-Plus", "disney"),
+            Pair("HBO", "hbo"),
+            Pair("Hulu", "hulu"),
+            Pair("HBO-Max", "hbo-max"),
+
+        )
+
+        val YEARS = arrayOf(EVERY) + (2024 downTo 1979).map {
+            Pair(it.toString(), it.toString())
+        }.toTypedArray()
+    }
+}
diff --git a/src/es/tioanimeh/build.gradle b/src/es/tioanimeh/build.gradle
index 6a419ce0..5d1bbf53 100644
--- a/src/es/tioanimeh/build.gradle
+++ b/src/es/tioanimeh/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'TioanimeH'
     extClass = '.TioanimeHFactory'
-    extVersionCode = 21
+    extVersionCode = 24
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,5 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt b/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
index b8ec5a4c..68549e89 100644
--- a/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
+++ b/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -94,6 +95,7 @@ open class TioanimeH(override val name: String, override val baseUrl: String) :
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val mixDropExtractor by lazy { MixDropExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -112,7 +114,7 @@ open class TioanimeH(override val name: String, override val baseUrl: String) :
                 "okru" -> okruExtractor.videosFromUrl(serverUrl)
                 "yourupload" -> yourUploadExtractor.videoFromUrl(serverUrl, headers = headers)
                 "mixdrop" -> mixDropExtractor.videosFromUrl(serverUrl)
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(serverUrl, headers)
             }
         }
     }
diff --git a/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/VidGuardExtractor.kt b/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/VidGuardExtractor.kt
new file mode 100644
index 00000000..04d9ad74
--- /dev/null
+++ b/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/VidGuardExtractor.kt
@@ -0,0 +1,124 @@
+package eu.kanade.tachiyomi.animeextension.es.tioanimeh.extractors
+
+import android.app.Application
+import android.os.Handler
+import android.os.Looper
+import android.util.Base64
+import android.webkit.JavascriptInterface
+import android.webkit.WebSettings
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class VidGuardExtractor(private val client: OkHttpClient) {
+    private val context: Application by injectLazy()
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+
+    class JsObject(private val latch: CountDownLatch) {
+        var payload: String = ""
+
+        @JavascriptInterface
+        fun passPayload(passedPayload: String) {
+            payload = passedPayload
+            latch.countDown()
+        }
+    }
+
+    fun videosFromUrl(url: String): List<Video> {
+        val doc = client.newCall(GET(url)).execute().asJsoup()
+        val scriptUrl = doc.selectFirst("script[src*=ad/plugin]")
+            ?.absUrl("src")
+            ?: return emptyList()
+
+        val headers = Headers.headersOf("Referer", url)
+        val script = client.newCall(GET(scriptUrl, headers)).execute()
+            .body.string()
+
+        val sources = getSourcesFromScript(script, url)
+            .takeIf { it.isNotBlank() && it != "undefined" }
+            ?: return emptyList()
+
+        return sources.substringAfter("stream:[").substringBefore("}]")
+            .split('{')
+            .drop(1)
+            .mapNotNull { line ->
+                val resolution = line.substringAfter("Label\":\"").substringBefore('"')
+                val videoUrl = line.substringAfter("URL\":\"").substringBefore('"')
+                    .takeIf(String::isNotBlank)
+                    ?.let(::fixUrl)
+                    ?: return@mapNotNull null
+                Video(videoUrl, "VidGuard:$resolution", videoUrl, headers)
+            }
+    }
+
+    private fun getSourcesFromScript(script: String, url: String): String {
+        val latch = CountDownLatch(1)
+
+        var webView: WebView? = null
+
+        val jsinterface = JsObject(latch)
+
+        handler.post {
+            val webview = WebView(context)
+            webView = webview
+            with(webview.settings) {
+                javaScriptEnabled = true
+                domStorageEnabled = true
+                databaseEnabled = true
+                useWideViewPort = false
+                loadWithOverviewMode = false
+                cacheMode = WebSettings.LOAD_NO_CACHE
+            }
+
+            webview.addJavascriptInterface(jsinterface, "android")
+            webview.webViewClient = object : WebViewClient() {
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    view?.clearCache(true)
+                    view?.clearFormData()
+                    view?.evaluateJavascript(script) {}
+                    view?.evaluateJavascript("window.android.passPayload(JSON.stringify(window.svg))") {}
+                }
+            }
+
+            webview.loadDataWithBaseURL(url, "<html></html>", "text/html", "UTF-8", null)
+        }
+
+        latch.await(5, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+            webView = null
+        }
+
+        return jsinterface.payload
+    }
+
+    private fun fixUrl(url: String): String {
+        val httpUrl = url.toHttpUrl()
+        val originalSign = httpUrl.queryParameter("sig")!!
+        val newSign = originalSign.chunked(2).joinToString("") {
+            Char(it.toInt(16) xor 2).toString()
+        }
+            .let { String(Base64.decode(it, Base64.DEFAULT)) }
+            .substring(5)
+            .chunked(2)
+            .reversed()
+            .joinToString("")
+            .substring(5)
+
+        return httpUrl.newBuilder()
+            .removeAllQueryParameters("sig")
+            .addQueryParameter("sig", newSign)
+            .build()
+            .toString()
+    }
+}
diff --git a/src/es/tiodonghua/build.gradle b/src/es/tiodonghua/build.gradle
index 6e4ccf90..fbefcff5 100644
--- a/src/es/tiodonghua/build.gradle
+++ b/src/es/tiodonghua/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Tiodonghua'
     themePkg = 'animestream'
     baseUrl = 'https://anime.tiodonghua.com'
-    overrideVersionCode = 5
+    overrideVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/veranimes/build.gradle b/src/es/veranimes/build.gradle
index 7948f420..0f7fb204 100644
--- a/src/es/veranimes/build.gradle
+++ b/src/es/veranimes/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'VerAnimes'
     extClass = '.VerAnimes'
-    extVersionCode = 6
+    extVersionCode = 9
 }
 
 apply from: "$rootDir/common.gradle"
@@ -13,4 +13,5 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt b/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt
index 7adf0f8e..231cb925 100644
--- a/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt
+++ b/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt
@@ -14,6 +14,7 @@ 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.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -161,10 +162,11 @@ class VerAnimes : ConfigurableAnimeSource, AnimeHttpSource() {
     /*--------------------------------Video extractors------------------------------------*/
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
     private val voeExtractor by lazy { VoeExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         return when {
@@ -175,7 +177,7 @@ class VerAnimes : ConfigurableAnimeSource, AnimeHttpSource() {
             arrayOf("voe").any(url) -> voeExtractor.videosFromUrl(url)
             arrayOf("yourupload", "upload").any(url) -> yourUploadExtractor.videoFromUrl(url, headers = headers)
             arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/verseriesonline/AndroidManifest.xml b/src/es/verseriesonline/AndroidManifest.xml
new file mode 100644
index 00000000..55938ea1
--- /dev/null
+++ b/src/es/verseriesonline/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".es.verseriesonline.VerSeriesOnlineUrlActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="www.verseriesonline.net"
+                    android:pathPattern="/anime/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/src/es/verseriesonline/build.gradle b/src/es/verseriesonline/build.gradle
new file mode 100644
index 00000000..d496d49a
--- /dev/null
+++ b/src/es/verseriesonline/build.gradle
@@ -0,0 +1,16 @@
+ext {
+    extName = 'VerSeriesOnline'
+    extClass = '.VerSeriesOnline'
+    extVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:streamwish-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:vudeo-extractor'))
+}
\ No newline at end of file
diff --git a/src/es/verseriesonline/res/mipmap-hdpi/ic_launcher.png b/src/es/verseriesonline/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..eb4a077b
Binary files /dev/null and b/src/es/verseriesonline/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/verseriesonline/res/mipmap-mdpi/ic_launcher.png b/src/es/verseriesonline/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..eaaf0534
Binary files /dev/null and b/src/es/verseriesonline/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/verseriesonline/res/mipmap-xhdpi/ic_launcher.png b/src/es/verseriesonline/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..da245823
Binary files /dev/null and b/src/es/verseriesonline/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/verseriesonline/res/mipmap-xxhdpi/ic_launcher.png b/src/es/verseriesonline/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..7981f8b6
Binary files /dev/null and b/src/es/verseriesonline/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/verseriesonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/verseriesonline/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..4acac136
Binary files /dev/null and b/src/es/verseriesonline/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/verseriesonline/src/eu/kanade/tachiyomi/animeextension/es/verseriesonline/VerSeriesOnline.kt b/src/es/verseriesonline/src/eu/kanade/tachiyomi/animeextension/es/verseriesonline/VerSeriesOnline.kt
new file mode 100644
index 00000000..c27cb2d2
--- /dev/null
+++ b/src/es/verseriesonline/src/eu/kanade/tachiyomi/animeextension/es/verseriesonline/VerSeriesOnline.kt
@@ -0,0 +1,431 @@
+package eu.kanade.tachiyomi.animeextension.es.verseriesonline
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Cookie
+import okhttp3.FormBody
+import okhttp3.Request
+import okhttp3.Response
+import org.json.JSONObject
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class VerSeriesOnline : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "VerSeriesOnline"
+
+    override val baseUrl = "https://www.verseriesonline.net"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeRequest(page: Int): Request {
+        return GET("$baseUrl/series-online/page/$page", headers)
+    }
+
+    override fun popularAnimeSelector(): String {
+        return "div.short.gridder-list"
+    }
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.selectFirst("a.short_img")!!.attr("href"))
+        anime.title = element.selectFirst("div.short_title a")!!.text()
+        val image = element.selectFirst("a.short_img img")!!.attr("data-src")
+        anime.thumbnail_url = "$baseUrl/$image"
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String {
+        return ".navigation a:last-of-type"
+    }
+
+    override fun latestUpdatesRequest(page: Int): Request {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesSelector(): String {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        throw UnsupportedOperationException()
+    }
+
+    override fun latestUpdatesNextPageSelector(): String? {
+        throw UnsupportedOperationException()
+    }
+
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
+        return if (query.startsWith(PREFIX_SEARCH)) {
+            val id = query.removePrefix(PREFIX_SEARCH)
+            client.newCall(GET("$baseUrl/recherche?q=$id", headers))
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
+        } else {
+            val url = buildSearchUrl(query, page, filters)
+            client.newCall(GET(url, headers)).awaitSuccess().use { response ->
+                val document = response.asJsoup()
+                val animeList = document.select(searchAnimeSelector()).map { element ->
+                    searchAnimeFromElement(element)
+                }
+                val hasNextPage = searchAnimeNextPageSelector().let {
+                    document.select(it).isNotEmpty()
+                }
+
+                AnimesPage(animeList, hasNextPage)
+            }
+        }
+    }
+
+    private fun buildSearchUrl(query: String, page: Int, filters: AnimeFilterList): String {
+        val genreFilter = filters.find { it is GenreFilter } as? GenreFilter
+        val yearFilter = filters.find { it is YearFilter } as? YearFilter
+        val genre = genreFilter?.toUriPart() ?: ""
+        val year = yearFilter?.toUriPart() ?: ""
+
+        return if (query.isNotEmpty()) {
+            "$baseUrl/recherche?q=$query&page=$page"
+        } else if (year != "" && genre == "") {
+            "$baseUrl/series-online/ano/$year/page/$page"
+        } else {
+            "$baseUrl/series-online/genero/$genre/page/$page"
+        }
+    }
+
+    private fun searchAnimeByIdParse(response: Response): AnimesPage {
+        val details = animeDetailsParse(response.asJsoup())
+            .apply {
+                setUrlWithoutDomain(response.request.url.toString())
+                initialized = true
+            }
+        return AnimesPage(listOf(details), false)
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        return GET("$baseUrl/recherche?q=$query&page=$page", headers)
+    }
+
+    override fun searchAnimeSelector(): String {
+        return popularAnimeSelector()
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        return popularAnimeFromElement(element)
+    }
+
+    override fun searchAnimeNextPageSelector(): String {
+        return popularAnimeNextPageSelector()
+    }
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+
+        anime.thumbnail_url = document.selectFirst("img.lazy-loaded")?.attr("data-src")
+        anime.description = document.selectFirst("div.full_content-desc p span")?.text() ?: "Descripción no encontrada"
+        anime.genre = document.select("ul#full_info li.vis span:contains(Genre:) + a")
+            .joinToString(", ") { it.text() }
+        anime.author = document.select("ul#full_info li.vis span:contains(Director:) + a").text()
+        anime.status = SAnime.UNKNOWN
+
+        return anime
+    }
+
+    override fun episodeListSelector(): String {
+        return "div.seasontab div.floats a.th-hover"
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        throw UnsupportedOperationException()
+    }
+
+    private fun seasonListSelector(): String {
+        return "div.floats a"
+    }
+
+    private fun seasonEpisodesSelector(): String {
+        return "#dle-content > article > div > div:nth-child(3) > div > div > a"
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episodeList = mutableListOf<SEpisode>()
+
+        document.select(seasonListSelector()).forEach { seasonElement ->
+            val seasonUrl = seasonElement.attr("href")
+            val seasonNumber = Regex("temporada-(\\d+)").find(seasonUrl)?.groups?.get(1)?.value?.toIntOrNull() ?: 1
+            val seasonDocument = client.newCall(GET(seasonUrl)).execute().asJsoup()
+
+            seasonDocument.select(seasonEpisodesSelector()).forEach { episodeElement ->
+                val episode = SEpisode.create()
+                val episodeUrl = episodeElement.attr("href")
+                episode.setUrlWithoutDomain(episodeUrl)
+                val episodeName = episodeElement.selectFirst("span.name")?.text()?.trim() ?: "Episodio desconocido"
+                episode.name = "Temporada $seasonNumber - $episodeName"
+                val episodeNumber = Regex("Capítulo (\\d+)").find(episodeName)?.groups?.get(1)?.value?.toFloatOrNull() ?: 0F
+                episode.episode_number = episodeNumber
+                episodeList.add(episode)
+            }
+        }
+
+        return episodeList
+    }
+
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
+    private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val vudeoExtractor by lazy { VudeoExtractor(client) }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+
+        val csrfToken = document.select("meta[name=csrf-token]")
+            .firstOrNull()
+            ?.attr("content")
+            ?: return videoList
+
+        val cookies = response.headers("Set-Cookie")
+            .mapNotNull { Cookie.parse(response.request.url, it) }
+
+        val cookieBuilder = StringBuilder()
+        cookies.forEach { cookie ->
+            cookieBuilder.append("${cookie.name}=${cookie.value}; ")
+        }
+        val cookieString = cookieBuilder.toString().trimEnd(' ', ';')
+
+        document.select(".undervideo .player-list li").forEach { liElement ->
+            try {
+                liElement.selectFirst("div.lien")?.let { div ->
+                    val dataHash = div.attr("data-hash")
+                    val serverText = div.selectFirst(".serv")?.text() ?: "Unknown Server"
+
+                    val language = when {
+                        div.select("img[src*=lat]").isNotEmpty() ||
+                            serverText.contains("latino", ignoreCase = true) -> "Latino"
+
+                        div.select("img[src*=esp]").isNotEmpty() ||
+                            serverText.contains("castellano", ignoreCase = true) ||
+                            serverText.contains("español", ignoreCase = true) -> "Castellano"
+
+                        div.select("img[src*=subesp]").isNotEmpty() ||
+                            serverText.contains("subtitulado", ignoreCase = true) ||
+                            serverText.contains("sub", ignoreCase = true) ||
+                            serverText.contains("vose", ignoreCase = true) -> "VOSE"
+
+                        else -> "Unknown"
+                    }
+
+                    if (dataHash.isNotEmpty()) {
+                        val request = Request.Builder()
+                            .url("https://www.verseriesonline.net/hashembedlink")
+                            .post(
+                                FormBody.Builder()
+                                    .add("hash", dataHash)
+                                    .add("_token", csrfToken)
+                                    .build(),
+                            )
+                            .addHeader("X-Requested-With", "XMLHttpRequest")
+                            .addHeader("X-CSRF-TOKEN", csrfToken)
+                            .addHeader("Cookie", cookieString)
+                            .addHeader("Referer", response.request.url.toString())
+                            .addHeader("Accept", "application/json, text/plain, */*")
+                            .addHeader("Accept-Language", "es-ES,es;q=0.9")
+                            .addHeader("Origin", "https://www.verseriesonline.net")
+                            .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36")
+                            .addHeader("sec-ch-ua", "\"Google Chrome\";v=\"119\", \"Chromium\";v=\"119\", \"Not?A_Brand\";v=\"24\"")
+                            .addHeader("sec-ch-ua-mobile", "?0")
+                            .addHeader("sec-ch-ua-platform", "\"Windows\"")
+                            .addHeader("Sec-Fetch-Dest", "empty")
+                            .addHeader("Sec-Fetch-Mode", "cors")
+                            .addHeader("Sec-Fetch-Site", "same-origin")
+                            .build()
+
+                        Thread.sleep(1000)
+
+                        client.newCall(request).execute().use { videoResponse ->
+                            val responseBody = videoResponse.body.string()
+
+                            if (!videoResponse.isSuccessful) {
+                                return@let
+                            }
+
+                            val jsonResponse = JSONObject(responseBody)
+                            val videoUrl = jsonResponse.optString("link")
+                            if (videoUrl.isNotEmpty()) {
+                                val extractedVideos = when {
+                                    videoUrl.contains("dood") -> doodExtractor.videosFromUrl(videoUrl, quality = "$language - ")
+                                    videoUrl.contains("dwish") -> streamwishExtractor.videosFromUrl(videoUrl, prefix = "$language - ")
+                                    videoUrl.contains("streamtape") -> streamtapeExtractor.videosFromUrl(videoUrl, quality = "$language - StreamTape")
+                                    videoUrl.contains("voe") -> voeExtractor.videosFromUrl(videoUrl, prefix = "$language - ")
+                                    videoUrl.contains("uqload") -> uqloadExtractor.videosFromUrl(videoUrl, prefix = "$language - ")
+                                    videoUrl.contains("vudeo") -> vudeoExtractor.videosFromUrl(videoUrl, prefix = "$language - ")
+                                    else -> emptyList()
+                                }
+
+                                videoList.addAll(extractedVideos)
+                            }
+                        }
+                    }
+                }
+            } catch (_: Exception) {
+            }
+        }
+
+        return videoList
+    }
+
+    override fun videoListSelector() = ".undervideo .player-list li"
+
+    override fun videoFromElement(element: Element): Video {
+        throw UnsupportedOperationException("Not used")
+    }
+
+    override fun videoUrlParse(document: Document): String {
+        throw UnsupportedOperationException("Not used")
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter(),
+        YearFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Género",
+        arrayOf(
+            Pair("<Seleccionar>", ""),
+            Pair("Drama", "drama"),
+            Pair("Comedia", "comedia"),
+            Pair("Animación", "animacion"),
+            Pair("Sci-Fi", "scifi"),
+            Pair("Fantasy", "fantasy"),
+            Pair("Action", "accion"),
+            Pair("Adventure", "aventura"),
+            Pair("Crimen", "crimen"),
+            Pair("Misterio", "misterio"),
+            Pair("Documental", "documental"),
+            Pair("Familia", "familia"),
+            Pair("Kids", "kids"),
+            Pair("Reality", "reality"),
+            Pair("War", "war"),
+            Pair("Politics", "politics"),
+        ),
+    )
+    private class YearFilter : UriPartFilter(
+        "Año",
+        arrayOf(Pair("<Seleccionar>", "")) + (2024 downTo 1950).map { Pair(it.toString(), it.toString()) }.toTypedArray(),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { 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_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_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_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)
+    }
+
+    companion object {
+        const val PREFIX_SEARCH = "id:"
+
+        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_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "Latino"
+        private val LANGUAGE_LIST = arrayOf("Latino", "Castellano", "VOSE")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf("Voe", "StreamTape", "Uqload", "Vudeo", "StreamWish", "Dood")
+    }
+}
diff --git a/src/es/verseriesonline/src/eu/kanade/tachiyomi/animeextension/es/verseriesonline/VerSeriesOnlineUrlActivity.kt b/src/es/verseriesonline/src/eu/kanade/tachiyomi/animeextension/es/verseriesonline/VerSeriesOnlineUrlActivity.kt
new file mode 100644
index 00000000..053d7e94
--- /dev/null
+++ b/src/es/verseriesonline/src/eu/kanade/tachiyomi/animeextension/es/verseriesonline/VerSeriesOnlineUrlActivity.kt
@@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.animeextension.es.verseriesonline
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+
+/**
+ * Springboard that accepts https://www.verseriesonline.net/anime/<item> intents
+ * and redirects them to the main Aniyomi process.
+ */
+class VerSeriesOnlineUrlActivity : Activity() {
+
+    private val tag = javaClass.simpleName
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null && pathSegments.size > 1) {
+            val item = pathSegments[1]
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", "${VerSeriesOnline.PREFIX_SEARCH}$item")
+                putExtra("filter", packageName)
+            }
+
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {
+                Log.e(tag, e.toString())
+            }
+        } else {
+            Log.e(tag, "could not parse uri from intent $intent")
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/es/zeroanime/build.gradle b/src/es/zeroanime/build.gradle
new file mode 100644
index 00000000..0a4a650a
--- /dev/null
+++ b/src/es/zeroanime/build.gradle
@@ -0,0 +1,16 @@
+ext {
+    extName = 'zeroanime'
+    extClass = '.Zeroanime'
+    extVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:universal-extractor'))
+    implementation(project(':lib:streamvid-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:mp4upload-extractor'))
+
+}
diff --git a/src/es/zeroanime/res/mipmap-hdpi/ic_launcher.png b/src/es/zeroanime/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..1dcd59d9
Binary files /dev/null and b/src/es/zeroanime/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/zeroanime/res/mipmap-mdpi/ic_launcher.png b/src/es/zeroanime/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..72f91b32
Binary files /dev/null and b/src/es/zeroanime/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/zeroanime/res/mipmap-xhdpi/ic_launcher.png b/src/es/zeroanime/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..aefb7eca
Binary files /dev/null and b/src/es/zeroanime/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/zeroanime/res/mipmap-xxhdpi/ic_launcher.png b/src/es/zeroanime/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..de7486aa
Binary files /dev/null and b/src/es/zeroanime/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/zeroanime/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/zeroanime/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..86044219
Binary files /dev/null and b/src/es/zeroanime/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/zeroanime/src/eu/kanade/tachiyomi/animeextension/es/zeroanime/ZeroAnimeFilters.kt b/src/es/zeroanime/src/eu/kanade/tachiyomi/animeextension/es/zeroanime/ZeroAnimeFilters.kt
new file mode 100644
index 00000000..3d1386bf
--- /dev/null
+++ b/src/es/zeroanime/src/eu/kanade/tachiyomi/animeextension/es/zeroanime/ZeroAnimeFilters.kt
@@ -0,0 +1,148 @@
+package eu.kanade.tachiyomi.animeextension.es.zeroanime
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter.CheckBox
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import java.util.Calendar
+
+object ZeroAnimeFilters {
+    open class QueryPartFilter(displayName: String, val vals: Array<Pair<String, String>>) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart(name: String) = vals[state].second.takeIf { it.isNotEmpty() }?.let { "&$name=${vals[state].second}" } ?: run { "" }
+    }
+
+    open class CheckBoxFilterList(name: String, values: List<CheckBox>) : AnimeFilter.Group<CheckBox>(name, values)
+
+    private class CheckBoxVal(name: String, state: Boolean = false) : CheckBox(name, state)
+
+    private inline fun <reified R> AnimeFilterList.parseCheckbox(
+        options: Array<Pair<String, String>>,
+        name: String,
+    ): String {
+        return (this.getFirst<R>() as CheckBoxFilterList).state
+            .mapNotNull { checkbox ->
+                if (checkbox.state) {
+                    options.find { it.first == checkbox.name }!!.second
+                } else {
+                    null
+                }
+            }.joinToString("&$name[]=").let {
+                if (it.isBlank()) {
+                    ""
+                } else {
+                    "&$name[]=$it"
+                }
+            }
+    }
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(name: String): String {
+        return (this.getFirst<R>() as QueryPartFilter).toQueryPart(name)
+    }
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return this.filterIsInstance<R>().first()
+    }
+
+    private fun String.changePrefix() = this.takeIf { it.startsWith("&") }?.let { this.replaceFirst("&", "?") } ?: run { this }
+
+    data class FilterSearchParams(val filter: String = "") { fun getQuery() = filter.changePrefix() }
+
+    private fun Array<Pair<String, String>>.toCheckBoxVal(): List<CheckBox> = map { CheckBoxVal(it.first, false) }
+
+    private fun String.addSuffix(): String = takeIf { it.isNotBlank() } ?: this
+
+    internal fun getSearchParameters(filters: AnimeFilterList, origen: ZeroAnimeFiltersData.ORIGEN): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        val strFilter = buildString {
+            when (origen) {
+                ZeroAnimeFiltersData.ORIGEN.ANIME -> {
+                    append(filters.parseCheckbox<AnimeGenresFilter>(ZeroAnimeFiltersData.ANIME_GENRES, "genero"))
+                    append(filters.asQueryPart<YearsFilter>("years").addSuffix())
+                    append(filters.asQueryPart<StatesFilter>("estado"))
+                }
+            }
+        }
+
+        return FilterSearchParams(strFilter)
+    }
+
+    private val ANIME_FILTER_LIST get() = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        AnimeGenresFilter(),
+        YearsFilter(),
+        StatesFilter(),
+    )
+
+    fun getFilterList(origen: ZeroAnimeFiltersData.ORIGEN) = when (origen) {
+        ZeroAnimeFiltersData.ORIGEN.ANIME -> ANIME_FILTER_LIST
+    }
+
+    class AnimeGenresFilter : CheckBoxFilterList("Género", ZeroAnimeFiltersData.ANIME_GENRES.toCheckBoxVal())
+
+    class YearsFilter : QueryPartFilter("Año", ZeroAnimeFiltersData.YEARS)
+
+    class StatesFilter : QueryPartFilter("Estado", ZeroAnimeFiltersData.STATES)
+
+    object ZeroAnimeFiltersData {
+        val YEARS = arrayOf(Pair("Todos", "ALL")) + (1950..Calendar.getInstance().get(Calendar.YEAR)).map { Pair("$it", "$it") }.reversed().toTypedArray()
+        val ANIME_GENRES = arrayOf(
+            Pair("Todos los generos", "ALL"),
+            Pair("Acción", "5"),
+            Pair("Artes marciales", "4"),
+            Pair("Aventuras", "24"),
+            Pair("Carreras", "6"),
+            Pair("Ciencia ficción", "27"),
+            Pair("Comedia", "7"),
+            Pair("Demencia", "9"),
+            Pair("Demonios", "41"),
+            Pair("Deportes", "10"),
+            Pair("Drama", "11"),
+            Pair("Ecchi", "12"),
+            Pair("Escolar", "13"),
+            Pair("Espacial", "14"),
+            Pair("Fantasía", "8"),
+            Pair("Gore", "37"),
+            Pair("Harem", "15"),
+            Pair("Historico", "16"),
+            Pair("Horror", "30"),
+            Pair("Infantil", "17"),
+            Pair("Isekai", "29"),
+            Pair("Josei", "18"),
+            Pair("Juegos", "19"),
+            Pair("Magia", "20"),
+            Pair("Mecha", "21"),
+            Pair("Militar", "32"),
+            Pair("Música", "38"),
+            Pair("Parodia", "33"),
+            Pair("Psicológico", "39"),
+            Pair("Recuerdos de la vida", "42"),
+            Pair("Romance", "1"),
+            Pair("Samurai", "36"),
+            Pair("Sci-Fi", "28"),
+            Pair("Seinen", "3"),
+            Pair("Shoujo", "34"),
+            Pair("Shounen", "2"),
+            Pair("Sobre Natural", "25"),
+            Pair("SuperPoderes", "26"),
+            Pair("Suspenso", "23"),
+            Pair("Terror", "22"),
+            Pair("Vampiros", "40"),
+            Pair("Yaoi", "43"),
+            Pair("Yuri", "35"),
+            Pair("Zombies", "31"),
+        )
+
+        val STATES = arrayOf(
+            Pair("Todos", "2"),
+            Pair("En emisión", "1"),
+            Pair("Finalizado", "0"),
+        )
+
+        enum class ORIGEN {
+            ANIME,
+        }
+    }
+}
diff --git a/src/es/zeroanime/src/eu/kanade/tachiyomi/animeextension/es/zeroanime/Zeroanime.kt b/src/es/zeroanime/src/eu/kanade/tachiyomi/animeextension/es/zeroanime/Zeroanime.kt
new file mode 100644
index 00000000..e6984db7
--- /dev/null
+++ b/src/es/zeroanime/src/eu/kanade/tachiyomi/animeextension/es/zeroanime/Zeroanime.kt
@@ -0,0 +1,275 @@
+package eu.kanade.tachiyomi.animeextension.es.zeroanime
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamvidextractor.StreamVidExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+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 Zeroanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "zeroanime"
+
+    override val baseUrl = "https://www4.zeroanime.xyz"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    companion object {
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "mp4upload"
+        private val SERVER_LIST = arrayOf(
+            "filemoon",
+            "mp4upload",
+            "streamtape",
+            "streamvid",
+        )
+    }
+
+    override fun popularAnimeSelector(): String = "ul.animes.list-unstyled.row li.col-6.col-sm-4.col-md-3.col-xl-2"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/search?q=&letra=&genero=ALL&years=ALL&estado=2&orden=desc&p=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        return SAnime.create().apply {
+            url = element.select("a").attr("href")
+            title = element.select("div.title").text()
+            thumbnail_url = element.select("div.thumb img").attr("src")
+        }
+    }
+
+    override fun popularAnimeNextPageSelector(): String {
+        return "ul.pagination li.page-item:not(.active) a"
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episodes = mutableListOf<SEpisode>()
+
+        document.select("li.hentai__chapter").forEach { element ->
+            val episode = SEpisode.create().apply {
+                name = element.select("div.chapter_info span.title").text()
+                url = element.select("a").attr("href")
+                episode_number = name.substringAfter("Episodio ").toFloatOrNull() ?: 0F
+                setUrlWithoutDomain(url)
+            }
+            episodes.add(episode)
+        }
+
+        return episodes.sortedByDescending { it.episode_number }
+    }
+
+    override fun episodeListSelector() = throw UnsupportedOperationException()
+
+    override fun episodeFromElement(element: Element) = throw UnsupportedOperationException()
+
+    /*--------------------------------Video extractors------------------------------------*/
+    private val universalExtractor by lazy { UniversalExtractor(client) }
+    private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val fileMoonExtractor by lazy { FilemoonExtractor(client) }
+    private val mp4UploadExtractor by lazy { Mp4uploadExtractor(client) }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = Jsoup.parse(response.body?.string() ?: "")
+        val videoList = mutableListOf<Video>()
+
+        // Elimina espacios innecesarios del contenido HTML
+        val data = document.html().replace(Regex("""\n|\r|\t|\s{2}|&nbsp;"""), "")
+
+        // Coincide con los botones que contienen los enlaces a los videos
+        val matches = Regex("""<button id="embed-.*?data-url="(.*?)".*?->(.*?)</button>""").findAll(data)
+
+        matches.forEach { match ->
+            val (url, srv) = match.destructured
+            var videoUrl = url.trim()
+
+            // Convertir URL relativa en absoluta
+            if (videoUrl.startsWith("../redirect.php?")) {
+                videoUrl = "$baseUrl${videoUrl.replace("../redirect.php?", "/redirect.php?")}"
+            }
+
+            // Solicitud a la URL para obtener la redirección
+            val redirectResponse = client.newCall(Request.Builder().url(videoUrl).build()).execute()
+            val refreshHeader = redirectResponse.header("refresh")
+            val finalUrl = refreshHeader?.let {
+                Regex("""0;\s*URL=(.*?)$""").find(it)?.groupValues?.get(1)
+            } ?: Regex("""url=(.*?)$""").find(videoUrl)?.groupValues?.get(1)
+
+            finalUrl?.let { processedUrl ->
+                var resolvedUrl = processedUrl
+
+                // Procesar enlaces de video internos
+                if (resolvedUrl.startsWith("../video/")) {
+                    resolvedUrl = "$baseUrl${resolvedUrl.replace("../video/", "/video/")}"
+                }
+
+                val response = client.newCall(Request.Builder().url(resolvedUrl).build()).execute()
+                val refreshUrl = response.header("refresh")?.let {
+                    Regex("""0;\s*URL=(.*?)$""").find(it)?.groupValues?.get(1)
+                }
+
+                Log.d("Zeroanime", "URL extraída del refresh: $refreshUrl")
+
+                // Resolver el servidor y agregar la lista de videos
+                refreshUrl?.let { serverVideoResolver(it, srv) }?.let { videoList.addAll(it) }
+            }
+        }
+
+        return videoList.sort()
+    }
+
+    private fun serverVideoResolver(url: String, server: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
+        Log.d("Zeroanime", "Server: $embedUrl")
+        return try {
+            when {
+                embedUrl.contains("streamtape") -> {
+                    streamtapeExtractor.videosFromUrl(url).also { videoList.addAll(it) }
+                }
+                embedUrl.contains("filemoon") -> {
+                    fileMoonExtractor.videosFromUrl(url).also { videoList.addAll(it) }
+                }
+                embedUrl.contains("mp4upload") -> {
+                    mp4UploadExtractor.videosFromUrl(url, headers).also { videoList.addAll(it) }
+                }
+                embedUrl.contains("streamvid") -> {
+                    StreamVidExtractor(client).videosFromUrl(url).also { videoList.addAll(it) }
+                }
+
+                else -> {
+                    universalExtractor.videosFromUrl(url, headers).also { videoList.addAll(it) }
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("Zeroanime", "Error: Server not supported - ${e.message}")
+            emptyList()
+        }
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    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 searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = ZeroAnimeFilters.getSearchParameters(filters, ZeroAnimeFilters.ZeroAnimeFiltersData.ORIGEN.ANIME)
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/search?q=$query&p=$page", headers)
+            params.filter.isNotBlank() -> GET("$baseUrl/search${params.getQuery()}&p=$page")
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        return SAnime.create().apply {
+            title = document.select("h1.htitle").text()
+            description = document.select("div.vraven_text.single").text()
+            genre = document.select("div.single_data div.list a").joinToString { it.text() }
+            thumbnail_url = document.select("div.hentai_cover img").attr("abs:src")
+            status = parseStatus(document.select("div.data").text())
+        }
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when {
+            statusString.contains("Emisión", ignoreCase = true) -> SAnime.ONGOING
+            statusString.contains("Finalizado", ignoreCase = true) -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/search?q=&letra=ALL&genero=ALL&years=2024&estado=2&orden=asc&p=$page")
+
+    override fun latestUpdatesSelector() = popularAnimeSelector()
+
+    override fun getFilterList(): AnimeFilterList = ZeroAnimeFilters.getFilterList(ZeroAnimeFilters.ZeroAnimeFiltersData.ORIGEN.ANIME)
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        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)
+
+        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)
+    }
+}
diff --git a/src/fr/animevostfr/build.gradle b/src/fr/animevostfr/build.gradle
new file mode 100644
index 00000000..61b89bbf
--- /dev/null
+++ b/src/fr/animevostfr/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'AnimeVostFr'
+    extClass = '.AnimeVostFr'
+    extVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/fr/animevostfr/res/mipmap-hdpi/ic_launcher.png b/src/fr/animevostfr/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..30bfc959
Binary files /dev/null and b/src/fr/animevostfr/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/fr/animevostfr/res/mipmap-mdpi/ic_launcher.png b/src/fr/animevostfr/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..5b74bc50
Binary files /dev/null and b/src/fr/animevostfr/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/fr/animevostfr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/animevostfr/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..fabbe6cf
Binary files /dev/null and b/src/fr/animevostfr/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/fr/animevostfr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/animevostfr/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..64b665fc
Binary files /dev/null and b/src/fr/animevostfr/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/fr/animevostfr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/animevostfr/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..e523cf01
Binary files /dev/null and b/src/fr/animevostfr/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt
new file mode 100644
index 00000000..94a29f3d
--- /dev/null
+++ b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt
@@ -0,0 +1,410 @@
+package eu.kanade.tachiyomi.animeextension.fr.animevostfr
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.fr.animevostfr.extractors.CdopeExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class AnimeVostFr : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "AnimeVostFr"
+
+    override val baseUrl = "https://animevostfr.tv"
+
+    override val lang = "fr"
+
+    override val supportsLatest = true
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/filter-advance/page/$page/")
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/filter-advance/page/$page/?status=ongoing")
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) {
+            return GET("$baseUrl/?s=$query")
+        } else {
+            filters
+        }
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+        val typeFilter = filterList.find { it is TypeFilter } as TypeFilter
+        val yearFilter = filterList.find { it is YearFilter } as YearFilter
+        val statusFilter = filterList.find { it is StatusFilter } as StatusFilter
+        val langFilter = filterList.find { it is LangFilter } as LangFilter
+
+        val filterPath = if (query.isEmpty()) "/filter-advance" else ""
+
+        var urlBuilder = "$baseUrl$filterPath/page/$page/".toHttpUrl().newBuilder()
+
+        when {
+            query.isNotEmpty() ->
+                urlBuilder =
+                    urlBuilder.addQueryParameter("s", query)
+            typeFilter.state != 0 ->
+                urlBuilder =
+                    urlBuilder.addQueryParameter("topic", typeFilter.toUriPart())
+            genreFilter.state != 0 ->
+                urlBuilder =
+                    urlBuilder.addQueryParameter("genre", genreFilter.toUriPart())
+            yearFilter.state != 0 ->
+                urlBuilder =
+                    urlBuilder.addQueryParameter("years", yearFilter.toUriPart())
+            statusFilter.state != 0 ->
+                urlBuilder =
+                    urlBuilder.addQueryParameter("status", statusFilter.toUriPart())
+            langFilter.state != 0 ->
+                urlBuilder =
+                    urlBuilder.addQueryParameter("typesub", langFilter.toUriPart())
+        }
+
+        return GET(urlBuilder.build().toString())
+    }
+
+    override fun searchAnimeSelector() = "div.ml-item"
+
+    override fun searchAnimeNextPageSelector() = "ul.pagination li:not(.active):last-child"
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val a = element.select("a:has(img)")
+        val img = a.select("img")
+        val h2 = a.select("span.mli-info > h2")
+        return SAnime.create().apply {
+            title = h2.text()
+            setUrlWithoutDomain(a.attr("href"))
+            thumbnail_url = img.attr("data-original")
+        }
+    }
+
+    override fun popularAnimeSelector() = searchAnimeSelector()
+    override fun latestUpdatesSelector() = searchAnimeSelector()
+    override fun popularAnimeNextPageSelector() = searchAnimeNextPageSelector()
+    override fun latestUpdatesNextPageSelector() = searchAnimeNextPageSelector()
+    override fun popularAnimeFromElement(element: Element) = searchAnimeFromElement(element)
+    override fun latestUpdatesFromElement(element: Element) = searchAnimeFromElement(element)
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val document = response.asJsoup()
+        return SAnime.create().apply {
+            title = document.select("h1[itemprop=name]").text()
+            status = parseStatus(
+                document.select(
+                    "div.mvici-right > p:contains(Statut) > a:last-child",
+                ).text(),
+            )
+            genre = document.select("div.mvici-left > p:contains(Genres)")
+                .text().substringAfter("Genres: ")
+            thumbnail_url = document.select("div.thumb > img")
+                .firstOrNull()?.attr("data-lazy-src")
+            description = document.select("div[itemprop=description]")
+                .firstOrNull()?.wholeText()?.trim()
+                ?.substringAfter("\n")
+        }
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val type = document
+            .select("div.mvici-right > p:contains(Type) > a:last-child")
+            .text()
+        return if (type == "MOVIE") {
+            return listOf(
+                SEpisode.create().apply {
+                    url = response.request.url.toString()
+                    name = "Movie"
+                },
+            )
+        } else {
+            document.select(episodeListSelector()).map { episodeFromElement(it) }.reversed()
+        }
+    }
+
+    override fun episodeListSelector() = "div#seasonss > div.les-title > a"
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val number = element.text()
+            .substringAfterLast("-episode-")
+            .substringBefore("-")
+        return SEpisode.create().apply {
+            setUrlWithoutDomain(element.attr("href"))
+            name = "Épisode $number"
+            episode_number = number.toFloat()
+        }
+    }
+
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        val videoList = mutableListOf<Video>()
+
+        val url = if (episode.url.startsWith("https:")) {
+            episode.url
+        } else {
+            baseUrl + episode.url
+        }
+
+        val response = client.newCall(GET(url)).execute()
+        val parsedResponse = response.asJsoup()
+        if (parsedResponse.select("title").text().contains("Warning")) {
+            throw Exception(parsedResponse.select("body").text())
+        }
+        val epId = parsedResponse.select("link[rel=shortlink]").attr("href")
+            .substringAfter("?p=")
+
+        parsedResponse.select("div.list-server > select > option").forEach { server ->
+            videoList.addAll(
+                extractVideos(
+                    server.attr("value"),
+                    server.text(),
+                    epId,
+                ),
+            )
+        }
+
+        return videoList
+    }
+
+    private fun extractVideos(serverValue: String, serverName: String, epId: String): List<Video> {
+        Log.i("bruh", "ID: $epId \nLink: $")
+        val xhr = Headers.headersOf("x-requested-with", "XMLHttpRequest")
+        val epLink = client.newCall(GET("$baseUrl/ajax-get-link-stream/?server=$serverValue&filmId=$epId", xhr))
+            .execute().body.string()
+
+        val playlist = mutableListOf<Video>()
+        when {
+            epLink.contains("comedyshow.to") -> {
+                val playlistInterceptor = CloudFlareInterceptor()
+                val cfClient = client.newBuilder().addInterceptor(playlistInterceptor).build()
+                val headers = Headers.headersOf(
+                    "referer",
+                    "$baseUrl/",
+                    "user-agent",
+                    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36",
+                )
+                val playlistResponse = cfClient.newCall(GET(epLink, headers)).execute().body.string()
+                val headersVideo = Headers.headersOf(
+                    "referer",
+                    epLink,
+                    "user-agent",
+                    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36",
+                )
+
+                playlistResponse.substringAfter("#EXT-X-STREAM-INF:")
+                    .split("#EXT-X-STREAM-INF:").map {
+                        val quality = it.substringAfter("RESOLUTION=").split(",")[0].split("\n")[0].substringAfter("x") + "p ($serverName)"
+                        val videoUrl = it.substringAfter("\n").substringBefore("\n")
+                        playlist.add(Video(videoUrl, quality, videoUrl, headers = headersVideo))
+                    }
+            }
+            epLink.contains("cdopetimes.xyz") -> {
+                val extractor = CdopeExtractor(client)
+                playlist.addAll(
+                    extractor.videosFromUrl(epLink),
+                )
+            }
+        }
+
+        return playlist.sort()
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", "720")
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(quality)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.title = document.select("div.slide-middle h1").text()
+        anime.description = document.selectFirst("div.slide-desc")!!.ownText()
+        anime.genre = document.select("div.image-bg-content div.slide-block div.slide-middle ul.slide-top li.right a").joinToString { it.text() }
+        return anime
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        TypeFilter(),
+        GenreFilter(),
+        YearFilter(),
+        StatusFilter(),
+        LangFilter(),
+    )
+
+    private class TypeFilter : UriPartFilter(
+        "Type",
+        arrayOf(
+            Pair("-----", ""),
+            Pair("Anime", "anime"),
+            Pair("Cartoon", "cartoon"),
+            Pair("MOVIE", "movie"),
+            Pair("SERIES", "series"),
+        ),
+    )
+
+    private class GenreFilter : UriPartFilterReverse(
+        "Genre",
+        arrayOf(
+            Pair("", "-----"),
+            Pair("action", "Action"),
+            Pair("adventure", "Adventure"),
+            Pair("animation", "Animation"),
+            Pair("martial-arts", "Arts martiaux"),
+            Pair("biography", "Biographie"),
+            Pair("comedy", "Comédie"),
+            Pair("crime", "Crime"),
+            Pair("demence", "Démence"),
+            Pair("demon", "Demons"),
+            Pair("documentaire", "Documentaire"),
+            Pair("drame", "Drama"),
+            Pair("ecchi", "Ecchi"),
+            Pair("enfants", "Enfants"),
+            Pair("espace", "Espace"),
+            Pair("famille", "Famille"),
+            Pair("fantasy", "Fantastique"),
+            Pair("game", "Game"),
+            Pair("harem", "Harem"),
+            Pair("historical", "Historique"),
+            Pair("horror", "Horreur"),
+            Pair("jeux", "Jeux"),
+            Pair("josei", "Josei"),
+            Pair("kids", "Kids"),
+            Pair("magic", "Magie"),
+            Pair("mecha", "Mecha"),
+            Pair("military", "Militaire"),
+            Pair("monster", "Monster"),
+            Pair("music", "Musique"),
+            Pair("mystere", "Mystère"),
+            Pair("parody", "Parodie"),
+            Pair("police", "Policier"),
+            Pair("psychological", "Psychologique"),
+            Pair("romance", "Romance"),
+            Pair("samurai", "Samurai"),
+            Pair("sci-fi", "Sci-Fi"),
+            Pair("school", "Scolaire"),
+            Pair("seinen", "Seinen"),
+            Pair("short", "Short"),
+            Pair("shoujo", "Shoujo"),
+            Pair("shoujo-ai", "Shoujo Ai"),
+            Pair("shounen", "Shounen"),
+            Pair("shounen-ai", "Shounen Ai"),
+            Pair("sport", "Sport"),
+            Pair("super-power", "Super Pouvoir"),
+            Pair("supernatural", "Surnaturel"),
+            Pair("suspense", "Suspense"),
+            Pair("thriller", "Thriller"),
+            Pair("silce-of-life", "Tranche de vie"),
+            Pair("vampire", "Vampire"),
+            Pair("cars", "Voitures"),
+            Pair("war", "War"),
+            Pair("western", "Western"),
+        ),
+    )
+
+    private class YearFilter : UriPartFilterYears(
+        "Year",
+        Array(62) {
+            if (it == 0) {
+                "-----"
+            } else {
+                (2022 - (it - 1)).toString()
+            }
+        },
+    )
+
+    private class StatusFilter : UriPartFilter(
+        "Status",
+        arrayOf(
+            Pair("-----", ""),
+            Pair("Fin", "completed"),
+            Pair("En cours", "ongoing"),
+        ),
+    )
+
+    private class LangFilter : UriPartFilter(
+        "La langue",
+        arrayOf(
+            Pair("-----", ""),
+            Pair("VO", "vo"),
+            Pair("Animé Vostfr", "vostfr"),
+            Pair("Animé VF", "vf"),
+        ),
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    private open class UriPartFilterReverse(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.second }.toTypedArray()) {
+        fun toUriPart() = vals[state].first
+    }
+
+    private open class UriPartFilterYears(displayName: String, val years: Array<String>) :
+        AnimeFilter.Select<String>(displayName, years) {
+        fun toUriPart() = years[state]
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Qualité préférée"
+            entries = arrayOf("720p", "360p")
+            entryValues = arrayOf("720", "360")
+            setDefaultValue("720")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when (statusString) {
+            "Fin" -> SAnime.COMPLETED
+            "En cours" -> SAnime.ONGOING
+            else -> SAnime.UNKNOWN
+        }
+    }
+}
diff --git a/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/CloudFlareInterceptor.kt b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/CloudFlareInterceptor.kt
new file mode 100644
index 00000000..330dea53
--- /dev/null
+++ b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/CloudFlareInterceptor.kt
@@ -0,0 +1,88 @@
+package eu.kanade.tachiyomi.animeextension.fr.animevostfr
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.os.Handler
+import android.os.Looper
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers.Companion.toHeaders
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class CloudFlareInterceptor : Interceptor {
+
+    private val context = Injekt.get<Application>()
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+
+        val newRequest = resolveWithWebView(originalRequest) ?: throw Exception("bruh")
+
+        return chain.proceed(newRequest)
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    private fun resolveWithWebView(request: Request): Request? {
+        // We need to lock this thread until the WebView finds the challenge solution url, because
+        // OkHttp doesn't support asynchronous interceptors.
+        val latch = CountDownLatch(1)
+
+        var webView: WebView? = null
+
+        val origRequestUrl = request.url.toString()
+        val headers = request.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
+
+        var newRequest: Request? = null
+
+        handler.post {
+            val webview = WebView(context)
+            webView = webview
+            with(webview.settings) {
+                javaScriptEnabled = true
+                domStorageEnabled = true
+                databaseEnabled = true
+                useWideViewPort = false
+                loadWithOverviewMode = false
+                userAgentString = request.header("User-Agent")
+                    ?: "\"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36 Edg/88.0.705.63\""
+            }
+
+            webview.webViewClient = object : WebViewClient() {
+                override fun shouldInterceptRequest(
+                    view: WebView,
+                    request: WebResourceRequest,
+                ): WebResourceResponse? {
+                    if (request.url.toString().contains("master.txt")) {
+                        newRequest = GET(request.url.toString(), request.requestHeaders.toHeaders())
+                        latch.countDown()
+                    }
+                    return super.shouldInterceptRequest(view, request)
+                }
+            }
+
+            webView?.loadUrl(origRequestUrl, headers)
+        }
+
+        // Wait a reasonable amount of time to retrieve the solution. The minimum should be
+        // around 4 seconds but it can take more due to slow networks or server issues.
+        latch.await(12, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+            webView = null
+        }
+
+        return newRequest
+    }
+}
diff --git a/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/extractors/CdopeExtractor.kt b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/extractors/CdopeExtractor.kt
new file mode 100644
index 00000000..5ca78900
--- /dev/null
+++ b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/extractors/CdopeExtractor.kt
@@ -0,0 +1,65 @@
+package eu.kanade.tachiyomi.animeextension.fr.animevostfr.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.POST
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import okhttp3.Headers
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody.Companion.toRequestBody
+
+@Serializable
+data class CdopeResponse(
+    val data: List<FileObject>,
+) {
+    @Serializable
+    data class FileObject(
+        val file: String,
+        val label: String,
+        val type: String,
+    )
+}
+
+class CdopeExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val id = url.substringAfter("/v/")
+        val body = "r=&d=cdopetimes.xyz".toRequestBody("application/x-www-form-urlencoded".toMediaType())
+        val headers = Headers.headersOf(
+            "Accept", "*/*",
+            "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8",
+            "Host", "cdopetimes.xyz",
+            "Origin", "https://cdopetimes.xyz",
+            "Referer", url,
+            "User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/109.0",
+            "X-Requested-With", "XMLHttpRequest",
+        )
+        val response = client.newCall(
+            POST("https://cdopetimes.xyz/api/source/$id", body = body, headers = headers),
+        ).execute()
+
+        Json { ignoreUnknownKeys = true }.decodeFromString<CdopeResponse>(response.body.string()).data.forEach { file ->
+            val videoHeaders = Headers.headersOf(
+                "Accept",
+                "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
+                "Referer",
+                "https://cdopetimes.xyz/",
+                "User-Agent",
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/109.0",
+            )
+
+            videoList.add(
+                Video(
+                    file.file,
+                    "${file.label} (Cdope - ${file.type})",
+                    file.file,
+                    headers = videoHeaders,
+                ),
+            )
+        }
+
+        return videoList
+    }
+}
diff --git a/src/fr/anisama/build.gradle b/src/fr/anisama/build.gradle
index 8fafce4a..99d9e34b 100644
--- a/src/fr/anisama/build.gradle
+++ b/src/fr/anisama/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AniSama'
     extClass = '.AniSama'
-    extVersionCode = 9
+    extVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt b/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt
index fc3fed67..c65e5e70 100644
--- a/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt
+++ b/src/fr/anisama/src/eu/kanade/tachiyomi/animeextension/fr/anisama/AniSama.kt
@@ -183,7 +183,7 @@ class AniSama : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     private val voeExtractor by lazy { VoeExtractor(client) }
     private val vidCdnExtractor by lazy { VidCdnExtractor(client) }
     private val doodExtractor by lazy { DoodExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
 
     override fun videoListRequest(episode: SEpisode) = GET(
         "$baseUrl${episode.url}",
@@ -210,7 +210,7 @@ class AniSama : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
                         contains("sendvid.com") -> sendvidExtractor.videosFromUrl(this, prefix)
                         contains("voe.sx") -> voeExtractor.videosFromUrl(this, prefix)
                         contains(Regex("(d000d|dood)")) -> doodExtractor.videosFromUrl(this, "${prefix}DoodStream")
-                        contains("vidhide") -> streamHideVidExtractor.videosFromUrl(this, prefix)
+                        contains("vidhide") -> streamHideVidExtractor.videosFromUrl(this, videoNameGen = { "$prefix$it StreamHideVid" })
                         else -> emptyList()
                     }
                 }
diff --git a/src/fr/franime/AndroidManifest.xml b/src/fr/franime/AndroidManifest.xml
index a1bbe589..51c2c34a 100644
--- a/src/fr/franime/AndroidManifest.xml
+++ b/src/fr/franime/AndroidManifest.xml
@@ -2,21 +2,21 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity
-            android:name=".fr.franime.FrAnimeUrlActivity"
-            android:excludeFromRecents="true"
-            android:exported="true"
-            android:theme="@android:style/Theme.NoDisplay"
-            >
+                android:name=".fr.franime.FrAnimeUrlActivity"
+                android:excludeFromRecents="true"
+                android:exported="true"
+                android:theme="@android:style/Theme.NoDisplay"
+        >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data
-                    android:scheme="https"
-                    android:host="franime.fr"
-                    android:pathPattern="/anime/..*"
-                    />
+                        android:scheme="https"
+                        android:host="franime.fr"
+                        android:pathPattern="/anime/..*"
+                />
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/src/fr/franime/build.gradle b/src/fr/franime/build.gradle
index c954c37a..e8caaa95 100644
--- a/src/fr/franime/build.gradle
+++ b/src/fr/franime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'FrAnime'
     extClass = '.FrAnime'
-    extVersionCode = 13
+    extVersionCode = 16
     isNsfw = true
 }
 apply from: "$rootDir/common.gradle"
@@ -11,5 +11,5 @@ dependencies {
     implementation(project(':lib:vk-extractor'))
     implementation(project(':lib:sendvid-extractor'))
     implementation(project(':lib:sibnet-extractor'))
-    implementation project(':lib:vidmoly-extractor')
+    implementation(project(':lib:vidmoly-extractor'))
 }
diff --git a/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/dto/FrAnimeDto.kt b/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/dto/FrAnimeDto.kt
index 0d4ac6ad..95867b3e 100644
--- a/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/dto/FrAnimeDto.kt
+++ b/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/dto/FrAnimeDto.kt
@@ -20,6 +20,7 @@ typealias BigIntegerJson =
 
 @OptIn(ExperimentalSerializationApi::class)
 private object BigIntegerSerializer : KSerializer<BigInteger> {
+
     override val descriptor = PrimitiveSerialDescriptor("java.math.BigInteger", PrimitiveKind.LONG)
 
     override fun deserialize(decoder: Decoder): BigInteger =
diff --git a/src/fr/frenchanime/build.gradle b/src/fr/frenchanime/build.gradle
index 3fb88b76..e68dc5ee 100644
--- a/src/fr/frenchanime/build.gradle
+++ b/src/fr/frenchanime/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.FrenchAnime'
     themePkg = 'datalifeengine'
     baseUrl = 'https://french-anime.com'
-    overrideVersionCode = 7
+    overrideVersionCode = 16
 }
 
 apply from: "$rootDir/common.gradle"
@@ -19,4 +19,6 @@ dependencies {
     implementation(project(':lib:sibnet-extractor'))
     implementation(project(':lib:okru-extractor'))
     implementation(project(':lib:streamhub-extractor'))
+    implementation(project(':lib:vidmoly-extractor'))
+    implementation(project(':lib:voe-extractor'))
 }
\ No newline at end of file
diff --git a/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt b/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt
index 6e7e2c5b..26dc3c0f 100644
--- a/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt
+++ b/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt
@@ -10,7 +10,9 @@ import eu.kanade.tachiyomi.lib.streamhubextractor.StreamHubExtractor
 import eu.kanade.tachiyomi.lib.streamvidextractor.StreamVidExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vidmolyextractor.VidMolyExtractor
 import eu.kanade.tachiyomi.lib.vidoextractor.VidoExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.multisrc.datalifeengine.DataLifeEngine
 import eu.kanade.tachiyomi.network.GET
@@ -86,21 +88,37 @@ class FrenchAnime : DataLifeEngine(
     override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
 
     // ============================ Video Links =============================
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val upstreamExtractor by lazy { UpstreamExtractor(client) }
+    private val vudeoExtractor by lazy { VudeoExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
+    private val streamVidExtractor by lazy { StreamVidExtractor(client) }
+    private val vidoExtractor by lazy { VidoExtractor(client) }
+    private val sibnetExtractor by lazy { SibnetExtractor(client) }
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val streamHubExtractor by lazy { StreamHubExtractor(client) }
+    private val vidmolyExtractor by lazy { VidMolyExtractor(client) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+
     override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val list = episode.url.split(",").filter { it.isNotBlank() }.parallelCatchingFlatMap {
             with(it) {
                 when {
-                    contains("dood") -> DoodExtractor(client).videosFromUrl(this)
-                    contains("upstream") -> UpstreamExtractor(client).videosFromUrl(this)
-                    contains("vudeo") -> VudeoExtractor(client).videosFromUrl(this)
-                    contains("uqload") -> UqloadExtractor(client).videosFromUrl(this)
+                    contains("dood") ||
+                        contains("d0000d") -> doodExtractor.videosFromUrl(this)
+                    contains("upstream") -> upstreamExtractor.videosFromUrl(this)
+                    contains("vudeo") -> vudeoExtractor.videosFromUrl(this)
+                    contains("uqload") -> uqloadExtractor.videosFromUrl(this)
                     contains("guccihide") ||
-                        contains("streamhide") -> StreamHideVidExtractor(client).videosFromUrl(this)
-                    contains("streamvid") -> StreamVidExtractor(client).videosFromUrl(this)
-                    contains("vido") -> VidoExtractor(client).videosFromUrl(this)
-                    contains("sibnet") -> SibnetExtractor(client).videosFromUrl(this)
-                    contains("ok.ru") -> OkruExtractor(client).videosFromUrl(this)
-                    contains("streamhub.gg") -> StreamHubExtractor(client).videosFromUrl(this)
+                        contains("streamhide") -> streamHideVidExtractor.videosFromUrl(this)
+                    contains("streamvid") -> streamVidExtractor.videosFromUrl(this)
+                    contains("vido") -> vidoExtractor.videosFromUrl(this)
+                    contains("sibnet") -> sibnetExtractor.videosFromUrl(this)
+                    contains("ok.ru") -> okruExtractor.videosFromUrl(this)
+                    contains("streamhub.gg") -> streamHubExtractor.videosFromUrl(this)
+                    contains("vidmoly") -> vidmolyExtractor.videosFromUrl(this)
+                    contains("voe.sx") -> voeExtractor.videosFromUrl(this)
                     else -> emptyList()
                 }
             }
diff --git a/src/fr/hds/build.gradle b/src/fr/hds/build.gradle
index ff8e2edb..57b8fde5 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 = 2
+    overrideVersionCode = 3
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/hds/src/eu/kanade/tachiyomi/animeextension/fr/hds/Hds.kt b/src/fr/hds/src/eu/kanade/tachiyomi/animeextension/fr/hds/Hds.kt
index c83cbed7..cd66afd6 100644
--- a/src/fr/hds/src/eu/kanade/tachiyomi/animeextension/fr/hds/Hds.kt
+++ b/src/fr/hds/src/eu/kanade/tachiyomi/animeextension/fr/hds/Hds.kt
@@ -51,7 +51,7 @@ class Hds : DooPlay(
     data class VideoLinkDTO(@SerialName("embed_url") val url: String)
 
     private val fileMoonExtractor by lazy { FilemoonExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
diff --git a/src/fr/otakufr/build.gradle b/src/fr/otakufr/build.gradle
index f056be6d..e17c6b3d 100644
--- a/src/fr/otakufr/build.gradle
+++ b/src/fr/otakufr/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'OtakuFR'
     extClass = '.OtakuFR'
-    extVersionCode = 15
+    extVersionCode = 23
 }
 
 apply from: "$rootDir/common.gradle"
@@ -14,5 +14,6 @@ dependencies {
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:okru-extractor'))
     implementation(project(":lib:playlist-utils"))
+    implementation(project(":lib:upstream-extractor"))
     implementation(libs.jsunpacker)
 }
\ No newline at end of file
diff --git a/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt b/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
index 3091a94b..c0d7c325 100644
--- a/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
+++ b/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.fr.otakufr.extractors.UpstreamExtractor
 import eu.kanade.tachiyomi.animeextension.fr.otakufr.extractors.VidbmExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -37,7 +37,7 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "OtakuFR"
 
-    override val baseUrl = "https://otakufr.co"
+    override val baseUrl = "https://otakufr.cc"
 
     override val lang = "fr"
 
@@ -145,7 +145,7 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
     private val vidbmExtractor by lazy { VidbmExtractor(client, headers) }
     private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
-    private val upstreamExtractor by lazy { UpstreamExtractor(client, headers) }
+    private val upstreamExtractor by lazy { UpstreamExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val voeExtractor by lazy { VoeExtractor(client) }
@@ -155,31 +155,28 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.asJsoup()
 
         val serversList = document.select("div.tab-content iframe[src]").mapNotNull {
-            val url = it.attr("abs:src")
+            val url = it.attr("abs:data-src")
 
             if (url.contains("parisanime.com")) {
                 val docHeaders = headers.newBuilder().apply {
-                    add("Accept", "*/*")
-                    add("Host", url.toHttpUrl().host)
-                    add("Referer", url)
-                    add("X-Requested-With", "XMLHttpRequest")
+                    set("X-Requested-With", "XMLHttpRequest")
                 }.build()
-
                 val newDoc = client.newCall(
                     GET(url, headers = docHeaders),
                 ).execute().asJsoup()
-                newDoc.selectFirst("div[data-url]")?.attr("data-url")
+                val resUrl = newDoc.selectFirst("div[data-url]")?.attr("data-url")
+                if (resUrl!!.startsWith("//")) "https:$resUrl" else resUrl
             } else {
                 url
             }
         }
-
         return serversList.parallelCatchingFlatMapBlocking(::getHosterVideos)
     }
 
     private fun getHosterVideos(host: String): List<Video> {
         return when {
-            host.startsWith("https://doo") -> doodExtractor.videosFromUrl(host, quality = "Doodstream")
+            host.startsWith("https://doo") || host.contains("d0000d")
+            -> doodExtractor.videosFromUrl(host, quality = "Doodstream")
             host.contains("streamwish") -> streamwishExtractor.videosFromUrl(host)
             host.contains("sibnet.ru") -> sibnetExtractor.videosFromUrl(host)
             host.contains("vadbam") -> vidbmExtractor.videosFromUrl(host)
diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle
index b2ba9b81..4a7e0b40 100644
--- a/src/fr/vostfree/build.gradle
+++ b/src/fr/vostfree/build.gradle
@@ -1,13 +1,17 @@
 ext {
     extName = 'Vostfree'
     extClass = '.Vostfree'
-    extVersionCode = 19
+    extVersionCode = 25
 }
 
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib:vudeo-extractor'))
     implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:okru-extractor'))
-}
\ No newline at end of file
+    implementation(project(':lib:sibnet-extractor'))
+    implementation(project(':lib:uqload-extractor'))
+    implementation(project(':lib:voe-extractor'))
+    implementation(project(':lib:vudeo-extractor'))
+}
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
index 8659f9f7..92c3b3d1 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.animeextension.fr.vostfree
 
 import android.app.Application
-import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -13,11 +12,17 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
@@ -25,7 +30,6 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import java.lang.Exception
 
 class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
@@ -37,117 +41,35 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun popularAnimeSelector(): String = "div#page-content div.page-left div#content div#dle-content div.movie-poster"
+    // ============================== Popular ===============================
+    override fun popularAnimeSelector() = "div#dle-content div.movie-poster"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/films-vf-vostfr/page/$page/")
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/films-vf-vostfr/page/$page/")
 
-    override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(
-            element.select("div.movie-poster div.play a").attr("href"),
-        )
-        anime.title = element.select("div.movie-poster div.info.hidden div.title").text()
-        anime.thumbnail_url = baseUrl + element.select("div.movie-poster span.image img").attr("src")
-        return anime
-    }
-
-    override fun popularAnimeNextPageSelector(): String = "span.next-page"
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val episodes = mutableListOf<SEpisode>()
-        val jsoup = response.asJsoup()
-        jsoup.select("select.new_player_selector option").forEachIndexed { index, it ->
-            val epNum = it.text().replace("Episode", "").drop(2)
-
-            if (it.text() == "Film") {
-                val episode = SEpisode.create().apply {
-                    episode_number = "1".toFloat()
-                    name = "Film"
-                }
-                episode.url = "?episode:0/${response.request.url}"
-                episodes.add(episode)
-            } else {
-                val episode = SEpisode.create().apply {
-                    episode_number = epNum.toFloat()
-                    name = "Épisode $epNum"
-                }
-                episode.setUrlWithoutDomain("?episode:$index/${response.request.url}")
-                episodes.add(episode)
-            }
+    override fun popularAnimeFromElement(element: Element) = SAnime.create().apply {
+        with(element.selectFirst("a")!!) {
+            setUrlWithoutDomain(attr("href"))
+            title = text()
         }
-
-        return episodes
+        thumbnail_url = element.selectFirst("span.image img")?.absUrl("src")
     }
 
-    override fun episodeListSelector() = throw UnsupportedOperationException()
+    override fun popularAnimeNextPageSelector() = "span.next-page"
 
-    override fun episodeFromElement(element: Element) = throw UnsupportedOperationException()
+    // =============================== Latest ===============================
+    override fun latestUpdatesNextPageSelector() = throw UnsupportedOperationException()
 
-    override fun videoListParse(response: Response): List<Video> {
-        val epNum = response.request.url.toString().substringAfter("$baseUrl/?episode:").substringBefore("/")
-        val realUrl = response.request.url.toString().replace("$baseUrl/?episode:$epNum/", "")
+    override fun latestUpdatesFromElement(element: Element) = throw UnsupportedOperationException()
 
-        val document = client.newCall(GET(realUrl)).execute().asJsoup()
-        val videoList = mutableListOf<Video>()
-        val allPlayerIds = document.select("div.tab-content div div.new_player_top div.new_player_bottom div.button_box")[epNum.toInt()]
+    override fun latestUpdatesRequest(page: Int) = throw UnsupportedOperationException()
 
-        allPlayerIds.select("div").forEach {
-            val server = it.text()
-            if (server.lowercase() == "vudeo") {
-                val playerId = it.attr("id")
-                val url = document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text()
-                runCatching {
-                    val video = VudeoExtractor(client).videosFromUrl(url)
-                    videoList.addAll(video)
-                }
-            }
-            if (server.lowercase() == "ok") {
-                val playerId = it.attr("id")
-                val url = "https://ok.ru/videoembed/" + document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text()
-                val video = OkruExtractor(client).videosFromUrl(url, "", false)
-                videoList.addAll(video)
-            }
-            if (server.lowercase() == "doodstream") {
-                val playerId = it.attr("id")
-                val url = document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text()
-                val video = DoodExtractor(client).videoFromUrl(url, "DoodStream", false)
-                if (video != null) {
-                    videoList.add(video)
-                }
-            }
-        }
-
-        return videoList
-    }
-
-    override fun videoListSelector() = throw UnsupportedOperationException()
-
-    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
-
-    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
-
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Vudeo")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality == quality) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
-    }
+    override fun latestUpdatesSelector() = throw UnsupportedOperationException()
 
+    // =============================== Search ===============================
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
@@ -163,62 +85,114 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .build()
 
         return when {
-            query.isNotBlank() -> try { POST("$baseUrl/index.php?do=search", headers, formData) } catch (e: Exception) { GET("$baseUrl/animes-vostfr/page/$page/") }
+            query.isNotBlank() -> POST("$baseUrl/index.php?do=search", headers, formData)
             genreFilter.state != 0 -> GET("$baseUrl/genre/${genreFilter.toUriPart()}/page/$page/")
             typeFilter.state != 0 -> GET("$baseUrl/${typeFilter.toUriPart()}/page/$page/")
             else -> GET("$baseUrl/animes-vostfr/page/$page/")
         }
     }
 
+    override fun searchAnimeSelector() = "div#dle-content div.search-result, " + popularAnimeSelector()
+
     override fun searchAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
-        val animeList = document.select("div.search-result")
-        val animeList2 = document.select("div.movie-poster")
-        val animes = animeList.map {
-            searchAnimeFromElement(it)
-        } + animeList2.map {
-            searchAnimeFromElement(it)
-        }
+        val animes = document.select(searchAnimeSelector()).map(::searchAnimeFromElement)
+
         return AnimesPage(animes, false)
     }
 
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        return when {
-            element.select("div.search-result").toString() != "" -> searchPopularAnimeFromElement(element)
-            else -> popularAnimeFromElement(element)
-        }
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
+    override fun searchAnimeNextPageSelector() = popularAnimeNextPageSelector()
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document) = SAnime.create().apply {
+        title = document.select("div.slide-middle h1").text()
+        description = document.selectFirst("div.slide-desc")?.ownText()
+        thumbnail_url = document.selectFirst("div.slide-poster img")?.absUrl("src")
+        genre = document.select("li.right b.fa-bookmark-o ~ a").joinToString { it.text() }
     }
 
-    private fun searchPopularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(
-            element.select("div.search-result div.info div.title a").attr("href"),
-        )
-        anime.title = element.select("div.search-result div.info div.title a").text()
-        anime.thumbnail_url = baseUrl + element.select("div.search-result span.image img").attr("src")
-        return anime
+    // ============================== Episodes ==============================
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val doc = response.asJsoup()
+        val epUrl = response.request.url.toString()
+        return doc.select("select.new_player_selector option").map { it ->
+            if (it.text() == "Film") {
+                SEpisode.create().apply {
+                    episode_number = 1F
+                    name = "Film"
+                    setUrlWithoutDomain("$epUrl?episode=1")
+                }
+            } else {
+                SEpisode.create().apply {
+                    val epNum = it.text().substringAfter(" ").toInt()
+                    episode_number = epNum.toFloat()
+                    name = "Épisode $epNum"
+                    setUrlWithoutDomain("$epUrl?episode=$epNum")
+                }
+            }
+        }.reversed()
     }
 
-    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+    override fun episodeListSelector() = throw UnsupportedOperationException()
 
-    override fun searchAnimeSelector(): String = "div#dle-content"
+    override fun episodeFromElement(element: Element) = throw UnsupportedOperationException()
 
-    override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
-        anime.title = document.select("div.slide-middle h1").text()
-        anime.description = document.selectFirst("div.slide-desc")!!.ownText()
-        anime.genre = document.select("div.image-bg-content div.slide-block div.slide-middle ul.slide-top li.right a").joinToString { it.text() }
-        return anime
+    // ============================ Video Links =============================
+    private val doodExtractor by lazy { DoodExtractor(client) }
+    private val mixdropExtractor by lazy { MixDropExtractor(client) }
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val sibnetExtractor by lazy { SibnetExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
+    private val voeExtractor by lazy { VoeExtractor(client) }
+    private val vudeoExtractor by lazy { VudeoExtractor(client) }
+
+    override fun videoListParse(response: Response) = throw UnsupportedOperationException()
+
+    private val hostPrefixes = mapOf(
+        "ok" to "https://ok.ru/videoembed/",
+        "sibnet" to "https://video.sibnet.ru/shell.php?videoid=",
+        "uqload" to "https://uqload.io/embed-",
+    )
+
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        val epNum = episode.url.substringAfter("=")
+        val document = client.newCall(GET(baseUrl + episode.url, headers)).await().asJsoup()
+
+        val allPlayers = document.select("div#buttons_$epNum div")
+
+        return allPlayers.parallelCatchingFlatMap {
+            val server = it.text().lowercase()
+            val id = it.attr("id")
+            val content = document.selectFirst("div#content_$id")?.text() ?: return@parallelCatchingFlatMap emptyList()
+            when (server) {
+                "doodstream" -> doodExtractor.videosFromUrl(content, "DoodStream")
+                "mixdrop" -> mixdropExtractor.videosFromUrl(content)
+                "ok" -> okruExtractor.videosFromUrl(hostPrefixes[server] + content)
+                "sibnet" -> sibnetExtractor.videosFromUrl(hostPrefixes[server] + content)
+                "uqload" -> uqloadExtractor.videosFromUrl(hostPrefixes[server] + content + ".html")
+                "voe" -> voeExtractor.videosFromUrl(content)
+                "vudeo" -> vudeoExtractor.videosFromUrl(content)
+                else -> emptyList()
+            }
+        }.sort()
     }
 
-    override fun latestUpdatesNextPageSelector() = throw UnsupportedOperationException()
+    override fun videoListSelector() = throw UnsupportedOperationException()
 
-    override fun latestUpdatesFromElement(element: Element) = throw UnsupportedOperationException()
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
 
-    override fun latestUpdatesRequest(page: Int) = throw UnsupportedOperationException()
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
 
-    override fun latestUpdatesSelector() = throw UnsupportedOperationException()
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
+        return sortedWith(
+            compareBy { it.quality.contains(quality) },
+        ).reversed()
+    }
+
+    // ============================== Filters ===============================
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
         TypeFilter(),
         GenreFilter(),
@@ -257,22 +231,32 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         fun toUriPart() = vals[state].second
     }
 
+    // ============================== Settings ==============================
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
-            title = "Preferred quality"
-            entries = arrayOf("Vudeo", "Doodstream")
-            entryValues = arrayOf("Vudeo", "Doodstream")
-            setDefaultValue("Vudeo")
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = PREF_QUALITY_TITLE
+            entries = PREF_QUALITY_ENTRIES
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
+        }.also(screen::addPreference)
+    }
 
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }
-        screen.addPreference(videoQualityPref)
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_TITLE = "Preferred quality"
+        private const val PREF_QUALITY_DEFAULT = "Vudeo"
+        private val PREF_QUALITY_ENTRIES = arrayOf(
+            "1080p",
+            "360p",
+            "480p",
+            "720p",
+            "Doodstream",
+            "MixDrop",
+            "Sibnet",
+            "Uqload",
+            "Voe",
+            "Vudeo",
+        )
     }
 }
diff --git a/src/fr/wiflix/build.gradle b/src/fr/wiflix/build.gradle
index 5478b926..91e336bc 100644
--- a/src/fr/wiflix/build.gradle
+++ b/src/fr/wiflix/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Wiflix'
     themePkg = 'datalifeengine'
     baseUrl = 'https://wiflix.voto'
-    overrideVersionCode = 8
+    overrideVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix/Wiflix.kt b/src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix/Wiflix.kt
index 20b162e2..8017a330 100644
--- a/src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix/Wiflix.kt
+++ b/src/fr/wiflix/src/eu/kanade/tachiyomi/animeextension/fr/wiflix/Wiflix.kt
@@ -83,7 +83,7 @@ class Wiflix : DataLifeEngine(
                     contains("uqload.co") -> UqloadExtractor(client).videosFromUrl(this)
                     contains("waaw1.tv") -> emptyList()
                     contains("vudeo.co") -> VudeoExtractor(client).videosFromUrl(this)
-                    contains("streamvid.net") -> StreamHideVidExtractor(client).videosFromUrl(this)
+                    contains("streamvid.net") -> StreamHideVidExtractor(client, headers).videosFromUrl(this)
                     contains("upstream.to") -> UpstreamExtractor(client).videosFromUrl(this)
                     contains("streamdav.com") -> StreamDavExtractor(client).videosFromUrl(this)
                     contains("voe.sx") -> VoeExtractor(client).videosFromUrl(this)
diff --git a/src/hi/animesaga/build.gradle b/src/hi/animesaga/build.gradle
index 084ccc7a..34821a6a 100644
--- a/src/hi/animesaga/build.gradle
+++ b/src/hi/animesaga/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AnimeSAGA'
     themePkg = 'dooplay'
     baseUrl = 'https://www.animesaga.in'
-    overrideVersionCode = 14
+    overrideVersionCode = 13
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/hi/yomovies/build.gradle b/src/hi/yomovies/build.gradle
index 980ded0d..7a4d693f 100644
--- a/src/hi/yomovies/build.gradle
+++ b/src/hi/yomovies/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'YoMovies'
     extClass = '.YoMovies'
-    extVersionCode = 15
+    extVersionCode = 21
     isNsfw = true
 }
 
diff --git a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt
index 77f4d4ba..5b231bf5 100644
--- a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt
+++ b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt
@@ -39,7 +39,7 @@ class MovembedExtractor(private val client: OkHttpClient, private val headers: H
                     listOf(Track(t, url.queryParameter("c1_label") ?: "English"))
                 } ?: emptyList()
 
-                DoodExtractor(client).videoFromUrl(iframeUrl, "(movembed) Dood", externalSubs = subtitleList)?.let(::listOf) ?: emptyList()
+                DoodExtractor(client).videoFromUrl(iframeUrl, "(movembed)", externalSubs = subtitleList)?.let(::listOf) ?: emptyList()
             }
             else -> emptyList()
         }
diff --git a/src/id/oploverz/build.gradle b/src/id/oploverz/build.gradle
index 33a8da51..bfa2fdd5 100644
--- a/src/id/oploverz/build.gradle
+++ b/src/id/oploverz/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Oploverz'
     extClass = '.Oploverz'
-    extVersionCode = 27
+    extVersionCode = 26
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt b/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt
index caa4b4d3..dd1d5167 100644
--- a/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt
+++ b/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.animeextension.id.oploverz
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -13,11 +12,14 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
+import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
 import org.json.JSONObject
-import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -37,28 +39,28 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
     // ============================== Popular ===============================
 
     override fun popularAnimeRequest(page: Int): Request =
-        GET("$baseUrl/anime/?page=$page&status=&type=&sub=&order=popular")
+        GET("$baseUrl/anime-list/page/$page/?order=popular")
 
     override fun popularAnimeParse(response: Response): AnimesPage =
-        getAnimeParse(response, "article[itemscope=itemscope]")
+        getAnimeParse(response, "div.relat > article")
 
     // =============================== Latest ===============================
 
     override fun latestUpdatesRequest(page: Int): Request =
-        GET("$baseUrl/anime/?page=$page&status=&type=&sub=&order=latest")
+        GET("$baseUrl/anime-list/page/$page/?order=latest")
 
     override fun latestUpdatesParse(response: Response): AnimesPage =
-        getAnimeParse(response, "article[itemscope=itemscope]")
+        getAnimeParse(response, "div.relat > article")
 
     // =============================== Search ===============================
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val params = OploverzFilters.getSearchParameters(filters)
-        return GET("$baseUrl/page/$page/?s=$query${params.filter}", headers)
+        return GET("$baseUrl/anime-list/page/$page/?title=$query${params.filter}", headers)
     }
 
     override fun searchAnimeParse(response: Response): AnimesPage =
-        getAnimeParse(response, "article[itemscope=itemscope]")
+        getAnimeParse(response, "div.relat > article")
 
     // ============================== Filters ===============================
 
@@ -68,16 +70,16 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun animeDetailsParse(response: Response): SAnime {
         val doc = response.asJsoup()
-        val detail = doc.selectFirst("div.info-content > div.spe")!!
+        val detail = doc.selectFirst("div.infox > div.spe")!!
         return SAnime.create().apply {
             author = detail.getInfo("Studio")
-            status = parseStatus(detail.getInfo("Status"))
-            title = doc.selectFirst("h1.entry-title")!!.text()
+            status = parseStatus(doc.selectFirst("div.alternati > span:nth-child(2)")!!.text())
+            title = doc.selectFirst("div.title > h1.entry-title")!!.text()
             thumbnail_url =
-                doc.selectFirst("div.thumb > img")!!
+                doc.selectFirst("div.infoanime.widget_senction > div.thumb > img")!!
                     .attr("src")
             description =
-                doc.select("div.entry-content > p")
+                doc.select("div.entry-content.entry-content-single > p")
                     .joinToString("\n\n") { it.text() }
         }
     }
@@ -86,13 +88,13 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val doc = response.asJsoup()
-        return doc.select("div.eplister > ul > li").map {
-            val episode = it.selectFirst("a")!!
+        return doc.select("div.lstepsiode.listeps > ul.scrolling > li").map {
+            val episode = it.selectFirst("span.eps > a")!!
             SEpisode.create().apply {
                 setUrlWithoutDomain(episode.attr("href"))
-                episode_number = it.selectFirst("div.epl-num")!!.text().toFloatOrNull() ?: 1F
-                name = it.selectFirst("div.epl-title")!!.text()
-                date_upload = it.selectFirst("div.epl-date")!!.text().toDate()
+                episode_number = episode.text().trim().toFloatOrNull() ?: 1F
+                name = it.selectFirst("span.lchx > a")!!.text()
+                date_upload = it.selectFirst("span.date")!!.text().toDate()
             }
         }
     }
@@ -101,25 +103,15 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun videoListParse(response: Response): List<Video> {
         val doc = response.asJsoup()
-        val videoList = mutableListOf<Video>()
-
-        doc.select("select.mirror > option[value]").forEach { opt ->
-            val decoded = if (opt.attr("value").isEmpty()) {
-                doc.selectFirst("iframe")!!.attr("src")
-            } else {
-                Jsoup.parse(
-                    String(Base64.decode(opt.attr("value"), Base64.DEFAULT)),
-                ).select("iframe").attr("src")
+        val parseUrl = response.request.url.toUrl()
+        val url = "${parseUrl.protocol}://${parseUrl.host}"
+        return doc.select("#server > ul > li > div.east_player_option")
+            .parallelMapNotNullBlocking {
+                runCatching { getEmbedLinks(url, it) }.getOrNull()
             }
-
-            when {
-                decoded.contains("blogger.com") -> {
-                    videoList.addAll(getVideosFromEmbed(decoded))
-                }
+            .parallelCatchingFlatMapBlocking {
+                getVideosFromEmbed(it.first)
             }
-        }
-
-        return videoList.sort()
     }
 
     // ============================= Utilities ==============================
@@ -148,14 +140,19 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
         val doc = response.asJsoup()
         val animes = doc.select(query).map {
             SAnime.create().apply {
-                setUrlWithoutDomain(it.selectFirst("a.tip")!!.attr("href"))
-                title = it.selectFirst("div.tt > h2")!!.text()
-                thumbnail_url = it.selectFirst("div.limit > img")!!.attr("src")
+                setUrlWithoutDomain(it.selectFirst("div.animposx > a")!!.attr("href"))
+                title = it.selectFirst("div.title > h2")!!.text()
+                thumbnail_url = it.selectFirst("div.content-thumb > img")!!.attr("src")
             }
         }
-
-        val hasNextPage = doc.selectFirst("a.next.page-numbers") != null ?: doc.selectFirst("div.hpage > a.r")
-
+        val hasNextPage = try {
+            val pagination = doc.selectFirst("div.pagination")!!
+            val totalPage = pagination.selectFirst("span:nth-child(1)")!!.text().split(" ").last()
+            val currentPage = pagination.selectFirst("span.page-numbers.current")!!.text()
+            currentPage.toInt() < totalPage.toInt()
+        } catch (_: Exception) {
+            false
+        }
         return AnimesPage(animes, hasNextPage)
     }
 
@@ -167,6 +164,18 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
+    private fun getEmbedLinks(url: String, element: Element): Pair<String, String> {
+        val form = FormBody.Builder().apply {
+            add("action", "player_ajax")
+            add("post", element.attr("data-post"))
+            add("nume", element.attr("data-nume"))
+            add("type", element.attr("data-type"))
+        }.build()
+        return client.newCall(POST("$url/wp-admin/admin-ajax.php", body = form))
+            .execute()
+            .let { Pair(it.asJsoup().selectFirst(".playeriframe")!!.attr("src"), "") }
+    }
+
     private fun getVideosFromEmbed(link: String): List<Video> {
         return when {
             "blogger" in link -> {
diff --git a/src/id/otakudesu/build.gradle b/src/id/otakudesu/build.gradle
index 0e9d74a9..5fbae933 100644
--- a/src/id/otakudesu/build.gradle
+++ b/src/id/otakudesu/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'OtakuDesu'
     extClass = '.OtakuDesu'
-    extVersionCode = 29
+    extVersionCode = 30
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt b/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt
index 4a341895..eb01646c 100644
--- a/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt
+++ b/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt
@@ -223,7 +223,7 @@ class OtakuDesu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private val filelionsExtractor by lazy { StreamWishExtractor(client, headers) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
 
     private fun getVideosFromEmbed(quality: String, link: String): List<Video> {
         return when {
diff --git a/src/it/animesaturn/build.gradle b/src/it/animesaturn/build.gradle
index b537e34e..2316e240 100644
--- a/src/it/animesaturn/build.gradle
+++ b/src/it/animesaturn/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anime Saturn'
     extClass = '.AnimeSaturn'
-    extVersionCode = 9
+    extVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt b/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt
index aa7e949c..1d308ae4 100644
--- a/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt
+++ b/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt
@@ -25,7 +25,12 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "AnimeSaturn"
 
-    override val baseUrl by lazy { preferences.getString("preferred_domain", "https://anisaturn.com")!! }
+    override val baseUrl by lazy {
+        preferences.getString(
+            "preferred_domain",
+            "https://anisaturn.com",
+        )!!
+    }
 
     private fun isNewDomain(): Boolean = baseUrl == "https://anisaturn.com"
 
@@ -39,7 +44,8 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun popularAnimeSelector(): String = "div.sebox"
 
-    override fun popularAnimeRequest(page: Int): Request = GET(if (isNewDomain()) "$baseUrl/ongoing?page=$page" else "$baseUrl/animeincorso?page=$page")
+    override fun popularAnimeRequest(page: Int): Request =
+        GET(if (isNewDomain()) "$baseUrl/ongoing?page=$page" else "$baseUrl/animeincorso?page=$page")
 
     private fun formatTitle(titlestring: String): String = titlestring.replace("(ITA) ITA", "Dub ITA").replace("(ITA)", "Dub ITA").replace("Sub ITA", "")
 
@@ -48,9 +54,13 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         anime.setUrlWithoutDomain(element.selectFirst("div.msebox div.headsebox div.tisebox h2 a")!!.attr("href"))
         anime.title = formatTitle(element.selectFirst("div.msebox div.headsebox div.tisebox h2 a")!!.text())
         if (isNewDomain()) {
-            anime.thumbnail_url = element.selectFirst("div.msebox div.bigsebox div.l a img.image-animation")!!.attr("src")
+            anime.thumbnail_url =
+                element.selectFirst("div.msebox div.bigsebox div.l a img.image-animation")!!
+                    .attr("src")
         } else
-            anime.thumbnail_url = element.selectFirst("div.msebox div.bigsebox div.l img.attachment-post-thumbnail.size-post-thumbnail.wp-post-image")!!.attr("src")
+            anime.thumbnail_url =
+                element.selectFirst("div.msebox div.bigsebox div.l img.attachment-post-thumbnail.size-post-thumbnail.wp-post-image")!!
+                    .attr("src")
         return anime
     }
 
@@ -158,11 +168,23 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         } else {
             // word search
             if (isNewDomain()) {
-                anime.setUrlWithoutDomain(element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.text-left.badge-purple")!!.attr("href"))
-                anime.title = formatTitle(element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.text-left.badge-purple")!!.text())
+                anime.setUrlWithoutDomain(
+                    element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.text-left.badge-purple")!!
+                        .attr("href"),
+                )
+                anime.title = formatTitle(
+                    element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.text-left.badge-purple")!!
+                        .text(),
+                )
             } else {
-                anime.setUrlWithoutDomain(element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.badge-light")!!.attr("href"))
-                anime.title = formatTitle(element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.badge-light")!!.text())
+                anime.setUrlWithoutDomain(
+                    element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.badge-light")!!
+                        .attr("href"),
+                )
+                anime.title = formatTitle(
+                    element.selectFirst("li.list-group-item.bg-dark-as-box-shadow div.item-archivio div.info-archivio h3 a.badge.badge-archivio.badge-light")!!
+                        .text(),
+                )
             }
             anime.thumbnail_url = element.select("li.list-group-item.bg-dark-as-box-shadow div.item-archivio a.thumb.image-wrapper img.rounded.locandina-archivio").attr("src")
         }
@@ -219,9 +241,11 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             description2 == null -> {
                 anime.description = description1
-            } description1.length > description2.length -> {
+            }
+            description1.length > description2.length -> {
                 anime.description = description1
-            } else -> {
+            }
+            else -> {
                 anime.description = description2
             }
         }
diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle
index 350cc851..40a7d063 100644
--- a/src/it/animeworld/build.gradle
+++ b/src/it/animeworld/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'ANIMEWORLD.tv'
     extClass = '.ANIMEWORLD'
-    extVersionCode = 44
+    extVersionCode = 45
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,4 @@ dependencies {
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:vidguard-extractor'))
     implementation(libs.jsunpacker)
-}
+}
\ No newline at end of file
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
index 89253e00..71517d12 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
@@ -27,7 +27,6 @@ import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
-import java.lang.Exception
 
 class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
@@ -149,7 +148,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         ?.let(::listOf)
                 }
                 url.contains("streamhide") -> {
-                    StreamHideVidExtractor(client).videosFromUrl(url)
+                    StreamHideVidExtractor(client, headers).videosFromUrl(url)
                 }
                 url.contains("vidguard") or url.contains("listeamed") -> {
                     VidGuardExtractor(client).videosFromUrl(url)
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ShittyRedirectionInterceptor.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ShittyRedirectionInterceptor.kt
index abd7e5b5..99729c95 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ShittyRedirectionInterceptor.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ShittyRedirectionInterceptor.kt
@@ -26,7 +26,8 @@ class ShittyRedirectionInterceptor(private val client: OkHttpClient) : Intercept
     }
 
     private fun loadCookies(request: Request, response: Response): Request {
-        val (cookieString) = """document\.cookie="([^"]+)""".toRegex().find(response.body.string())!!.destructured
+        val (cookieString) = """document\.cookie="([^"]+)""".toRegex()
+            .find(response.body.string())!!.destructured
         val cookie = Cookie.parse(request.url, cookieString)!!
 
         client.cookieJar.saveFromResponse(request.url, listOf(cookie))
diff --git a/src/pt/animestc/AndroidManifest.xml b/src/pt/animestc/AndroidManifest.xml
new file mode 100644
index 00000000..e826c520
--- /dev/null
+++ b/src/pt/animestc/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".pt.animestc.AnimesTCUrlActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="www.animestc.net"
+                    android:pathPattern="/animes/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/src/pt/animestc/build.gradle b/src/pt/animestc/build.gradle
new file mode 100644
index 00000000..50b73a68
--- /dev/null
+++ b/src/pt/animestc/build.gradle
@@ -0,0 +1,11 @@
+ext {
+    extName = 'AnimesTC'
+    extClass = '.AnimesTC'
+    extVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(":lib:googledrive-extractor"))
+}
diff --git a/src/pt/animestc/res/mipmap-hdpi/ic_launcher.png b/src/pt/animestc/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..6d456791
Binary files /dev/null and b/src/pt/animestc/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/pt/animestc/res/mipmap-mdpi/ic_launcher.png b/src/pt/animestc/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..384d412d
Binary files /dev/null and b/src/pt/animestc/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/pt/animestc/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animestc/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..5129c6e5
Binary files /dev/null and b/src/pt/animestc/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/pt/animestc/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animestc/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..bfbb5520
Binary files /dev/null and b/src/pt/animestc/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/pt/animestc/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animestc/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..f5229e6a
Binary files /dev/null and b/src/pt/animestc/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/ATCFilters.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/ATCFilters.kt
new file mode 100644
index 00000000..2f830ed1
--- /dev/null
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/ATCFilters.kt
@@ -0,0 +1,174 @@
+package eu.kanade.tachiyomi.animeextension.pt.animestc
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object ATCFilters {
+    open class QueryPartFilter(
+        displayName: String,
+        val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart() = vals[state].second
+    }
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(): String {
+        return (first { it is R } as QueryPartFilter).toQueryPart()
+    }
+
+    class TypeFilter : QueryPartFilter("Tipo", ATCFiltersData.TYPES)
+    class YearFilter : QueryPartFilter("Ano", ATCFiltersData.YEARS)
+    class GenreFilter : QueryPartFilter("Gênero", ATCFiltersData.GENRES)
+    class StatusFilter : QueryPartFilter("Status", ATCFiltersData.STATUS)
+
+    val FILTER_LIST get() = AnimeFilterList(
+        TypeFilter(),
+        YearFilter(),
+        GenreFilter(),
+        StatusFilter(),
+    )
+
+    data class FilterSearchParams(
+        val type: String = "series",
+        val year: String = "",
+        val genre: String = "",
+        val status: String = "",
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        return FilterSearchParams(
+            filters.asQueryPart<TypeFilter>(),
+            filters.asQueryPart<YearFilter>(),
+            filters.asQueryPart<GenreFilter>(),
+            filters.asQueryPart<StatusFilter>(),
+        )
+    }
+
+    private object ATCFiltersData {
+        val TYPES = arrayOf(
+            Pair("Anime", "series"),
+            Pair("Filme", "movie"),
+            Pair("OVA", "ova"),
+        )
+
+        val SELECT = Pair("Selecione", "")
+
+        val STATUS = arrayOf(
+            SELECT,
+            Pair("Cancelado", "canceled"),
+            Pair("Completo", "complete"),
+            Pair("Em Lançamento", "airing"),
+            Pair("Pausado", "onhold"),
+        )
+
+        val YEARS = arrayOf(SELECT) + (1997..2024).map {
+            Pair(it.toString(), it.toString())
+        }.toTypedArray()
+
+        val GENRES = arrayOf(
+            SELECT,
+            Pair("Ação", "acao"),
+            Pair("Action", "action"),
+            Pair("Adventure", "adventure"),
+            Pair("Artes Marciais", "artes-marciais"),
+            Pair("Artes Marcial", "artes-marcial"),
+            Pair("Aventura", "aventura"),
+            Pair("Beisebol", "beisebol"),
+            Pair("Boys Love", "boys-love"),
+            Pair("Comédia", "comedia"),
+            Pair("Comédia Romântica", "comedia-romantica"),
+            Pair("Comedy", "comedy"),
+            Pair("Crianças", "criancas"),
+            Pair("Culinária", "culinaria"),
+            Pair("Cyberpunk", "cyberpunk"),
+            Pair("Demônios", "demonios"),
+            Pair("Distopia", "distopia"),
+            Pair("Documentário", "documentario"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Escola", "escola"),
+            Pair("Escolar", "escolar"),
+            Pair("Espaço", "espaco"),
+            Pair("Esporte", "esporte"),
+            Pair("Esportes", "esportes"),
+            Pair("Fantasia", "fantasia"),
+            Pair("Ficção Científica", "ficcao-cientifica"),
+            Pair("Futebol", "futebol"),
+            Pair("Game", "game"),
+            Pair("Girl battleships", "girl-battleships"),
+            Pair("Gourmet", "gourmet"),
+            Pair("Gundam", "gundam"),
+            Pair("Harém", "harem"),
+            Pair("Hentai", "hentai"),
+            Pair("Historia", "historia"),
+            Pair("Historial", "historial"),
+            Pair("Historical", "historical"),
+            Pair("Histórico", "historico"),
+            Pair("Horror", "horror"),
+            Pair("Humor Negro", "humor-negro"),
+            Pair("Ídolo", "idolo"),
+            Pair("Infantis", "infantis"),
+            Pair("Investigação", "investigacao"),
+            Pair("Isekai", "isekai"),
+            Pair("Jogo", "jogo"),
+            Pair("Jogos", "jogos"),
+            Pair("Josei", "josei"),
+            Pair("Kids", "kids"),
+            Pair("Luta", "luta"),
+            Pair("Maduro", "maduro"),
+            Pair("Máfia", "mafia"),
+            Pair("Magia", "magia"),
+            Pair("Mágica", "magica"),
+            Pair("Mecha", "mecha"),
+            Pair("Militar", "militar"),
+            Pair("Militares", "militares"),
+            Pair("Mistério", "misterio"),
+            Pair("Música", "musica"),
+            Pair("Musical", "musical"),
+            Pair("Não Informado!", "nao-informado"),
+            Pair("Paródia", "parodia"),
+            Pair("Piratas", "piratas"),
+            Pair("Polícia", "policia"),
+            Pair("Policial", "policial"),
+            Pair("Político", "politico"),
+            Pair("Pós-Apocalíptico", "pos-apocaliptico"),
+            Pair("Psico", "psico"),
+            Pair("Psicológico", "psicologico"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("Samurais", "samurais"),
+            Pair("Sátiro", "satiro"),
+            Pair("School Life", "school-life"),
+            Pair("SciFi", "scifi"),
+            Pair("Sci-Fi", "sci-fi"),
+            Pair("Seinen", "seinen"),
+            Pair("Shotacon", "shotacon"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Shoujo Ai", "shoujo-ai"),
+            Pair("Shounem", "shounem"),
+            Pair("Shounen", "shounen"),
+            Pair("Shounen-ai", "shounen-ai"),
+            Pair("Slice of Life", "slice-of-life"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Space", "space"),
+            Pair("Supernatural", "supernatural"),
+            Pair("Super Poder", "super-poder"),
+            Pair("Super-Poderes", "super-poderes"),
+            Pair("Suspense", "suspense"),
+            Pair("tear-studio", "tear-studio"),
+            Pair("Terror", "terror"),
+            Pair("Thriller", "thriller"),
+            Pair("Tragédia", "tragedia"),
+            Pair("Vampiro", "vampiro"),
+            Pair("Vampiros", "vampiros"),
+            Pair("Vida Escolar", "vida-escolar"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri"),
+            Pair("Zombie", "zombie"),
+        )
+    }
+}
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt
new file mode 100644
index 00000000..1f0330d7
--- /dev/null
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt
@@ -0,0 +1,294 @@
+package eu.kanade.tachiyomi.animeextension.pt.animestc
+
+import android.app.Application
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.pt.animestc.dto.AnimeDto
+import eu.kanade.tachiyomi.animeextension.pt.animestc.dto.EpisodeDto
+import eu.kanade.tachiyomi.animeextension.pt.animestc.dto.ResponseDto
+import eu.kanade.tachiyomi.animeextension.pt.animestc.dto.VideoDto
+import eu.kanade.tachiyomi.animeextension.pt.animestc.extractors.LinkBypasser
+import eu.kanade.tachiyomi.animeextension.pt.animestc.extractors.SendcmExtractor
+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.googledriveextractor.GoogleDriveExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
+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
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class AnimesTC : ConfigurableAnimeSource, AnimeHttpSource() {
+
+    override val name = "AnimesTC"
+
+    override val baseUrl = "https://api2.animestc.com"
+
+    override val lang = "pt-BR"
+
+    override val supportsLatest = true
+
+    override fun headersBuilder() = super.headersBuilder()
+        .add("Referer", "$HOST_URL/")
+
+    private val preferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    private val json: Json by injectLazy()
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/series?order=id&direction=asc&page=1&top=true", headers)
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val data = response.parseAs<List<AnimeDto>>()
+        val animes = data.map(::searchAnimeFromObject)
+        return AnimesPage(animes, false)
+    }
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int) = GET(HOST_URL, headers)
+
+    override fun latestUpdatesParse(response: Response): AnimesPage {
+        val doc = response.asJsoup()
+        val animes = doc.select("div > article.episode").map {
+            SAnime.create().apply {
+                val ahref = it.selectFirst("h3 > a.episode-info-title-orange")!!
+                title = ahref.text()
+                val slug = ahref.attr("href").substringAfterLast("/")
+                setUrlWithoutDomain("/series?slug=$slug")
+                thumbnail_url = it.selectFirst("img.episode-image")?.attr("abs:data-src")
+            }
+        }
+            .filter { it.thumbnail_url?.contains("/_nuxt/img/") == false }
+            .distinctBy { it.url }
+
+        return AnimesPage(animes, false)
+    }
+
+    // =============================== Search ===============================
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = ATCFilters.getSearchParameters(filters)
+        val url = "$baseUrl/series?order=title&direction=asc&page=$page".toHttpUrl()
+            .newBuilder()
+            .addQueryParameter("type", params.type)
+            .addQueryParameter("search", query)
+            .addQueryParameter("year", params.year)
+            .addQueryParameter("releaseStatus", params.status)
+            .addQueryParameter("tag", params.genre)
+            .build()
+
+        return GET(url, headers)
+    }
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val data = response.parseAs<ResponseDto<AnimeDto>>()
+        val animes = data.items.map(::searchAnimeFromObject)
+        val hasNextPage = data.lastPage > data.page
+        return AnimesPage(animes, hasNextPage)
+    }
+
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
+        return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
+            val slug = query.removePrefix(PREFIX_SEARCH)
+            client.newCall(GET("$baseUrl/series?slug=$slug"))
+                .awaitSuccess()
+                .use(::searchAnimeBySlugParse)
+        } else {
+            return super.getSearchAnime(page, query, filters)
+        }
+    }
+
+    override fun getFilterList(): AnimeFilterList = ATCFilters.FILTER_LIST
+
+    private fun searchAnimeFromObject(anime: AnimeDto) = SAnime.create().apply {
+        thumbnail_url = anime.cover.url
+        title = anime.title
+        setUrlWithoutDomain("/series/${anime.id}")
+    }
+
+    private fun searchAnimeBySlugParse(response: Response): AnimesPage {
+        val details = animeDetailsParse(response).apply {
+            setUrlWithoutDomain(response.request.url.toString())
+            initialized = true
+        }
+
+        return AnimesPage(listOf(details), false)
+    }
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(response: Response) = SAnime.create().apply {
+        val anime = response.getAnimeDto()
+        setUrlWithoutDomain("/series/${anime.id}")
+        title = anime.title
+        status = anime.status
+        thumbnail_url = anime.cover.url
+        artist = anime.producer
+        genre = anime.genres
+        description = buildString {
+            append(anime.synopsis + "\n")
+
+            anime.classification?.also { append("\nClassificação: ", it, " anos") }
+            anime.year?.also { append("\nAno de lançamento: ", it) }
+        }
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val id = response.getAnimeDto().id
+        return getEpisodeList(id)
+    }
+
+    private fun episodeListRequest(animeId: Int, page: Int) =
+        GET("$baseUrl/episodes?order=id&direction=desc&page=$page&seriesId=$animeId&specialOrder=true")
+
+    private fun getEpisodeList(animeId: Int, page: Int = 1): List<SEpisode> {
+        val response = client.newCall(episodeListRequest(animeId, page)).execute()
+        val parsed = response.parseAs<ResponseDto<EpisodeDto>>()
+        val episodes = parsed.items.map(::episodeFromObject)
+
+        if (parsed.page < parsed.lastPage) {
+            return episodes + getEpisodeList(animeId, page + 1)
+        } else {
+            return episodes
+        }
+    }
+
+    private fun episodeFromObject(episode: EpisodeDto) = SEpisode.create().apply {
+        name = episode.title
+        setUrlWithoutDomain("/episodes?slug=${episode.slug}")
+        episode_number = episode.number.toFloat()
+        date_upload = episode.created_at.toDate()
+    }
+
+    // ============================ Video Links =============================
+    private val sendcmExtractor by lazy { SendcmExtractor(client) }
+    private val gdriveExtractor by lazy { GoogleDriveExtractor(client, headers) }
+    private val linkBypasser by lazy { LinkBypasser(client, json) }
+
+    private val supportedPlayers = listOf("send", "drive")
+
+    override fun videoListParse(response: Response): List<Video> {
+        val videoDto = response.parseAs<ResponseDto<VideoDto>>().items.first()
+        val links = videoDto.links
+
+        val allLinks = listOf(links.low, links.medium, links.high).flatten()
+            .filter { it.name in supportedPlayers }
+
+        val online = links.online?.run {
+            filterNot { "mega" in it }.map {
+                Video(it, "Player ATC", it, headers)
+            }
+        }.orEmpty()
+
+        val videoId = videoDto.id
+
+        return online + allLinks.parallelCatchingFlatMapBlocking { extractVideosFromLink(it, videoId) }
+    }
+
+    private fun extractVideosFromLink(video: VideoDto.VideoLink, videoId: Int): List<Video> {
+        val playerUrl = linkBypasser.bypass(video, videoId)
+            ?: return emptyList()
+
+        val quality = when (video.quality) {
+            "low" -> "SD"
+            "medium" -> "HD"
+            "high" -> "FULLHD"
+            else -> "SD"
+        }
+
+        return when (video.name) {
+            "send" -> sendcmExtractor.videosFromUrl(playerUrl, quality)
+            "drive" -> {
+                val id = GDRIVE_REGEX.find(playerUrl)?.groupValues?.get(0) ?: return emptyList()
+                gdriveExtractor.videosFromUrl(id, "GDrive - $quality")
+            }
+            else -> emptyList()
+        }
+    }
+
+    // ============================== Settings ==============================
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = PREF_QUALITY_TITLE
+            entries = PREF_QUALITY_ENTRIES
+            entryValues = PREF_QUALITY_ENTRIES
+            setDefaultValue(PREF_QUALITY_DEFAULT)
+            summary = "%s"
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_PLAYER_KEY
+            title = PREF_PLAYER_TITLE
+            entries = PREF_PLAYER_VALUES
+            entryValues = PREF_PLAYER_VALUES
+            setDefaultValue(PREF_PLAYER_DEFAULT)
+            summary = "%s"
+        }.also(screen::addPreference)
+    }
+
+    // ============================= Utilities ==============================
+    private fun Response.getAnimeDto(): AnimeDto {
+        val jsonString = body.string()
+        return try {
+            jsonString.parseAs<AnimeDto>()
+        } catch (e: Exception) {
+            // URL intent handler moment
+            jsonString.parseAs<ResponseDto<AnimeDto>>().items.first()
+        }
+    }
+
+    private fun String.toDate(): Long {
+        return try {
+            DATE_FORMATTER.parse(this)?.time
+        } catch (_: Throwable) { null } ?: 0L
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val player = preferences.getString(PREF_PLAYER_KEY, PREF_PLAYER_DEFAULT)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(player) },
+                { it.quality.contains("- $quality") },
+            ),
+        ).reversed()
+    }
+
+    companion object {
+        private val DATE_FORMATTER by lazy {
+            SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
+        }
+
+        const val PREFIX_SEARCH = "slug:"
+
+        private const val HOST_URL = "https://www.animestc.net"
+
+        private const val PREF_QUALITY_KEY = "pref_quality"
+        private const val PREF_QUALITY_TITLE = "Qualidade preferida"
+        private const val PREF_QUALITY_DEFAULT = "HD"
+        private val PREF_QUALITY_ENTRIES = arrayOf("SD", "HD", "FULLHD")
+
+        private const val PREF_PLAYER_KEY = "pref_player"
+        private const val PREF_PLAYER_TITLE = "Player preferido"
+        private const val PREF_PLAYER_DEFAULT = "Sendcm"
+        private val PREF_PLAYER_VALUES = arrayOf("Sendcm", "GDrive", "Player ATC")
+
+        private val GDRIVE_REGEX = Regex("[\\w-]{28,}")
+    }
+}
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTCUrlActivity.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTCUrlActivity.kt
new file mode 100644
index 00000000..9fc85460
--- /dev/null
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTCUrlActivity.kt
@@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.animeextension.pt.animestc
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+
+/**
+ * Springboard that accepts https://wwww.animestc.net/animes/<item> intents
+ * and redirects them to the main Aniyomi process.
+ */
+class AnimesTCUrlActivity : Activity() {
+
+    private val tag = javaClass.simpleName
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null && pathSegments.size > 1) {
+            val item = pathSegments[1]
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", "${AnimesTC.PREFIX_SEARCH}$item")
+                putExtra("filter", packageName)
+            }
+
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {
+                Log.e(tag, e.toString())
+            }
+        } else {
+            Log.e(tag, "could not parse uri from intent $intent")
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/dto/AnimesTCDto.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/dto/AnimesTCDto.kt
new file mode 100644
index 00000000..e8de368d
--- /dev/null
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/dto/AnimesTCDto.kt
@@ -0,0 +1,78 @@
+package eu.kanade.tachiyomi.animeextension.pt.animestc.dto
+
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseDto<T>(
+    @SerialName("data")
+    val items: List<T>,
+    val lastPage: Int,
+    val page: Int,
+)
+
+@Serializable
+data class AnimeDto(
+    val classification: String?,
+    val cover: CoverDto,
+    val id: Int,
+    val producer: String?,
+    val releaseStatus: String,
+    val synopsis: String,
+    val tags: List<TagDto>,
+    val title: String,
+    val year: Int?,
+) {
+    val status by lazy {
+        when (releaseStatus) {
+            "complete" -> SAnime.COMPLETED
+            "airing" -> SAnime.ONGOING
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    val genres by lazy { tags.joinToString(", ") { it.name } }
+
+    @Serializable
+    data class TagDto(val name: String)
+}
+
+@Serializable
+data class EpisodeDto(
+    @SerialName("seriesId")
+    val animeId: Int,
+    val cover: CoverDto?,
+    val created_at: String,
+    val number: String,
+    val slug: String,
+    val title: String,
+)
+
+@Serializable
+data class VideoDto(
+    val id: Int,
+    val links: VideoLinksDto,
+) {
+    @Serializable
+    data class VideoLinksDto(
+        val low: List<VideoLink> = emptyList(),
+        val medium: List<VideoLink> = emptyList(),
+        val high: List<VideoLink> = emptyList(),
+        val online: List<String>? = null,
+    )
+
+    @Serializable
+    data class VideoLink(
+        val index: Int,
+        val name: String,
+        val quality: String,
+    )
+}
+
+@Serializable
+data class CoverDto(
+    val originalName: String,
+) {
+    val url by lazy { "https://stc.animestc.com/$originalName" }
+}
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/extractors/LinkBypasser.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/extractors/LinkBypasser.kt
new file mode 100644
index 00000000..afd58a59
--- /dev/null
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/extractors/LinkBypasser.kt
@@ -0,0 +1,42 @@
+package eu.kanade.tachiyomi.animeextension.pt.animestc.extractors
+
+import android.util.Base64
+import eu.kanade.tachiyomi.animeextension.pt.animestc.dto.VideoDto.VideoLink
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import okhttp3.OkHttpClient
+
+class LinkBypasser(
+    private val client: OkHttpClient,
+    private val json: Json,
+) {
+    fun bypass(video: VideoLink, episodeId: Int): String? {
+        val joined = "$episodeId/${video.quality}/${video.index}"
+        val encoded = Base64.encodeToString(joined.toByteArray(), Base64.NO_WRAP)
+        val url = "$PROTECTOR_URL/link/$encoded"
+        val res = client.newCall(GET(url)).execute()
+        if (res.code != 200) {
+            return null
+        }
+
+        // Sadly we MUST wait 6s or we are going to get a HTTP 500
+        Thread.sleep(6000L)
+        val id = res.asJsoup().selectFirst("meta#link-id")!!.attr("value")
+        val apiCall = client.newCall(GET("$PROTECTOR_URL/api/link/$id")).execute()
+        if (apiCall.code != 200) {
+            return null
+        }
+
+        val apiBody = apiCall.body.string()
+        return json.decodeFromString<LinkDto>(apiBody).link
+    }
+
+    @Serializable
+    data class LinkDto(val link: String)
+
+    companion object {
+        private const val PROTECTOR_URL = "https://protetor.animestc.xyz"
+    }
+}
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/extractors/SendcmExtractor.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/extractors/SendcmExtractor.kt
new file mode 100644
index 00000000..c422c543
--- /dev/null
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/extractors/SendcmExtractor.kt
@@ -0,0 +1,20 @@
+package eu.kanade.tachiyomi.animeextension.pt.animestc.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class SendcmExtractor(private val client: OkHttpClient) {
+    private val playerName = "Sendcm"
+
+    fun videosFromUrl(url: String, quality: String): List<Video> {
+        val doc = client.newCall(GET(url)).execute().asJsoup()
+        val videoUrl = doc.selectFirst("video#vjsplayer > source")?.attr("src")
+        return videoUrl?.let {
+            val headers = Headers.headersOf("Referer", url)
+            listOf(Video(it, "$playerName - $quality", it, headers = headers))
+        }.orEmpty()
+    }
+}
diff --git a/src/pt/animeszone/AndroidManifest.xml b/src/pt/animeszone/AndroidManifest.xml
new file mode 100644
index 00000000..bc031e78
--- /dev/null
+++ b/src/pt/animeszone/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".pt.animeszone.AZUrlActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="animeszone.net"
+                    android:pathPattern="/..*/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/src/pt/animeszone/build.gradle b/src/pt/animeszone/build.gradle
new file mode 100644
index 00000000..5cfe33a1
--- /dev/null
+++ b/src/pt/animeszone/build.gradle
@@ -0,0 +1,12 @@
+ext {
+    extName = 'AnimesZone'
+    extClass = '.AnimesZone'
+    extVersionCode = 11
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(':lib:dood-extractor'))
+}
diff --git a/src/pt/animeszone/res/mipmap-hdpi/ic_launcher.png b/src/pt/animeszone/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..2d1732e1
Binary files /dev/null and b/src/pt/animeszone/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/pt/animeszone/res/mipmap-mdpi/ic_launcher.png b/src/pt/animeszone/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..0fb7c62e
Binary files /dev/null and b/src/pt/animeszone/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/pt/animeszone/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animeszone/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..be1ee581
Binary files /dev/null and b/src/pt/animeszone/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/pt/animeszone/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animeszone/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..489695ae
Binary files /dev/null and b/src/pt/animeszone/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/pt/animeszone/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animeszone/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..39fb6769
Binary files /dev/null and b/src/pt/animeszone/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AZUrlActivity.kt b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AZUrlActivity.kt
new file mode 100644
index 00000000..e701aadf
--- /dev/null
+++ b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AZUrlActivity.kt
@@ -0,0 +1,42 @@
+package eu.kanade.tachiyomi.animeextension.pt.animeszone
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+
+/**
+ * Springboard that accepts https://animeszone.net/<type>/<slug> intents
+ * and redirects them to the main Aniyomi process.
+ */
+class AZUrlActivity : Activity() {
+
+    private val tag = javaClass.simpleName
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null && pathSegments.size > 1) {
+            val searchQuery = "${pathSegments[0]}/${pathSegments[1]}"
+
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", "${AnimesZone.PREFIX_SEARCH}$searchQuery")
+                putExtra("filter", packageName)
+            }
+
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {
+                Log.e(tag, e.toString())
+            }
+        } else {
+            Log.e(tag, "could not parse uri from intent $intent")
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt
new file mode 100644
index 00000000..04f40496
--- /dev/null
+++ b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt
@@ -0,0 +1,439 @@
+package eu.kanade.tachiyomi.animeextension.pt.animeszone
+
+import android.app.Application
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import app.cash.quickjs.QuickJs
+import eu.kanade.tachiyomi.animeextension.pt.animeszone.extractors.BloggerJWPlayerExtractor
+import eu.kanade.tachiyomi.animeextension.pt.animeszone.extractors.PlaylistExtractor
+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.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+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.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+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
+import uy.kohesive.injekt.injectLazy
+
+class AnimesZone : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "AnimesZone"
+
+    override val baseUrl = "https://animeszone.net"
+
+    override val lang = "pt-BR"
+
+    override val supportsLatest = true
+
+    override fun headersBuilder() = super.headersBuilder()
+        .add("Referer", "$baseUrl/")
+        .add("Origin", baseUrl)
+
+    private val json: Json by injectLazy()
+
+    private val preferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/tendencia/")
+
+    override fun popularAnimeSelector(): String = "div.items > div.seriesList"
+
+    override fun popularAnimeNextPageSelector(): String? = null
+
+    override fun popularAnimeFromElement(element: Element) = SAnime.create().apply {
+        setUrlWithoutDomain(element.selectFirst("a[href]")!!.attr("abs:href"))
+        thumbnail_url = element.selectFirst("div.cover-image")?.run {
+            attr("style").substringAfter("url('").substringBefore("'")
+        }
+        title = element.selectFirst("span.series-title")!!.text()
+    }
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request {
+        return if (page == 1) {
+            GET("$baseUrl/animes-legendados/")
+        } else {
+            GET("$baseUrl/animes-legendados/page/$page/")
+        }
+    }
+
+    override fun latestUpdatesSelector(): String = "main#list-animes ul.post-lst > li"
+
+    override fun latestUpdatesNextPageSelector(): String = "div.paginadorplay > a.active + a"
+
+    override fun latestUpdatesFromElement(element: Element) = SAnime.create().apply {
+        setUrlWithoutDomain(element.selectFirst("div.aniItem > a[href]")!!.attr("abs:href"))
+        thumbnail_url = element.selectFirst("div.aniItemImg img[src]")?.attr("abs:src")
+        title = element.selectFirst("h2.aniTitulo")!!.text()
+    }
+
+    // =============================== Search ===============================
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
+        return if (query.startsWith(PREFIX_SEARCH)) {
+            val path = query.removePrefix(PREFIX_SEARCH)
+            client.newCall(GET("$baseUrl/$path"))
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
+        } else {
+            super.getSearchAnime(page, query, filters)
+        }
+    }
+
+    private fun searchAnimeByIdParse(response: Response): AnimesPage {
+        val details = animeDetailsParse(response).apply {
+            setUrlWithoutDomain(response.request.url.toString())
+            initialized = true
+        }
+
+        return AnimesPage(listOf(details), false)
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val params = AnimesZoneFilters.getSearchParameters(filters)
+
+        val cleanQuery = query.replace(" ", "%20")
+        val queryQuery = if (query.isBlank()) {
+            ""
+        } else {
+            "&_pesquisa=$cleanQuery"
+        }
+        val url = "$baseUrl/?s=${params.genre}${params.year}${params.version}${params.studio}${params.type}${params.adult}$queryQuery"
+
+        val httpParams = url.substringAfter("$baseUrl/?").split("&").joinToString(",") {
+            val (key, value) = it.split("=", limit = 2)
+            "\"$key\":\"$value\""
+        }
+        val softRefresh = if (page == 1) 0 else 1
+        val jsonBody = """
+            {
+               "action":"facetwp_refresh",
+               "data":{
+                  "facets":{
+                     "generos":[
+                        ${queryToJsonList(params.genre)}
+                     ],
+                     "versao":[
+                        ${queryToJsonList(params.year)}
+                     ],
+                     "tipo":[
+                        ${queryToJsonList(params.version)}
+                     ],
+                     "estudio":[
+                        ${queryToJsonList(params.studio)}
+                     ],
+                     "tipototal":[
+                        ${queryToJsonList(params.type)}
+                     ],
+                     "adulto":[
+                        ${queryToJsonList(params.adult)}
+                     ],
+                     "pesquisa":"$query",
+                     "paginar":[
+
+                     ]
+                  },
+                  "frozen_facets":{
+
+                  },
+                  "http_params":{
+                     "get":{
+                        $httpParams
+                     },
+                     "uri":"",
+                     "url_vars":[
+
+                     ]
+                  },
+                  "template":"wp",
+                  "extras":{
+                     "sort":"default"
+                  },
+                  "soft_refresh":$softRefresh,
+                  "is_bfcache":1,
+                  "first_load":0,
+                  "paged":$page
+               }
+            }
+        """.trimIndent().toRequestBody("application/json".toMediaType())
+
+        return POST(url, headers, jsonBody)
+    }
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val parsed = response.parseAs<PostResponse>()
+
+        val document = Jsoup.parse(parsed.template)
+
+        val animes = document.select(searchAnimeSelector()).map(::searchAnimeFromElement)
+
+        val hasNextPage = parsed.settings.pager.run { page < total_pages }
+
+        return AnimesPage(animes, hasNextPage)
+    }
+
+    override fun searchAnimeSelector(): String = "div.aniItem"
+
+    override fun searchAnimeNextPageSelector(): String? = null
+
+    override fun searchAnimeFromElement(element: Element) = SAnime.create().apply {
+        setUrlWithoutDomain(element.selectFirst("a[href]")!!.attr("href"))
+        thumbnail_url = element.selectFirst("img[src]")?.attr("abs:src")
+        title = element.selectFirst("div.aniInfos")?.text() ?: "Anime"
+    }
+
+    // ============================== FILTERS ===============================
+    override fun getFilterList(): AnimeFilterList = AnimesZoneFilters.FILTER_LIST
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document) = SAnime.create().apply {
+        title = document.selectFirst("div.container > div div.bottom-div > h4")?.ownText()
+            ?: document.selectFirst("div#info > h1")?.text()
+            ?: "Anime"
+        thumbnail_url = document.selectFirst("div.container > div > img[src]")?.attr("abs:src")
+        description = document.selectFirst("section#sinopse p:matches(.)")?.text()
+            ?: document.selectFirst("div.content.right > dialog > p:matches(.)")?.text()
+        genre = document.select("div.card-body table > tbody > tr:has(>td:contains(Genres)) td > a").joinToString { it.text() }
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+
+        val singleVideo = document.selectFirst("div.anime__video__player")
+
+        // First check if single episode
+        return if (singleVideo != null) {
+            SEpisode.create().apply {
+                name = document.selectFirst("div#info h1")?.text() ?: "Episódio"
+                episode_number = 1F
+                setUrlWithoutDomain(document.location())
+            }.let(::listOf)
+        } else {
+            buildList {
+                document.select(episodeListSelector()).forEach { ep ->
+                    val name = ep.selectFirst("h2.aniTitulo")?.text()?.trim()
+                    // Check if it's multi-season
+                    var nextPageUrl = when {
+                        name != null && name.startsWith("temporada ", true) -> ep.selectFirst("a[href]")!!.attr("href")
+                        else -> {
+                            add(episodeFromElement(ep, size + 1))
+                            document.nextPageUrl()
+                        }
+                    }
+
+                    while (nextPageUrl != null) {
+                        val seasonDocument = client.newCall(GET(nextPageUrl)).execute()
+                            .asJsoup()
+
+                        seasonDocument.select(episodeListSelector()).forEach { seasonEp ->
+                            add(episodeFromElement(seasonEp, size + 1, name))
+                        }
+
+                        nextPageUrl = seasonDocument.nextPageUrl()
+                    }
+                }
+
+                reverse()
+            }
+        }
+    }
+
+    private fun Document.nextPageUrl() = selectFirst("div.paginadorplay > a:contains(Próxima Pagina)")?.absUrl("href")
+
+    override fun episodeListSelector(): String = "main.site-main ul.post-lst > li"
+
+    private fun episodeFromElement(element: Element, counter: Int, info: String? = null): SEpisode {
+        val epTitle = element.selectFirst("div.title")?.text() ?: element.text()
+        val epNumber = element.selectFirst("span.epiTipo")
+
+        return SEpisode.create().apply {
+            name = "Ep. ${epNumber?.text()?.trim() ?: counter} - ${epTitle.replace(EPISODE_REGEX, "")}"
+                .replace(" - - ", " - ")
+            episode_number = epNumber?.run {
+                text().trim().toFloatOrNull()
+            } ?: counter.toFloat()
+            scanlator = info
+            setUrlWithoutDomain(element.selectFirst("article > a")!!.attr("href"))
+        }
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode = throw UnsupportedOperationException()
+
+    // ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+
+        val videoList = document.select("div#playeroptions li[data-post]").flatMap { vid ->
+            val jsonHeaders = headersBuilder()
+                .add("Accept", "application/json, text/javascript, */*; q=0.01")
+                .add("X-Requested-With", "XMLHttpRequest")
+                .build()
+
+            val post = vid.attr("data-post")
+            val type = vid.attr("data-type")
+            val nume = vid.attr("data-nume")
+
+            val apires = client.newCall(
+                GET("$baseUrl/wp-json/dooplayer/v2/$post/$type/$nume", jsonHeaders),
+            ).execute()
+
+            val url = apires.parseAs<VideoResponse>().embed_url
+
+            when {
+                url.startsWith("https://dood") -> DoodExtractor(client).videosFromUrl(url, vid.text().trim())
+                "https://gojopoolt" in url -> {
+                    client.newCall(GET(url, headers)).execute()
+                        .asJsoup()
+                        .selectFirst("script:containsData(sources:)")
+                        ?.data()
+                        ?.let(BloggerJWPlayerExtractor::videosFromScript)
+                        .orEmpty()
+                }
+                url.startsWith(baseUrl) -> videosFromInternalUrl(url)
+                "blogger.com" in url -> extractBloggerVideos(url, vid.text().trim())
+                else -> emptyList()
+            }
+        }
+
+        return videoList
+    }
+
+    private fun videosFromInternalUrl(url: String): List<Video> {
+        val videoDocument = client.newCall(GET(url, headers)).execute()
+            .asJsoup()
+
+        val script = videoDocument.selectFirst("script:containsData(decodeURIComponent)")?.data()
+            ?.let(::getDecrypted)
+            ?: videoDocument.selectFirst("script:containsData(sources:)")?.data()
+            ?: return emptyList()
+
+        return when {
+            "/bloggerjwplayer" in url || "jwplayer-2" in url || "/ctaplayer" in url -> {
+                BloggerJWPlayerExtractor.videosFromScript(script)
+            }
+            "/m3u8" in url -> PlaylistExtractor.videosFromScript(script)
+            else -> emptyList()
+        }
+    }
+
+    private fun extractBloggerVideos(url: String, name: String): List<Video> {
+        return client.newCall(GET(url, headers)).execute()
+            .body.string()
+            .takeIf { !it.contains("errorContainer") }
+            .let { it ?: return emptyList() }
+            .substringAfter("\"streams\":[")
+            .substringBefore("]")
+            .split("},")
+            .map {
+                val videoUrl = it.substringAfter("{\"play_url\":\"").substringBefore('"')
+                val format = it.substringAfter("\"format_id\":").substringBefore("}")
+                val quality = when (format) {
+                    "18" -> "360p"
+                    "22" -> "720p"
+                    else -> "Unknown"
+                }
+                Video(videoUrl, "$quality - $name", videoUrl, headers = headers)
+            }
+    }
+
+    override fun videoFromElement(element: Element): Video = throw UnsupportedOperationException()
+
+    override fun videoListSelector(): String = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document): String = throw UnsupportedOperationException()
+
+    // ============================== Settings ==============================
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = PREF_QUALITY_TITLE
+            entries = PREF_QUALITY_ENTRIES
+            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)
+    }
+
+    // ============================= Utilities ==============================
+    private fun getDecrypted(script: String): String? {
+        val patchedScript = script.trim().split("\n").first()
+            .replace("eval(function", "function a")
+            .replace("decodeURIComponent(escape(r))}(", "r};a(")
+            .substringBeforeLast(")")
+
+        return QuickJs.create().use {
+            it.evaluate(patchedScript)?.toString()
+        }
+    }
+
+    private fun queryToJsonList(input: String): String {
+        if (input.isEmpty()) return ""
+        return input.substringAfter("=").split("%2C").joinToString(",") {
+            "\"$it\""
+        }
+    }
+
+    @Serializable
+    data class VideoResponse(val embed_url: String)
+
+    @Serializable
+    data class PostResponse(
+        val template: String,
+        val settings: Settings,
+    ) {
+        @Serializable
+        data class Settings(val pager: Pager) {
+            @Serializable
+            data class Pager(
+                val page: Int,
+                val total_pages: Int,
+            )
+        }
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+
+        return sortedWith(
+            compareBy { it.quality.contains(quality) },
+        ).reversed()
+    }
+
+    companion object {
+        const val PREFIX_SEARCH = "id:"
+
+        private val EPISODE_REGEX by lazy { Regex("""Episódio ?\d+\.?\d* ?""") }
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_TITLE = "Qualidade preferida"
+        private const val PREF_QUALITY_DEFAULT = "720"
+        private val PREF_QUALITY_ENTRIES = arrayOf("1080p", "720p", "480p", "360p")
+        private val PREF_QUALITY_VALUES = arrayOf("1080", "720", "480", "360")
+    }
+}
diff --git a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZoneFilters.kt b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZoneFilters.kt
new file mode 100644
index 00000000..73e82ee7
--- /dev/null
+++ b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZoneFilters.kt
@@ -0,0 +1,279 @@
+package eu.kanade.tachiyomi.animeextension.pt.animeszone
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object AnimesZoneFilters {
+    open class QueryPartFilter(
+        displayName: String,
+        val vals: Array<Pair<String, String>>,
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray(),
+    ) {
+        fun toQueryPart() = vals[state].second
+    }
+
+    open class CheckBoxFilterList(name: String, values: List<CheckBox>) : AnimeFilter.Group<AnimeFilter.CheckBox>(name, values)
+    private class CheckBoxVal(name: String, state: Boolean = false) : AnimeFilter.CheckBox(name, state)
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(name: String): String {
+        return (first { it is R } as QueryPartFilter).toQueryPart()
+            .takeUnless(String::isEmpty)
+            ?.let { "&$name=$it" }
+            .orEmpty()
+    }
+
+    private inline fun <reified R> AnimeFilterList.parseCheckbox(
+        options: Array<Pair<String, String>>,
+        name: String,
+    ): String {
+        return (first { it is R } as CheckBoxFilterList).state
+            .asSequence()
+            .filter { it.state }
+            .map { checkbox -> options.find { it.first == checkbox.name }!!.second }
+            .filter(String::isNotBlank)
+            .joinToString("%2C") { "&$name=$it" }
+    }
+
+    class GenreFilter : CheckBoxFilterList(
+        "Selecionar Gêneros",
+        AnimesZoneFiltersData.GENRE.map { CheckBoxVal(it.first, false) },
+    )
+
+    class YearFilter : QueryPartFilter("Ano", AnimesZoneFiltersData.YEAR)
+
+    class VersionFilter : QueryPartFilter("Versão", AnimesZoneFiltersData.VERSION)
+
+    class StudioFilter : CheckBoxFilterList(
+        "Estudio",
+        AnimesZoneFiltersData.STUDIO.map { CheckBoxVal(it.first, false) },
+    )
+
+    class TypeFilter : QueryPartFilter("Tipo", AnimesZoneFiltersData.TYPE)
+
+    class AdultFilter : QueryPartFilter("Adulto", AnimesZoneFiltersData.ADULT)
+
+    val FILTER_LIST get() = AnimeFilterList(
+        GenreFilter(),
+        StudioFilter(),
+        YearFilter(),
+        VersionFilter(),
+        TypeFilter(),
+        AdultFilter(),
+    )
+
+    data class FilterSearchParams(
+        val genre: String = "",
+        val year: String = "",
+        val version: String = "",
+        val studio: String = "",
+        val type: String = "",
+        val adult: String = "",
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        if (filters.isEmpty()) return FilterSearchParams()
+
+        return FilterSearchParams(
+            filters.parseCheckbox<GenreFilter>(AnimesZoneFiltersData.GENRE, "_generos"),
+            filters.asQueryPart<YearFilter>("_versao"),
+            filters.asQueryPart<VersionFilter>("_tipo"),
+            filters.parseCheckbox<StudioFilter>(AnimesZoneFiltersData.STUDIO, "_estudio"),
+            filters.asQueryPart<TypeFilter>("_tipototal"),
+            filters.asQueryPart<AdultFilter>("_adulto"),
+        )
+    }
+
+    private object AnimesZoneFiltersData {
+        val ANY = Pair("Selecione", "")
+
+        val GENRE = arrayOf(
+            Pair("Comédia", "comedia"),
+            Pair("Ação", "acao"),
+            Pair("Fantasia", "fantasia"),
+            Pair("Romance", "romance"),
+            Pair("Drama", "drama"),
+            Pair("Escolar", "escolar"),
+            Pair("Aventura", "aventura"),
+            Pair("Shounen", "shounen"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Slice-of-life", "slice-of-life"),
+            Pair("Sci-Fi", "sci-fi"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Mistério", "misterio"),
+            Pair("Seinen", "seinen"),
+            Pair("Magia", "magia"),
+            Pair("Animação", "animacao"),
+            Pair("Harem", "harem"),
+            Pair("Psicológico", "psicologico"),
+            Pair("Super Poder", "super-poder"),
+            Pair("Violência", "violencia"),
+            Pair("Sci-Fi & Fantasy", "sci-fi-fantasy"),
+            Pair("Histórico", "historico"),
+            Pair("Isekai", "isekai"),
+            Pair("Mecha", "mecha"),
+            Pair("Demónio", "demonio"),
+            Pair("Terror", "terror"),
+            Pair("Esportes", "esportes"),
+            Pair("Militar", "militar"),
+            Pair("Artes Marciais", "artes-marciais"),
+            Pair("Jogo", "jogo"),
+            Pair("Vampiro", "vampiro"),
+            Pair("Musical", "musical"),
+            Pair("Suspense", "suspense"),
+            Pair("Paródia", "parodia"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Nudez", "nudez"),
+            Pair("Supernatural", "supernatural"),
+            Pair("Espacial", "espacial"),
+            Pair("Shoujo-ai", "shoujo-ai"),
+            Pair("Crime", "crime"),
+            Pair("Policial", "policial"),
+            Pair("Ficção Científica", "ficcao-cientifica"),
+            Pair("Samurai", "samurai"),
+            Pair("Josei", "josei"),
+            Pair("Action & Adventure", "action-adventure"),
+            Pair("Amizade", "amizade"),
+            Pair("Horror", "horror"),
+            Pair("Família", "familia"),
+            Pair("Música", "musica"),
+            Pair("Insanidade", "insanidade"),
+            Pair("Obsceno", "obsceno"),
+            Pair("Shounen-ai", "shounen-ai"),
+            Pair("Carros", "carros"),
+            Pair("Gore", "gore"),
+            Pair("War & Politics", "war-politics"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Cinema TV", "cinema-tv"),
+            Pair("Gourmet", "gourmet"),
+            Pair("Infantil", "infantil"),
+            Pair("Vida Escolar", "vida-escolar"),
+        )
+
+        val YEAR = arrayOf(ANY) + (1986..2024).map {
+            Pair(it.toString(), it.toString())
+        }.reversed().toTypedArray()
+
+        val VERSION = arrayOf(
+            ANY,
+            Pair("Legendados", "legendada"),
+            Pair("Dublado", "series02"),
+            Pair("Seção de Hentais", "series03"),
+        )
+
+        val STUDIO = arrayOf(
+            Pair("J.C.Staff", "j-c-staff"),
+            Pair("Shueisha", "shueisha"),
+            Pair("Aniplex", "aniplex"),
+            Pair("BONES", "bones"),
+            Pair("Kadokawa", "kadokawa"),
+            Pair("TOHO Animation", "toho-animation"),
+            Pair("Pony Canyon", "pony-canyon"),
+            Pair("A-1 Pictures", "a-1-pictures"),
+            Pair("DENTSU", "dentsu"),
+            Pair("Kodansha", "kodansha"),
+            Pair("Production I.G", "production-i-g"),
+            Pair("CloverWorks", "cloverworks"),
+            Pair("Madhouse", "madhouse"),
+            Pair("Bit grooove promotion", "bit-grooove-promotion"),
+            Pair("MAPPA", "mappa"),
+            Pair("SILVER LINK.", "silver-link"),
+            Pair("Wit Studio", "wit-studio"),
+            Pair("Magic Capsule", "magic-capsule"),
+            Pair("OLM", "olm"),
+            Pair("Lantis", "lantis"),
+            Pair("Movic", "movic"),
+            Pair("SATELIGHT", "satelight"),
+            Pair("Shogakukan-Shueisha Productions", "shogakukan-shueisha-productions"),
+            Pair("Square Enix", "square-enix"),
+            Pair("STUDIO MAUSU", "studio-mausu"),
+            Pair("Yomiuri Telecasting Corporation", "yomiuri-telecasting-corporation"),
+            Pair("Bandai Namco Arts", "bandai-namco-arts"),
+            Pair("David Production", "david-production"),
+            Pair("EGG FIRM", "egg-firm"),
+            Pair("Lerche", "lerche"),
+            Pair("Liden Films", "liden-films"),
+            Pair("Sony Music Entertainment", "sony-music-entertainment-japan"),
+            Pair("Studio Deen", "studio-deen"),
+            Pair("TMS Entertainment", "tms-entertainment"),
+            Pair("Toho", "toho"),
+            Pair("Crunchyroll", "crunchyroll"),
+            Pair("dugout", "dugout"),
+            Pair("ENGI", "engi"),
+            Pair("MBS", "mbs"),
+            Pair("P.A.Works", "p-a-works"),
+            Pair("Tezuka Productions", "tezuka-productions"),
+            Pair("TV Tokyo", "tv-tokyo"),
+            Pair("Warner Bros. Japan", "warner-bros-japan"),
+            Pair("White Fox", "white-fox"),
+            Pair("avex pictures", "avex-pictures"),
+            Pair("Bibury Animation Studios", "bibury-animation-studios"),
+            Pair("Brain's Base", "brains-base"),
+            Pair("DMM music", "dmm-music"),
+            Pair("DMM pictures", "dmm-pictures"),
+            Pair("feel.", "feel"),
+            Pair("Hakuhodo DY Music & Pictures", "hakuhodo-dy-music-pictures"),
+            Pair("Lidenfilms", "lidenfilms"),
+            Pair("MAHO FILM", "maho-film"),
+            Pair("NHK Enterprises", "nhk-enterprises"),
+            Pair("Passione", "passione"),
+            Pair("Pierrot", "pierrot"),
+            Pair("Pine Jam", "pine-jam"),
+            Pair("Pink Pineapple", "pink-pineapple"),
+            Pair("project No.9", "project-no-9"),
+            Pair("Seven", "seven"),
+            Pair("SHAFT", "shaft"),
+            Pair("TNK", "tnk"),
+            Pair("Zero-G", "zero-g"),
+            Pair("Asahi Production", "asahi-production"),
+            Pair("asread", "asread"),
+            Pair("AT-X", "at-x"),
+            Pair("Bandai Namco Pictures", "bandai-namco-pictures"),
+            Pair("BS Fuji", "bs-fuji"),
+            Pair("C2C", "c2c"),
+            Pair("Children's Playground Entertainment", "childrens-playground-entertainment"),
+            Pair("diomedéa", "diomedea"),
+            Pair("Doga Kobo", "doga-kobo"),
+            Pair("Geno Studio", "geno-studio"),
+            Pair("Good Smile Company", "good-smile-company"),
+            Pair("Graphinica", "graphinica"),
+            Pair("Hakusensha", "hakusensha"),
+            Pair("HALF H·P STUDIO", "f279ee47217fbae84c07eb11181f4997"),
+            Pair("King Records", "king-records"),
+            Pair("Kyoto Animation", "kyoto-animation"),
+            Pair("Nippon BS Broadcasting", "nippon-bs-broadcasting"),
+            Pair("Nippon Columbia", "nippon-columbia"),
+            Pair("Nitroplus", "nitroplus"),
+            Pair("Shogakukan", "shogakukan"),
+            Pair("Sotsu", "sotsu"),
+            Pair("Sound Team・Don Juan", "45e6f4604baaebfbebf4f43139db8d68"),
+            Pair("Studio Gokumi", "studio-gokumi"),
+            Pair("Suiseisha", "suiseisha"),
+            Pair("SUNRISE", "sunrise"),
+            Pair("SynergySP", "synergysp"),
+            Pair("Techno Sound", "techno-sound"),
+            Pair("THE KLOCKWORX", "the-klockworx"),
+            Pair("Toei Animation", "toei-animation"),
+            Pair("TOY'S FACTORY", "toys-factory"),
+            Pair("Twin Engine", "twin-engine"),
+            Pair("ufotable", "ufotable"),
+            Pair("ABC Animation", "abc-animation"),
+            Pair("Ajiado", "ajiado"),
+            Pair("APDREAM", "apdream"),
+            Pair("Ashi Productions", "ashi-productions"),
+        )
+
+        val TYPE = arrayOf(
+            ANY,
+            Pair("TV Shows", "tvshows"),
+            Pair("Filmes", "movies"),
+        )
+
+        val ADULT = arrayOf(
+            ANY,
+            Pair("Hentais", "dublada"),
+            Pair("Seção de Hentais", "series03"),
+        )
+    }
+}
diff --git a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/extractors/BloggerJWPlayerExtractor.kt b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/extractors/BloggerJWPlayerExtractor.kt
new file mode 100644
index 00000000..c655a3e8
--- /dev/null
+++ b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/extractors/BloggerJWPlayerExtractor.kt
@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.animeextension.pt.animeszone.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+
+object BloggerJWPlayerExtractor {
+    fun videosFromScript(script: String): List<Video> {
+        val sources = script.substringAfter("sources: [").substringBefore("],")
+
+        return sources.split("{").drop(1).mapNotNull {
+            val label = it.substringAfter("label")
+                .substringAfter(':')
+                .substringAfter('"')
+                .substringBefore('"')
+
+            val videoUrl = it.substringAfter("file")
+                .substringAfter(':')
+                .substringAfter('"')
+                .substringBefore('"')
+                .replace("\\", "")
+            if (videoUrl.isEmpty()) {
+                null
+            } else {
+                Video(videoUrl, "BloggerJWPlayer - $label", videoUrl)
+            }
+        }
+    }
+}
diff --git a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/extractors/PlaylistExtractor.kt b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/extractors/PlaylistExtractor.kt
new file mode 100644
index 00000000..69d0d58c
--- /dev/null
+++ b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/extractors/PlaylistExtractor.kt
@@ -0,0 +1,18 @@
+package eu.kanade.tachiyomi.animeextension.pt.animeszone.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+
+object PlaylistExtractor {
+    fun videosFromScript(script: String): List<Video> {
+        val sources = script.substringAfter("sources: [").substringBefore("],")
+
+        return sources.split("file:\"").drop(1).mapNotNull { source ->
+            val url = source.substringBefore("\"").ifEmpty { return@mapNotNull null }
+            val label = source.substringAfter("label:\"").substringBefore("\"")
+                .replace("FHD", "1080p")
+                .replace("HD", "720p")
+                .replace("SD", "480p")
+            Video(url, "Playlist - $label", url)
+        }
+    }
+}
diff --git a/src/pt/doramogo/build.gradle b/src/pt/doramogo/build.gradle
index aaf67e86..dcb93341 100644
--- a/src/pt/doramogo/build.gradle
+++ b/src/pt/doramogo/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramogo'
     extClass = '.Doramogo'
-    extVersionCode = 2
+    extVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/goanimes/build.gradle b/src/pt/goanimes/build.gradle
new file mode 100644
index 00000000..3a8e648b
--- /dev/null
+++ b/src/pt/goanimes/build.gradle
@@ -0,0 +1,16 @@
+ext {
+    extName = 'GoAnimes'
+    extClass = '.GoAnimes'
+    themePkg = 'dooplay'
+    baseUrl = 'https://goanimes.net'
+    overrideVersionCode = 15
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+    implementation(project(":lib:playlist-utils"))
+    implementation(project(":lib:blogger-extractor"))
+    implementation(libs.jsunpacker)
+}
\ No newline at end of file
diff --git a/src/pt/goanimes/res/mipmap-hdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..28f83b4b
Binary files /dev/null and b/src/pt/goanimes/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/pt/goanimes/res/mipmap-mdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..e2211ca3
Binary files /dev/null and b/src/pt/goanimes/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/pt/goanimes/res/mipmap-xhdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..25602ee3
Binary files /dev/null and b/src/pt/goanimes/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/pt/goanimes/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..9a852ec0
Binary files /dev/null and b/src/pt/goanimes/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/pt/goanimes/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/goanimes/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..9d4d528e
Binary files /dev/null and b/src/pt/goanimes/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/GoAnimes.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/GoAnimes.kt
new file mode 100644
index 00000000..a5f5af15
--- /dev/null
+++ b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/GoAnimes.kt
@@ -0,0 +1,185 @@
+package eu.kanade.tachiyomi.animeextension.pt.goanimes
+
+import eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors.BloggerJWPlayerExtractor
+import eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors.GoAnimesExtractor
+import eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors.JsDecoder
+import eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors.LinkfunBypasser
+import eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors.PlaylistExtractor
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import okhttp3.Response
+import org.jsoup.nodes.Element
+
+class GoAnimes : DooPlay(
+    "pt-BR",
+    "GoAnimes",
+    "https://goanimes.net",
+) {
+    // ============================== Popular ===============================
+    override fun popularAnimeSelector() = "div#featured-titles article.item.tvshows > div.poster"
+
+    // =============================== Latest ===============================
+    override val latestUpdatesPath = "lancamentos"
+
+    // ============================== Episodes ==============================
+    override val seasonListSelector = "div#seasons > *"
+
+    override fun getSeasonEpisodes(season: Element): List<SEpisode> {
+        // All episodes are listed under a single page
+        season.selectFirst(episodeListSelector())?.let {
+            return getSeasonEpisodesRecursive(season)
+        }
+
+        // Episodes are listed at another page
+        val url = season.attr("href")
+        return client.newCall(GET(url, headers))
+            .execute()
+            .asJsoup()
+            .let(::getSeasonEpisodes)
+    }
+
+    private val episodeListNextPageSelector = "div.pagination span.current + a:not(.arrow_pag)"
+
+    private fun getSeasonEpisodesRecursive(season: Element): List<SEpisode> {
+        var doc = season.root()
+        return buildList {
+            do {
+                if (isNotEmpty()) {
+                    doc.selectFirst(episodeListNextPageSelector)?.let {
+                        val url = it.attr("abs:href")
+                        doc = client.newCall(GET(url, headers)).execute()
+                            .asJsoup()
+                    }
+                }
+                addAll(super.getSeasonEpisodes(doc))
+            } while (doc.selectFirst(episodeListNextPageSelector) != null)
+            reversed()
+        }
+    }
+
+    // ============================ Video Links =============================
+    override val prefQualityValues = arrayOf("240p", "360p", "480p", "720p", "1080p")
+    override val prefQualityEntries = prefQualityValues
+
+    private val goanimesExtractor by lazy { GoAnimesExtractor(client, headers) }
+    private val bloggerExtractor by lazy { BloggerExtractor(client) }
+    private val linkfunBypasser by lazy { LinkfunBypasser(client) }
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val players = document.select("ul#playeroptionsul li")
+        return players.parallelCatchingFlatMapBlocking(::getPlayerVideos)
+    }
+
+    private suspend fun getPlayerVideos(player: Element): List<Video> {
+        val name = player.selectFirst("span.title")!!.text()
+            .replace("FULLHD", "1080p")
+            .replace("HD", "720p")
+            .replace("SD", "480p")
+        val url = getPlayerUrl(player)
+        return when {
+            "https://gojopoolt" in url -> {
+                val headers = headers.newBuilder()
+                    .set("referer", url)
+                    .build()
+
+                val script = client.newCall(GET(url, headers)).await()
+                    .body.string()
+                    .let { JsDecoder.decodeScript(it, false).ifBlank { it } }
+
+                script.substringAfter("sources: [")
+                    .substringBefore(']')
+                    .split('{')
+                    .drop(1)
+                    .mapNotNull {
+                        val videoUrl = it.substringAfter("file: ")
+                            .substringBefore(", ")
+                            .trim('"', '\'', ' ')
+                            .ifBlank { return@mapNotNull null }
+
+                        val resolution = it.substringAfter("label: ", "")
+                            .substringAfter('"')
+                            .substringBefore('"')
+                            .ifBlank { name.split('-').last().trim() }
+
+                        val partialName = name.split('-').first().trim()
+                        return when {
+                            videoUrl.contains(".m3u8") -> {
+                                playlistUtils.extractFromHls(
+                                    videoUrl,
+                                    url,
+                                    videoNameGen = {
+                                        "$partialName - ${it.replace("Video", resolution)}"
+                                    },
+                                )
+                            }
+                            else -> listOf(Video(videoUrl, "$partialName - $resolution", videoUrl, headers))
+                        }
+                    }
+            }
+            listOf("/bloggerjwplayer", "/m3u8", "/multivideo").any { it in url } -> {
+                val script = client.newCall(GET(url)).await()
+                    .body.string()
+                    .let { JsDecoder.decodeScript(it, true).ifBlank { JsDecoder.decodeScript(it, false).ifBlank { it } } }
+                when {
+                    "/bloggerjwplayer" in url ->
+                        BloggerJWPlayerExtractor.videosFromScript(script)
+                    "/m3u8" in url ->
+                        PlaylistExtractor.videosFromScript(script)
+                    "/multivideo" in url ->
+                        script.substringAfter("attr")
+                            .substringAfter(" \"")
+                            .substringBefore('"')
+                            .let { goanimesExtractor.videosFromUrl(it, name) }
+
+                    else -> emptyList<Video>()
+                }
+            }
+            "www.blogger.com" in url -> bloggerExtractor.videosFromUrl(url, headers)
+            else -> goanimesExtractor.videosFromUrl(url, name)
+        }
+    }
+
+    private suspend fun getPlayerUrl(player: Element): String {
+        val type = player.attr("data-type")
+        val id = player.attr("data-post")
+        val num = player.attr("data-nume")
+        val url = client.newCall(GET("$baseUrl/wp-json/dooplayer/v2/$id/$type/$num"))
+            .await()
+            .body.string()
+            .substringAfter("\"embed_url\":\"")
+            .substringBefore("\",")
+            .replace("\\", "")
+
+        return when {
+            "/protetorlinks/" in url -> {
+                val link = client.newCall(GET(url)).await()
+                    .asJsoup()
+                    .selectFirst("a[href]")!!.attr("href")
+
+                client.newCall(GET(link)).await()
+                    .use(linkfunBypasser::getIframeUrl)
+            }
+            else -> url
+        }
+    }
+    // ============================= Utilities ==============================
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(videoSortPrefKey, videoSortPrefDefault)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+}
diff --git a/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/BloggerJWPlayerExtractor.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/BloggerJWPlayerExtractor.kt
new file mode 100644
index 00000000..e44071a7
--- /dev/null
+++ b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/BloggerJWPlayerExtractor.kt
@@ -0,0 +1,18 @@
+package eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+
+object BloggerJWPlayerExtractor {
+    fun videosFromScript(script: String): List<Video> {
+        val sources = script.substringAfter("sources: [").substringBefore("],")
+
+        return sources.split("{").drop(1).map {
+            val label = it.substringAfter("label").substringAfter(":\"").substringBefore('"')
+            val videoUrl = it.substringAfter("file")
+                .substringAfter(":\"")
+                .substringBefore('"')
+                .replace("\\", "")
+            Video(videoUrl, "BloggerJWPlayer - $label", videoUrl)
+        }
+    }
+}
diff --git a/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/GoAnimesExtractor.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/GoAnimesExtractor.kt
new file mode 100644
index 00000000..b416c144
--- /dev/null
+++ b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/GoAnimesExtractor.kt
@@ -0,0 +1,81 @@
+package eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors
+
+import android.util.Base64
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+
+class GoAnimesExtractor(private val client: OkHttpClient, private val headers: Headers) {
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    fun videosFromUrl(url: String, name: String): List<Video> {
+        val body = client.newCall(GET(url, headers)).execute()
+            .body.string()
+
+        val decodedBody = JsUnpacker.unpackAndCombine(body)
+            ?: JsDecoder.decodeScript(body, false).takeIf(String::isNotEmpty)
+            ?: JsDecoder.decodeScript(body, true).takeIf(String::isNotEmpty)
+            ?: body
+
+        val partialName = name.split('-').first().trim()
+        val resolution = name.split('-').last().trim()
+
+        return when {
+            "/proxy/v.php" in url -> {
+                val playlistUrl = JsUnpacker.unpackAndCombine(body)
+                    ?.substringAfterLast("player(\\'", "")
+                    ?.substringBefore("\\'", "")
+                    ?.takeIf(String::isNotEmpty)
+                    ?: return emptyList()
+
+                playlistUtils.extractFromHls(
+                    playlistUrl,
+                    url,
+                    videoNameGen = { "$partialName - ${it.replace("Video", resolution)}" },
+                )
+            }
+            "/proxy/api3/" in url -> {
+                val playlistUrl = body.substringAfter("sources:", "")
+                    .substringAfter("file:", "")
+                    .substringAfter("'", "")
+                    .substringBefore("'", "")
+                    .takeIf(String::isNotEmpty)
+                    ?: return emptyList()
+
+                val fixedUrl = if (playlistUrl.contains("/aHR0")) {
+                    val encoded = playlistUrl.substringAfterLast("/").substringBefore(".")
+                    String(Base64.decode(encoded, Base64.DEFAULT))
+                } else {
+                    playlistUrl
+                }
+
+                val referer = url.toHttpUrl().queryParameter("url") ?: url
+                playlistUtils.extractFromHls(
+                    fixedUrl,
+                    referer,
+                    videoNameGen = { "$partialName - ${it.replace("Video", resolution)}" },
+                )
+            }
+            "jwplayer" in decodedBody && "sources:" in decodedBody -> {
+                val videos = PlaylistExtractor.videosFromScript(decodedBody, partialName)
+
+                if ("label:" !in decodedBody && videos.size === 1) {
+                    return playlistUtils.extractFromHls(
+                        videos[0].url,
+                        url,
+                        videoNameGen = { "$partialName - ${it.replace("Video", resolution)}" },
+                    )
+                }
+
+                videos
+            }
+            else -> emptyList()
+        }
+    }
+}
+
+private const val PLAYER_NAME = "GoAnimes"
diff --git a/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/JsDecoder.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/JsDecoder.kt
new file mode 100644
index 00000000..22be5fe8
--- /dev/null
+++ b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/JsDecoder.kt
@@ -0,0 +1,48 @@
+package eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors
+
+import android.util.Base64
+import kotlin.math.pow
+
+object JsDecoder {
+    private fun convertToNum(thing: String, limit: Float): Int {
+        return thing.split("")
+            .reversed()
+            .map { it.toIntOrNull() ?: 0 }
+            .reduceIndexed { index: Int, acc, num ->
+                acc + (num * limit.pow(index - 1)).toInt()
+            }
+    }
+
+    fun decodeScript(encodedString: String, magicStr: String, offset: Int, limit: Int): String {
+        val regex = "\\w".toRegex()
+        return encodedString
+            .split(magicStr[limit])
+            .dropLast(1)
+            .map { str ->
+                val replaced = regex.replace(str) { magicStr.indexOf(it.value).toString() }
+                val charInt = convertToNum(replaced, limit.toFloat()) - offset
+                Char(charInt)
+            }.joinToString("")
+    }
+
+    fun decodeScript(html: String, isB64: Boolean = true): String {
+        val script = if (isB64) {
+            html.substringAfter(";base64,")
+                .substringBefore('"')
+                .let { String(Base64.decode(it, Base64.DEFAULT)) }
+        } else {
+            html
+        }
+
+        val regex = """\}\("(\w+)",.*?"(\w+)",(\d+),(\d+),.*?\)""".toRegex()
+        return regex.find(script)
+            ?.run {
+                decodeScript(
+                    groupValues[1], // encoded data
+                    groupValues[2], // magic string
+                    groupValues[3].toIntOrNull() ?: 0, // offset
+                    groupValues[4].toIntOrNull() ?: 0, // limit
+                )
+            } ?: ""
+    }
+}
diff --git a/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/LinkfunBypasser.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/LinkfunBypasser.kt
new file mode 100644
index 00000000..46bfec81
--- /dev/null
+++ b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/LinkfunBypasser.kt
@@ -0,0 +1,54 @@
+package eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors
+
+import android.util.Base64
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class LinkfunBypasser(private val client: OkHttpClient) {
+    fun getIframeUrl(page: Response): String {
+        val docString = page.body.string()
+        val document = if (docString.startsWith("<script")) {
+            page.asJsoup(decodeAtob(docString))
+        } else { page.asJsoup(docString) }
+
+        val newHeaders = Headers.headersOf("Referer", document.location())
+
+        val iframe = document.selectFirst("iframe[src]")
+
+        return if (iframe != null) {
+            iframe.attr("src")
+        } else {
+            val formBody = FormBody.Builder().apply {
+                document.select("input[name]").forEach {
+                    add(it.attr("name"), it.attr("value"))
+                }
+            }.build()
+
+            val formUrl = document.selectFirst("form")!!.attr("action")
+            client.newCall(POST(formUrl, newHeaders, formBody))
+                .execute()
+                .let(::getIframeUrl)
+        }
+    }
+
+    companion object {
+        fun decodeAtob(html: String): String {
+            val atobContent = html.substringAfter("atob(\"").substringBefore("\"));")
+            val hexAtob = atobContent.replace("\\x", "").decodeHex()
+            val decoded = Base64.decode(hexAtob, Base64.DEFAULT)
+            return String(decoded)
+        }
+
+        // Stolen from AnimixPlay(EN) / GogoCdnExtractor
+        private fun String.decodeHex(): ByteArray {
+            check(length % 2 == 0) { "Must have an even length" }
+            return chunked(2)
+                .map { it.toInt(16).toByte() }
+                .toByteArray()
+        }
+    }
+}
diff --git a/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/PlaylistExtractor.kt b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/PlaylistExtractor.kt
new file mode 100644
index 00000000..79c13f85
--- /dev/null
+++ b/src/pt/goanimes/src/eu/kanade/tachiyomi/animeextension/pt/goanimes/extractors/PlaylistExtractor.kt
@@ -0,0 +1,30 @@
+package eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+
+object PlaylistExtractor {
+    fun videosFromScript(script: String, prefix: String = "Playlist"): List<Video> {
+        val sources = script.substringAfter("sources: [").substringBefore("],")
+
+        return sources.split("{").drop(1).mapNotNull { source ->
+            val url = source.substringAfter("file:")
+                .substringAfter('"', "")
+                .substringBefore('"', "")
+                .takeIf(String::isNotEmpty)
+                ?: source.substringAfter("file:")
+                    .substringAfter("'", "")
+                    .substringBefore("'", "")
+                    .takeIf(String::isNotEmpty)
+
+            if (url.isNullOrBlank()) {
+                return@mapNotNull null
+            }
+
+            val label = source.substringAfter("label:").substringAfter('"').substringBefore('"')
+                .replace("FHD", "1080p")
+                .replace("HD", "720p")
+                .replace("SD", "480p")
+            Video(url, "$prefix - $label", url)
+        }
+    }
+}
diff --git a/src/pt/listadeanimes/build.gradle b/src/pt/listadeanimes/build.gradle
new file mode 100644
index 00000000..6ac76a1d
--- /dev/null
+++ b/src/pt/listadeanimes/build.gradle
@@ -0,0 +1,7 @@
+ext {
+    extName = 'Lista de Animes'
+    extClass = '.ListaDeAnimes'
+    extVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/pt/listadeanimes/res/mipmap-hdpi/ic_launcher.png b/src/pt/listadeanimes/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..5cee6385
Binary files /dev/null and b/src/pt/listadeanimes/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/pt/listadeanimes/res/mipmap-mdpi/ic_launcher.png b/src/pt/listadeanimes/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..a09f0d88
Binary files /dev/null and b/src/pt/listadeanimes/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/pt/listadeanimes/res/mipmap-xhdpi/ic_launcher.png b/src/pt/listadeanimes/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..fe66479c
Binary files /dev/null and b/src/pt/listadeanimes/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/pt/listadeanimes/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/listadeanimes/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..4d18c5d5
Binary files /dev/null and b/src/pt/listadeanimes/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/pt/listadeanimes/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/listadeanimes/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..91b2c05b
Binary files /dev/null and b/src/pt/listadeanimes/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt b/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt
new file mode 100644
index 00000000..b4b3b04f
--- /dev/null
+++ b/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt
@@ -0,0 +1,112 @@
+package eu.kanade.tachiyomi.animeextension.pt.listadeanimes
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+
+class ListaDeAnimes : ParsedAnimeHttpSource() {
+    override val name = "Lista de Animes"
+
+    override val baseUrl = "https://www.listadeanimes.com"
+
+    override val lang = "pt-BR"
+
+    override val supportsLatest = false
+
+    override fun headersBuilder() = super.headersBuilder()
+        .add("Referer", baseUrl)
+
+    // ============================== Popular ===============================
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/page/$page")
+
+    override fun popularAnimeSelector() = "article.post.excerpt > div.capa:not(:has(a[href=$baseUrl/anime-lista-online]))"
+
+    override fun popularAnimeFromElement(element: Element) = SAnime.create().apply {
+        setUrlWithoutDomain(element.selectFirst("a")!!.attr("href"))
+        val img = element.selectFirst("img")!!
+        title = titleCase(img.attr("title").substringBefore(" todos os episódios"))
+        thumbnail_url = img.attr("data-src")
+    }
+
+    override fun popularAnimeNextPageSelector() = "a.next.page-numbers"
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+    override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw UnsupportedOperationException()
+    override fun latestUpdatesNextPageSelector() = throw UnsupportedOperationException()
+
+    // =============================== Search ===============================
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList) = GET("$baseUrl/page/$page?s=$query")
+    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
+    override fun searchAnimeSelector() = popularAnimeSelector()
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
+    override fun searchAnimeNextPageSelector() = popularAnimeNextPageSelector()
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document) = SAnime.create().apply {
+        setUrlWithoutDomain(document.location())
+        val titleText = document.selectFirst("h1.title.single-title")!!.text()
+        title = titleCase(titleText.substringBefore(" todos os episódios"))
+        thumbnail_url = document.selectFirst("img.aligncenter.size-full")?.attr("src")
+        val infos = document.selectFirst("div#content.post-single-content > center")
+        val infosText = infos?.run {
+            html()
+                .replace("<br>", "\n")
+                .replace("<b>", "")
+                .replace("</b>", "")
+        }?.let { "\n\n$it" }.orEmpty()
+
+        val sinopse = document.selectFirst("div#content > *:contains(Sinopse)")?.nextElementSibling()
+        description = (sinopse?.text() ?: "Sem sinopse.") + infosText
+        genre = document.select("a[rel=tag]").joinToString { it.text() }
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListSelector() = "div.videos > ul"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val doc = response.asJsoup()
+        return doc.select("div.videos > ul > li:gt(0)")
+            .map(::episodeFromElement)
+            .reversed()
+    }
+    override fun episodeFromElement(element: Element): SEpisode {
+        return SEpisode.create().apply {
+            episode_number = runCatching {
+                element.selectFirst("string")!!
+                    .text()
+                    .substringAfter(" ")
+                    .toFloat()
+            }.getOrDefault(0F)
+            name = element.text().substringAfter("► ")
+            url = element.attr("id")
+        }
+    }
+
+    // ============================ Video Links =============================
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        return listOf(Video(episode.url, episode.name, episode.url))
+    }
+
+    override fun videoListSelector() = throw UnsupportedOperationException()
+    override fun videoListRequest(episode: SEpisode) = throw UnsupportedOperationException()
+    override fun videoListParse(response: Response) = throw UnsupportedOperationException()
+    override fun videoFromElement(element: Element) = throw UnsupportedOperationException()
+    override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
+
+    // ============================= Utilities ==============================
+    private fun titleCase(str: String): String {
+        return str.split(' ')
+            .map { it.replaceFirstChar(Char::uppercase) }
+            .joinToString(" ")
+    }
+}
diff --git a/src/pt/pifansubs/build.gradle b/src/pt/pifansubs/build.gradle
index 75b4c55b..69a5d3ea 100644
--- a/src/pt/pifansubs/build.gradle
+++ b/src/pt/pifansubs/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.PiFansubs'
     themePkg = 'dooplay'
     baseUrl = 'https://pifansubs.club'
-    overrideVersionCode = 20
+    overrideVersionCode = 21
     isNsfw = true
 }
 
diff --git a/src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt b/src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt
index f11e4b36..fe74f8d6 100644
--- a/src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt
+++ b/src/pt/pifansubs/src/eu/kanade/tachiyomi/animeextension/pt/pifansubs/PiFansubs.kt
@@ -41,7 +41,7 @@ class PiFansubs : DooPlay(
         }
     }
 
-    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client, headers) }
     private val blembedExtractor by lazy { BlembedExtractor(client, headers) }
 
     private fun getPlayerVideos(url: String): List<Video> {
diff --git a/src/pt/pobreflix/build.gradle b/src/pt/pobreflix/build.gradle
index 6475e42e..d34a4c40 100644
--- a/src/pt/pobreflix/build.gradle
+++ b/src/pt/pobreflix/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Pobreflix'
     themePkg = 'dooplay'
     baseUrl = 'https://pobreflix.global'
-    overrideVersionCode = 15
+    overrideVersionCode = 16
     isNsfw = true
 }
 
@@ -11,7 +11,7 @@ apply from: "$rootDir/common.gradle"
 
 dependencies {
     implementation(project(":lib:filemoon-extractor"))
-    implementation(project(":lib:fireplayer-extractor"))
+    implementation(project(':lib:fireplayer-extractor'))
     implementation(project(":lib:streamwish-extractor"))
     implementation(project(":lib:streamtape-extractor"))
     implementation(project(":lib:playlist-utils"))
diff --git a/src/tr/hdfilmcehennemi/AndroidManifest.xml b/src/tr/hdfilmcehennemi/AndroidManifest.xml
index 06e3c8fb..0b937f4f 100644
--- a/src/tr/hdfilmcehennemi/AndroidManifest.xml
+++ b/src/tr/hdfilmcehennemi/AndroidManifest.xml
@@ -13,7 +13,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="www.hdfilmcehennemi.us"
+                    android:host="www.hdfilmcehennemi.nl"
                     android:pathPattern="/..*"
                     android:scheme="https" />
             </intent-filter>
diff --git a/src/tr/hdfilmcehennemi/build.gradle b/src/tr/hdfilmcehennemi/build.gradle
index 530a1e79..eb61b91f 100644
--- a/src/tr/hdfilmcehennemi/build.gradle
+++ b/src/tr/hdfilmcehennemi/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HDFilmCehennemi'
     extClass = '.HDFilmCehennemi'
-    extVersionCode = 16
+    extVersionCode = 19
     isNsfw = true
 }
 
diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt
index f37e51ba..4d0cd18c 100644
--- a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt
+++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.CloseloadExtractor
+import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.RapidrameExtractor
 import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.VidmolyExtractor
 import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.XBetExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -19,13 +20,13 @@ import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
-import eu.kanade.tachiyomi.util.parallelMapBlocking
 import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import okhttp3.FormBody
 import okhttp3.MultipartBody
 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
@@ -33,11 +34,10 @@ import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
-
+class HDFilmCehennemi : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     override val name = "HDFilmCehennemi"
 
-    override val baseUrl = "https://www.hdfilmcehennemi.us"
+    override val baseUrl = "https://www.hdfilmcehennemi.nl"
 
     override val lang = "tr"
 
@@ -47,25 +47,40 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         .add("Referer", "$baseUrl/")
         .add("Origin", baseUrl)
 
+    private val apiHeaders = headersBuilder().add("X-Requested-With", "fetch").build()
+
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
     // ============================== Popular ===============================
-    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/en-cok-begenilen-filmleri-izle/page/$page/")
+    override fun popularAnimeRequest(page: Int) =
+        GET("$baseUrl/load/page/$page/mostLiked/", apiHeaders)
 
-    override fun popularAnimeSelector() = "div.row div.poster > a"
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val data = response.parseAs<ApiResponse>()
+        val doc = Jsoup.parse(data.html)
+        val itens = doc.select(popularAnimeSelector()).map(::popularAnimeFromElement)
+
+        return AnimesPage(itens, itens.size >= 28)
+    }
+
+    override fun popularAnimeSelector() = "a.poster"
 
     override fun popularAnimeFromElement(element: Element) = SAnime.create().apply {
         setUrlWithoutDomain(element.attr("href"))
-        title = element.selectFirst("h2.title")!!.text()
-        thumbnail_url = element.selectFirst("img")?.absUrl("data-src")
+        title = element.selectFirst("strong.poster-title, h4.title")!!.text()
+        thumbnail_url = element.selectFirst("img")?.run {
+            absUrl("data-src").ifBlank { absUrl("src") }
+        }
     }
 
     override fun popularAnimeNextPageSelector() = "ul.pagination > li > a[rel=next]"
 
     // =============================== Latest ===============================
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/page/$page/")
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/load/page/$page/home/", apiHeaders)
+
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
@@ -76,15 +91,17 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // =============================== Search ===============================
     override fun getFilterList() = HDFilmCehennemiFilters.FILTER_LIST
 
-    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
-        return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
-            val id = query.removePrefix(PREFIX_SEARCH)
-            client.newCall(GET("$baseUrl/$id"))
-                .awaitSuccess()
-                .use(::searchAnimeByIdParse)
-        } else {
-            super.getSearchAnime(page, query, filters)
-        }
+    override suspend fun getSearchAnime(
+        page: Int,
+        query: String,
+        filters: AnimeFilterList,
+    ): AnimesPage = if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
+        val id = query.removePrefix(PREFIX_SEARCH)
+        client.newCall(GET("$baseUrl/$id"))
+            .awaitSuccess()
+            .use(::searchAnimeByIdParse)
+    } else {
+        super.getSearchAnime(page, query, filters)
     }
 
     private fun searchAnimeByIdParse(response: Response): AnimesPage {
@@ -96,17 +113,14 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return AnimesPage(listOf(details), false)
     }
 
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val headers = headersBuilder()
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return when {
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request =
+        when {
             query.isNotBlank() -> {
                 val body = FormBody.Builder().add("query", query).build()
 
-                POST("$baseUrl/search/", headers, body)
+                POST("$baseUrl/search", apiHeaders, body)
             }
+
             else -> {
                 val params = HDFilmCehennemiFilters.getSearchParameters(filters)
 
@@ -123,28 +137,26 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 POST("$baseUrl/movies/load/", headers, form)
             }
         }
-    }
 
     @Serializable
-    data class SearchResponse(val result: List<ItemDto>)
+    data class SearchResponse(
+        val results: List<String>,
+    )
 
     @Serializable
-    data class ItemDto(val title: String, val poster: String, val slug: String, val slug_prefix: String)
-
-    @Serializable
-    data class FilterSearchResponse(val html: String, val showMore: Boolean, val status: Int)
+    data class FilterSearchResponse(
+        val html: String,
+        val showMore: Boolean,
+        val status: Int,
+    )
 
     override fun searchAnimeParse(response: Response): AnimesPage {
         return when {
-            response.request.url.toString().contains("/search/") -> { // Text search
+            response.request.url.toString().contains("/search") -> { // Text search
                 val data = response.parseAs<SearchResponse>()
-                val items = data.result.map {
-                    SAnime.create().apply {
-                        title = it.title
-                        thumbnail_url = "$baseUrl/uploads/poster/" + it.poster
-                        url = "/" + it.slug_prefix + it.slug
-                    }
-                }
+                val items = data.results.mapNotNull {
+                    Jsoup.parse(it).selectFirst("a[href]")
+                }.map(::popularAnimeFromElement)
 
                 AnimesPage(items, false)
             }
@@ -165,9 +177,7 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
 
-    override fun searchAnimeNextPageSelector(): String? {
-        throw UnsupportedOperationException()
-    }
+    override fun searchAnimeNextPageSelector(): String? = throw UnsupportedOperationException()
 
     // =========================== Anime Details ============================
     override fun animeDetailsParse(document: Document) = SAnime.create().apply {
@@ -176,17 +186,23 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             else -> SAnime.COMPLETED // movie
         }
 
-        val div = document.selectFirst("div.card-body > div.row")!!
+        title = document.selectFirst(".section-title")!!
+            .ownText()
+            .substringBefore(" Filminin Bilgileri")
+            .substringBefore(" izle")
+        val div = document.selectFirst("div.section-content div.post-info")!!
+        thumbnail_url = div.selectFirst("img")!!.absUrl("data-src")
 
-        div.selectFirst("img")!!.run {
-            thumbnail_url = absUrl("src")
-            title = attr("alt")
-        }
+        genre = div.select("div.post-info-genres > a")
+            .eachText()
+            .joinToString()
+            .takeIf(String::isNotEmpty)
+        artist = div.select("div.post-info-cast > a")
+            .eachText()
+            .joinToString()
+            .takeIf(String::isNotEmpty)
 
-        genre = div.select("div > a[href*=tur/]").eachText().joinToString().takeIf(String::isNotEmpty)
-        artist = div.select("a.chip[href*=oyuncu/]").eachText().joinToString().takeIf(String::isNotEmpty)
-
-        description = div.selectFirst("article > p")?.text()
+        description = div.selectFirst("div.post-info-content > p")?.text()
     }
 
     // ============================== Episodes ==============================
@@ -207,14 +223,14 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun episodeListParse(response: Response) =
         super.episodeListParse(response).sortedByDescending { it.episode_number }
 
-    override fun episodeListSelector() = "div#seasonsTabs-tabContent div.card-list-item > a"
+    override fun episodeListSelector() = "div.seasons-tabs-wrapper > div.seasons-tab-content > a"
 
     private val numberRegex by lazy { Regex("(\\d+)\\.") }
 
     override fun episodeFromElement(element: Element) = SEpisode.create().apply {
         setUrlWithoutDomain(element.attr("href"))
 
-        name = element.selectFirst("h3")!!.text()
+        name = element.selectFirst("h3, h4")!!.text()
 
         date_upload = element.selectFirst("date")?.attr("datetime")?.toDate() ?: 0L
 
@@ -226,39 +242,47 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // ============================ Video Links =============================
     private val vidmolyExtractor by lazy { VidmolyExtractor(client, headers) }
     private val closeloadExtractor by lazy { CloseloadExtractor(client, headers) }
+    private val rapidrameExtractor by lazy { RapidrameExtractor(client, headers) }
     private val xbetExtractor by lazy { XBetExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
         val doc = response.asJsoup()
 
-        return doc.select("div.card-body > nav > a:not([href^=#])")
-            .drop(1)
-            .parallelMapBlocking { client.newCall(GET(it.absUrl("href") + "/")).await().asJsoup() }
-            .let { listOf(doc) + it }
-            .mapNotNull { it.selectFirst("div.card-video > iframe") }
-            .map { it.attr("data-src").ifBlank { it.attr("src") } }
-            .filter(String::isNotBlank)
-            .parallelCatchingFlatMapBlocking { url ->
-                when {
-                    url.contains("https://closeload") -> closeloadExtractor.videosFromUrl(url)
-                    url.contains("vidmoly") -> vidmolyExtractor.videosFromUrl(url)
-                    url.contains("trstx.org") -> xbetExtractor.videosFromUrl(url)
-                    else -> emptyList()
-                }
-            }
+        val langTabs = doc.select(videoListSelector())
+
+        return langTabs
+            .flatMap {
+                it.select("button.alternative-link[data-video]")
+                    .map { btn -> Triple(it.attr("data-lang"), btn.text(), btn.attr("data-video")) }
+            }.parallelCatchingFlatMapBlocking(::extractVideos)
     }
 
-    override fun videoListSelector(): String {
-        throw UnsupportedOperationException()
+    private suspend fun extractVideos(info: Triple<String, String, String>): List<Video> {
+        val name = "[${info.first}] ${info.second}"
+        val url = client.newCall(GET("$baseUrl/video/${info.third}/", apiHeaders)).await()
+            .body.string()
+            .substringAfter("src=")
+            .substringBefore(' ')
+            .trim('\\', '"', '\'', ' ')
+            .replace("\\/", "/")
+        println(url)
+        return when {
+            url.contains("/rplayer") -> rapidrameExtractor.videosFromUrl(url, name)
+            name.contains("close") || url.contains("rapidrame") -> closeloadExtractor.videosFromUrl(
+                url,
+                name,
+            )
+            name.contains("vidmoly") -> vidmolyExtractor.videosFromUrl(url, name)
+            url.contains("trstx.org") -> xbetExtractor.videosFromUrl(url)
+            else -> emptyList()
+        }
     }
 
-    override fun videoFromElement(element: Element): Video {
-        throw UnsupportedOperationException()
-    }
+    override fun videoListSelector() = "div.alternative-tab div.alternative-links[data-lang]"
 
-    override fun videoUrlParse(document: Document): String {
-        throw UnsupportedOperationException()
-    }
+    override fun videoFromElement(element: Element): Video = throw UnsupportedOperationException()
+
+    override fun videoUrlParse(document: Document): String = throw UnsupportedOperationException()
 
     // ============================== Settings ==============================
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
@@ -288,10 +312,13 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         ).reversed()
     }
 
-    private fun String.toDate(): Long {
-        return runCatching { DATE_FORMATTER.parse(trim())?.time }
-            .getOrNull() ?: 0L
-    }
+    private fun String.toDate(): Long = runCatching { DATE_FORMATTER.parse(trim())?.time }
+        .getOrNull() ?: 0L
+
+    @Serializable
+    private class ApiResponse(
+        val html: String,
+    )
 
     companion object {
         const val PREFIX_SEARCH = "id:"
diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/CloseloadExtractor.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/CloseloadExtractor.kt
index 896fffc8..c8215f4c 100644
--- a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/CloseloadExtractor.kt
+++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/CloseloadExtractor.kt
@@ -14,7 +14,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 
 class CloseloadExtractor(private val client: OkHttpClient, private val headers: Headers) {
-    suspend fun videosFromUrl(url: String): List<Video> {
+    suspend fun videosFromUrl(url: String, name: String): List<Video> {
         val doc = client.newCall(GET(url, headers)).await().asJsoup()
         val script = doc.selectFirst("script:containsData(eval):containsData(PlayerInit)")?.data()
             ?: return emptyList()
@@ -38,7 +38,9 @@ class CloseloadExtractor(private val client: OkHttpClient, private val headers:
             Track(it.absUrl("src"), it.attr("label").ifEmpty { it.attr("srclang") })
         }
 
-        return listOf(Video(playlistUrl, "Closeload", playlistUrl, videoHeaders, subtitleTracks = subtitles))
+        return listOf(
+            Video(playlistUrl, name, playlistUrl, videoHeaders, subtitleTracks = subtitles),
+        )
     }
 
     private suspend fun tryAjaxPost(script: String, hostUrl: String) {
diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/RapidrameExtractor.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/RapidrameExtractor.kt
new file mode 100644
index 00000000..ac99004b
--- /dev/null
+++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/RapidrameExtractor.kt
@@ -0,0 +1,55 @@
+package eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors
+
+import android.util.Base64
+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.lib.unpacker.Unpacker
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
+import kotlinx.serialization.Serializable
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+@Serializable
+class TrackDto(val file: String, val label: String, val language: String)
+
+class RapidrameExtractor(private val client: OkHttpClient, private val headers: Headers) {
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    suspend fun videosFromUrl(url: String, label: String): List<Video> {
+        val doc = client.newCall(GET(url, headers)).await().asJsoup()
+        val script = doc.selectFirst("script:containsData(eval):containsData(atob)")?.data()
+            ?: return emptyList()
+
+        val unpackedScript = Unpacker.unpack(script).takeIf(String::isNotEmpty)
+            ?: return emptyList()
+
+        val varName = script.substringAfter("atob(").substringBefore(")")
+        val playlistUrl = unpackedScript.getProperty("$varName=")
+            .let { String(Base64.decode(it, Base64.DEFAULT)) }
+
+        val hostUrl = "https://" + url.toHttpUrl().host
+        val videoHeaders = headers.newBuilder()
+            .set("Referer", url)
+            .set("origin", hostUrl)
+            .build()
+
+        val subtitles = script.substringAfter("tracks:").substringBefore("],")
+            .parseAs<List<TrackDto>> { it + "]" }
+            .map { Track(hostUrl + it.file, "[${it.language}] ${it.label}") }
+
+        return playlistUtils.extractFromHls(
+            playlistUrl,
+            videoHeaders = videoHeaders,
+            masterHeaders = videoHeaders,
+            subtitleList = subtitles,
+            videoNameGen = { "$label - $it" },
+        )
+    }
+
+    private fun String.getProperty(before: String) =
+        substringAfter("$before\"").substringBefore('"')
+}
diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/VidmolyExtractor.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/VidmolyExtractor.kt
index 18f87f9d..3a5e90c4 100644
--- a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/VidmolyExtractor.kt
+++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/VidmolyExtractor.kt
@@ -10,7 +10,7 @@ import okhttp3.OkHttpClient
 class VidmolyExtractor(private val client: OkHttpClient, private val headers: Headers) {
     private val playlistUtils by lazy { PlaylistUtils(client, headers) }
 
-    suspend fun videosFromUrl(url: String): List<Video> {
+    suspend fun videosFromUrl(url: String, name: String): List<Video> {
         val body = client.newCall(GET(url, headers)).await()
             .body.string()
 
@@ -18,6 +18,6 @@ class VidmolyExtractor(private val client: OkHttpClient, private val headers: He
             .takeIf(String::isNotBlank)
             ?: return emptyList()
 
-        return playlistUtils.extractFromHls(playlistUrl, url, videoNameGen = { "Vidmoly - $it" })
+        return playlistUtils.extractFromHls(playlistUrl, url, videoNameGen = { "$name - $it" })
     }
 }
diff --git a/src/tr/hentaizm/AndroidManifest.xml b/src/tr/hentaizm/AndroidManifest.xml
index f7e34e55..a8ed707e 100644
--- a/src/tr/hentaizm/AndroidManifest.xml
+++ b/src/tr/hentaizm/AndroidManifest.xml
@@ -13,7 +13,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="www.hentaizm.fun"
+                    android:host="www.hentaizm.life"
                     android:pathPattern="/hentai-detay/..*"
                     android:scheme="https" />
             </intent-filter>
diff --git a/src/tr/tranimeci/build.gradle b/src/tr/tranimeci/build.gradle
index 0c24ae9d..970437a6 100644
--- a/src/tr/tranimeci/build.gradle
+++ b/src/tr/tranimeci/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.TRAnimeCI'
     themePkg = 'animestream'
     baseUrl = 'https://tranimaci.com'
-    overrideVersionCode = 1
+    overrideVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCI.kt b/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCI.kt
index 706b8f41..a0a8c75e 100644
--- a/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCI.kt
+++ b/src/tr/tranimeci/src/eu/kanade/tachiyomi/animeextension/tr/tranimeci/TRAnimeCI.kt
@@ -69,6 +69,7 @@ class TRAnimeCI : AnimeStream(
             .addIfNotBlank("season[]", params.season)
             .addIfNotBlank("format[]", params.type)
             .addIfNotBlank("studio[]", params.studio)
+            .addIfNotBlank("name", query)
             .build()
 
         return GET(url.toString(), headers)
@@ -99,6 +100,7 @@ class TRAnimeCI : AnimeStream(
     // =========================== Anime Details ============================
     override val animeDetailsSelector = "div.infox"
     override val animeStatusText = "Durum"
+    override val animeTitleSelector = ".entry-title"
 
     override fun parseStatus(statusString: String?): Int {
         return when (statusString?.trim()?.lowercase()) {
diff --git a/src/tr/turkanime/build.gradle b/src/tr/turkanime/build.gradle
index e2c7cf85..1f0262f2 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 = 26
+    extVersionCode = 32
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
index 8a28136f..b86c84e3 100644
--- a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
+++ b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
@@ -265,7 +265,7 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     AlucardExtractor(client, json, baseUrl).extractVideos(hosterLink, subber)
                 }
                 "DOODSTREAM" -> {
-                    DoodExtractor(client).videosFromUrl(hosterLink, "$subber: DOODSTREAM", redirect = false)
+                    DoodExtractor(client).videosFromUrl(hosterLink, "$subber:")
                 }
                 "EMBEDGRAM" -> {
                     EmbedgramExtractor(client, headers).videosFromUrl(hosterLink, prefix = "$subber: ")