diff --git a/src/all/animexin/build.gradle b/src/all/animexin/build.gradle
index e051573e..0dbeb5f3 100644
--- a/src/all/animexin/build.gradle
+++ b/src/all/animexin/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.AnimeXin'
     themePkg = 'animestream'
     baseUrl = 'https://animexin.vip'
-    overrideVersionCode = 9
+    overrideVersionCode = 8
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/AnimeXin.kt b/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/AnimeXin.kt
index f1a41804..9cc7d089 100644
--- a/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/AnimeXin.kt
+++ b/src/all/animexin/src/eu/kanade/tachiyomi/animeextension/all/animexin/AnimeXin.kt
@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream
 class AnimeXin : AnimeStream(
     "all",
     "AnimeXin",
-    "https://animexin.dev",
+    "https://animexin.vip",
 ) {
     override val id = 4620219025406449669
 
diff --git a/src/all/anizone/build.gradle b/src/all/anizone/build.gradle
deleted file mode 100644
index 9eb77b0c..00000000
--- a/src/all/anizone/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-ext {
-    extName = 'AniZone'
-    extClass = '.AniZone'
-    extVersionCode = 1
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(":lib:playlist-utils"))
-}
diff --git a/src/all/anizone/res/mipmap-hdpi/ic_launcher.png b/src/all/anizone/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 30ff4ee8..00000000
Binary files a/src/all/anizone/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/anizone/res/mipmap-mdpi/ic_launcher.png b/src/all/anizone/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 4e0d7b6a..00000000
Binary files a/src/all/anizone/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/anizone/res/mipmap-xhdpi/ic_launcher.png b/src/all/anizone/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 79cd46ee..00000000
Binary files a/src/all/anizone/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/anizone/res/mipmap-xxhdpi/ic_launcher.png b/src/all/anizone/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 47d0a46c..00000000
Binary files a/src/all/anizone/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/anizone/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/anizone/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index f44767b9..00000000
Binary files a/src/all/anizone/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/all/anizone/src/eu/kanade/tachiyomi/animeextension/all/anizone/AniZone.kt b/src/all/anizone/src/eu/kanade/tachiyomi/animeextension/all/anizone/AniZone.kt
deleted file mode 100644
index 863b450b..00000000
--- a/src/all/anizone/src/eu/kanade/tachiyomi/animeextension/all/anizone/AniZone.kt
+++ /dev/null
@@ -1,513 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.all.anizone
-
-import android.app.Application
-import android.content.SharedPreferences
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import androidx.preference.SwitchPreferenceCompat
-import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-import eu.kanade.tachiyomi.animesource.model.AnimesPage
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.animesource.model.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.network.POST
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.add
-import kotlinx.serialization.json.addJsonObject
-import kotlinx.serialization.json.buildJsonArray
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
-import kotlinx.serialization.json.putJsonArray
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.Request
-import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import org.jsoup.Jsoup.parseBodyFragment
-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
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-class AniZone : AnimeHttpSource(), ConfigurableAnimeSource {
-
-    override val name = "AniZone"
-
-    override val baseUrl = "https://anizone.to"
-
-    override val lang = "all"
-
-    override val supportsLatest = true
-
-    private val json: Json by injectLazy()
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    private var token: String = ""
-
-    private val snapShots: MutableMap<String, String> = mutableMapOf(
-        ANIME_SNAPSHOT_KEY to "",
-        EPISODE_SNAPSHOT_KEY to "",
-        VIDEO_SNAPSHOT_KEY to "",
-    )
-
-    private var loadCount: Int = 0
-
-    // ============================== Popular ===============================
-
-    override fun popularAnimeRequest(page: Int): Request {
-        return if (page == 1) {
-            loadCount = 0
-            snapShots[ANIME_SNAPSHOT_KEY] = ""
-
-            val updates = buildJsonObject {
-                put("sort", "title-asc")
-            }
-            val calls = buildJsonArray { }
-
-            createLivewireReq(ANIME_SNAPSHOT_KEY, updates, calls)
-        } else {
-            val updates = buildJsonObject { }
-            val calls = buildJsonArray {
-                addJsonObject {
-                    put("path", "")
-                    put("method", "loadMore")
-                    putJsonArray("params") { }
-                }
-            }
-
-            createLivewireReq(ANIME_SNAPSHOT_KEY, updates, calls)
-        }
-    }
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val html = response.parseAs<LivewireDto>().getHtml(ANIME_SNAPSHOT_KEY)
-
-        val animeList = html.select("div.grid > div").drop(loadCount)
-            .map(::animeFromElement)
-        val hasNextPage = html.selectFirst("div[x-intersect~=loadMore]") != null
-
-        loadCount += animeList.size
-
-        return AnimesPage(animeList, hasNextPage)
-    }
-
-    private fun animeFromElement(element: Element): SAnime {
-        return SAnime.create().apply {
-            thumbnail_url = element.selectFirst("img")!!.attr("src")
-            with(element.selectFirst("a.inline")!!) {
-                setUrlWithoutDomain(attr("href"))
-                title = text()
-            }
-        }
-    }
-
-    // =============================== Latest ===============================
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return if (page == 1) {
-            loadCount = 0
-            snapShots[ANIME_SNAPSHOT_KEY] = ""
-
-            val updates = buildJsonObject {
-                put("sort", "release-desc")
-            }
-            val calls = buildJsonArray { }
-
-            createLivewireReq(ANIME_SNAPSHOT_KEY, updates, calls)
-        } else {
-            popularAnimeRequest(page)
-        }
-    }
-
-    override fun latestUpdatesParse(response: Response): AnimesPage {
-        return popularAnimeParse(response)
-    }
-
-    // =============================== Search ===============================
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val sortFilter = filters.filterIsInstance<SortFilter>().first()
-
-        return if (page == 1) {
-            loadCount = 0
-            snapShots[ANIME_SNAPSHOT_KEY] = ""
-
-            val updates = buildJsonObject {
-                if (query.isNotEmpty()) {
-                    put("search", query)
-                }
-                put("sort", sortFilter.toUriPart())
-            }
-            val calls = buildJsonArray { }
-
-            createLivewireReq(ANIME_SNAPSHOT_KEY, updates, calls)
-        } else {
-            popularAnimeRequest(page)
-        }
-    }
-
-    override fun searchAnimeParse(response: Response): AnimesPage {
-        return popularAnimeParse(response)
-    }
-
-    // ============================== Filters ===============================
-
-    override fun getFilterList(): AnimeFilterList {
-        return AnimeFilterList(SortFilter())
-    }
-
-    private class SortFilter : UriPartFilter(
-        "Sort",
-        arrayOf(
-            Pair("A-Z", "title-asc"),
-            Pair("Z-A", "title-desc"),
-            Pair("Earliest Release", "release-asc"),
-            Pair("Latest Release", "release-desc"),
-            Pair("First Added", "added-asc"),
-            Pair("Last Added", "added-desc"),
-        ),
-    )
-
-    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(response: Response): SAnime {
-        val document = response.asJsoup()
-
-        val infoDiv = document.select("div.flex.items-start > div")[1]
-
-        return SAnime.create().apply {
-            thumbnail_url = document.selectFirst("div.flex.items-start img")!!.attr("abs:img")
-
-            with(infoDiv) {
-                title = selectFirst("h1")!!.text()
-                status = select("span.flex")[1].parseStatus()
-                description = selectFirst("div:has(>h3:contains(Synopsis)) > div")?.html()
-                    ?.replace("<br>", "\n")
-                    ?.replace(MULTILINE_REGEX, "\n\n")
-                genre = select("div > a").joinToString { it.text() }
-            }
-        }
-    }
-
-    private fun Element.parseStatus(): Int = when (this.text().lowercase()) {
-        "completed" -> SAnime.COMPLETED
-        "ongoing" -> SAnime.ONGOING
-        else -> SAnime.UNKNOWN
-    }
-
-    // ============================== Episodes ==============================
-
-    private fun getPredefinedSnapshots(slug: String): String {
-        return when (slug) {
-            "/anime/uyyyn4kf" -> """{"data":{"anime":[null,{"class":"anime","key":68,"s":"mdl"}],"title":null,"search":"","listSize":1104,"sort":"release-asc","sortOptions":[{"release-asc":"First Aired","release-desc":"Last Aired"},{"s":"arr"}],"view":"list","paginators":[{"page":1},{"s":"arr"}]},"memo":{"id":"GD1OiEMOJq6UQDQt1OBt","name":"pages.anime-detail","path":"anime\/uyyyn4kf","method":"GET","children":[],"scripts":[],"assets":[],"errors":[],"locale":"en"},"checksum":"5800932dd82e4862f34f6fd72d8098243b32643e8accb8da6a6a39cd0ee86acd"}"""
-            else -> ""
-        }
-    }
-
-    override fun episodeListRequest(anime: SAnime): Request {
-        snapShots[EPISODE_SNAPSHOT_KEY] = getPredefinedSnapshots(anime.url)
-
-        val updates = buildJsonObject {
-            put("sort", "release-desc")
-        }
-        val calls = buildJsonArray { }
-
-        return createLivewireReq(EPISODE_SNAPSHOT_KEY, updates, calls, anime.url)
-    }
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.parseAs<LivewireDto>().getHtml(EPISODE_SNAPSHOT_KEY)
-        val episodeList = document.select(episodeSelector)
-            .map(::episodeFromElement)
-            .toMutableList()
-        loadCount = episodeList.size
-
-        var hasMore = document.selectFirst("div[x-intersect~=loadMore]") != null
-
-        while (hasMore) {
-            val updates = buildJsonObject { }
-            val calls = buildJsonArray {
-                addJsonObject {
-                    put("path", "")
-                    put("method", "loadMore")
-                    putJsonArray("params") { }
-                }
-            }
-
-            val resp = client.newCall(
-                createLivewireReq(EPISODE_SNAPSHOT_KEY, updates, calls),
-            ).execute().parseAs<LivewireDto>().getHtml(EPISODE_SNAPSHOT_KEY)
-
-            val episodes = resp.select(episodeSelector)
-                .drop(loadCount)
-                .map(::episodeFromElement)
-
-            episodeList.addAll(episodes)
-            loadCount += episodes.size
-
-            hasMore = resp.selectFirst("div[x-intersect~=loadMore]") != null
-        }
-
-        return episodeList
-    }
-
-    private val episodeSelector = "ul > li"
-
-    private fun episodeFromElement(element: Element): SEpisode {
-        val url = element.selectFirst("a[href]")!!.attr("abs:href")
-
-        return SEpisode.create().apply {
-            setUrlWithoutDomain(url)
-            name = element.selectFirst("h3")!!.text()
-            date_upload = element.select("div.flex-row > span").getOrNull(1)
-                ?.text()
-                ?.let { parseDate(it) }
-                ?: 0L
-        }
-    }
-
-    // ============================ Video Links =============================
-
-    override fun videoListRequest(episode: SEpisode): Request {
-        return GET(baseUrl + episode.url, headers)
-    }
-
-    private val playlistUtils: PlaylistUtils by lazy { PlaylistUtils(client, headers) }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val serverSelects = document.select("button[wire:click]")
-            .filter { video ->
-                video.attr("wire:click").contains("setVideo")
-            }
-
-        val subtitles = document.select("track[kind=subtitles]").map {
-            Track(it.attr("src"), it.attr("label"))
-        }
-
-        val m3u8List = mutableListOf(
-            VideoData(
-                url = document.selectFirst("media-player")!!.attr("src"),
-                name = serverSelects.first().text(),
-                subtitles = subtitles,
-            ),
-        )
-        snapShots[VIDEO_SNAPSHOT_KEY] = document.getSnapshot()
-
-        serverSelects.drop(1).forEach { video ->
-            val regex = "setVideo\\('(\\d+)'\\)".toRegex()
-            val matchResult = regex.find(video.attr("wire:click"))
-            val videoId = if (matchResult != null && matchResult.groupValues.size == 1) {
-                matchResult.groupValues[1]
-            } else {
-                "0"
-            }
-            val updates = buildJsonObject { }
-            val calls = buildJsonArray {
-                add(
-                    buildJsonObject {
-                        put("path", "")
-                        put("method", "setVideo")
-                        putJsonArray("params") {
-                            add(videoId.toInt())
-                        }
-                    },
-                )
-            }
-
-            val doc = client.newCall(
-                createLivewireReq(VIDEO_SNAPSHOT_KEY, updates, calls, response.request.url.encodedPath),
-            ).execute().parseAs<LivewireDto>().getHtml(VIDEO_SNAPSHOT_KEY)
-
-            val subs = doc.select("track[kind=subtitles]").map {
-                Track(it.attr("src"), it.attr("label"))
-            }
-
-            doc.selectFirst("media-player")?.attr("src")?.also {
-                m3u8List.add(
-                    VideoData(
-                        url = it,
-                        name = video.text(),
-                        subtitles = subs,
-                    ),
-                )
-            }
-        }
-
-        val serverList = if (preferences.dub) {
-            m3u8List
-        } else {
-            m3u8List.reversed()
-        }
-
-        return serverList.flatMap {
-            playlistUtils.extractFromHls(
-                playlistUrl = it.url,
-                referer = "$baseUrl/",
-                videoNameGen = { q -> "${it.name} - $q" },
-                subtitleList = it.subtitles,
-            )
-        }
-    }
-
-    data class VideoData(
-        val url: String,
-        val name: String,
-        val subtitles: List<Track>,
-    )
-
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.quality
-        return sortedWith(
-            compareBy { it.quality.contains(quality) },
-        ).reversed()
-    }
-
-    // ============================= Utilities ==============================
-
-    private fun LivewireDto.getHtml(mapKey: String): Document {
-        val data = this.components.first()
-
-        snapShots[mapKey] = data.snapshot.replace("\\\"", "\"")
-
-        return parseBodyFragment(
-            data.effects.html.replace("\\\"", "\"")
-                .replace("\\n", ""),
-        )
-    }
-
-    private fun Document.getSnapshot(): String {
-        return this.selectFirst("main > div[wire:snapshot]")!!
-            .attr("wire:snapshot")
-            .replace("&quot;", "\"")
-    }
-
-    private fun createLivewireReq(
-        mapKey: String,
-        updates: JsonObject,
-        calls: JsonArray,
-        initialSlug: String = "/anime",
-    ): Request {
-        val firstSnapshot = snapShots[mapKey] ?: ""
-
-        if (firstSnapshot.isEmpty() || token.isEmpty()) {
-            val doc = client.newCall(GET(baseUrl + initialSlug, headers)).execute()
-                .asJsoup()
-
-            snapShots[mapKey] = doc.getSnapshot()
-
-            token = doc.selectFirst("script[data-csrf]")
-                ?.attr("data-csrf")
-                ?.takeIf(String::isNotEmpty)
-                ?: throw Exception("Failed to get csrf token")
-        }
-
-        val headers = headersBuilder().apply {
-            add("X-Livewire", "")
-        }.build()
-
-        val body = buildJsonObject {
-            put("_token", token)
-            putJsonArray("components") {
-                addJsonObject {
-                    put("calls", calls)
-                    put("snapshot", snapShots[mapKey])
-                    put("updates", updates)
-                }
-            }
-        }.toRequestBody()
-
-        return POST("$baseUrl/livewire/update", headers, body)
-    }
-
-    private fun JsonObject.toRequestBody(): RequestBody {
-        return json.encodeToString(this).toRequestBody(
-            "application/json".toMediaType(),
-        )
-    }
-
-    private fun parseDate(dateStr: String): Long {
-        return try {
-            DATE_FORMAT.parse(dateStr)!!.time
-        } catch (_: ParseException) {
-            0L
-        }
-    }
-
-    private val SharedPreferences.quality
-        get() = getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
-
-    private val SharedPreferences.dub
-        get() = getBoolean(PREF_DUB_KEY, PREF_DUB_DEFAULT)
-
-    companion object {
-        private val MULTILINE_REGEX = Regex("""\n{2,}""")
-        private val DATE_FORMAT by lazy { SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH) }
-
-        private const val ANIME_SNAPSHOT_KEY = "anime_snapshot_key"
-        private const val EPISODE_SNAPSHOT_KEY = "episode_snapshot_key"
-        private const val VIDEO_SNAPSHOT_KEY = "video_snapshot_key"
-
-        private const val PREF_QUALITY_KEY = "preferred_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_ENTRY_VALUES = arrayOf("1080", "720", "480", "360")
-
-        private const val PREF_DUB_KEY = "attempt_dub"
-        private const val PREF_DUB_TITLE = "Attempt to prefer dub"
-        private const val PREF_DUB_DEFAULT = false
-    }
-
-    // ============================ Preferences =============================
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = PREF_QUALITY_TITLE
-            entries = PREF_QUALITY_ENTRIES
-            entryValues = PREF_QUALITY_ENTRY_VALUES
-            setDefaultValue(PREF_QUALITY_DEFAULT)
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, new ->
-                val index = findIndexOfValue(new as String)
-                preferences.edit().putString(key, entryValues[index] as String).commit()
-            }
-        }.also(screen::addPreference)
-
-        SwitchPreferenceCompat(screen.context).apply {
-            key = PREF_DUB_KEY
-            title = PREF_DUB_TITLE
-            setDefaultValue(PREF_DUB_DEFAULT)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val new = newValue as Boolean
-                preferences.edit().putBoolean(key, new).commit()
-            }
-        }.also(screen::addPreference)
-    }
-}
diff --git a/src/all/anizone/src/eu/kanade/tachiyomi/animeextension/all/anizone/LivewireDto.kt b/src/all/anizone/src/eu/kanade/tachiyomi/animeextension/all/anizone/LivewireDto.kt
deleted file mode 100644
index 0341a99e..00000000
--- a/src/all/anizone/src/eu/kanade/tachiyomi/animeextension/all/anizone/LivewireDto.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.all.anizone
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-class LivewireDto(
-    val components: List<ComponentDto>,
-) {
-    @Serializable
-    class ComponentDto(
-        val snapshot: String,
-        val effects: EffectsDto,
-    ) {
-        @Serializable
-        class EffectsDto(
-            val html: String,
-        )
-    }
-}
diff --git a/src/all/missav/build.gradle b/src/all/missav/build.gradle
index 57e84ac6..3408ac32 100644
--- a/src/all/missav/build.gradle
+++ b/src/all/missav/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MissAV'
     extClass = '.MissAV'
-    extVersionCode = 12
+    extVersionCode = 11
     isNsfw = true
 }
 
@@ -11,4 +11,4 @@ dependencies {
     implementation(project(':lib:unpacker'))
     implementation(project(':lib:playlist-utils'))
     implementation(project(':lib:javcoverfetcher'))
-}
+}
\ No newline at end of file
diff --git a/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt b/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt
index 18926960..23717e42 100644
--- a/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt
+++ b/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt
@@ -29,7 +29,7 @@ class MissAV : AnimeHttpSource(), ConfigurableAnimeSource {
 
     override val lang = "all"
 
-    override val baseUrl = "https://missav.ai"
+    override val baseUrl = "https://missav.com"
 
     override val supportsLatest = true
 
diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle
index 986c0de4..10eb74d8 100644
--- a/src/en/animepahe/build.gradle
+++ b/src/en/animepahe/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimePahe'
     extClass = '.AnimePahe'
-    extVersionCode = 29
+    extVersionCode = 27
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
index c85d1679..f13f3227 100644
--- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
+++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
@@ -73,10 +73,10 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
         // webview or share it.
         val session = runBlocking {
             withContext(Dispatchers.IO) {
-                fetchSession(animeId)
+                fetchSession(anime.title, animeId)
             }
         }
-        return GET("$baseUrl/anime/$session")
+        return GET("$baseUrl/anime/$session?anime_id=$animeId")
     }
 
     override fun animeDetailsParse(response: Response): SAnime {
@@ -146,7 +146,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
      * @see animeDetailsRequest
      */
     override fun episodeListRequest(anime: SAnime): Request {
-        val session = fetchSession(anime.getId())
+        val session = fetchSession(anime.title, anime.getId())
         return GET("$baseUrl/api?m=release&id=$session&sort=episode_desc&page=1")
     }
 
@@ -310,10 +310,13 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private fun fetchSession(animeId: String): String {
-        val resolveAnimeRequest = client.newCall(GET("$baseUrl/a/$animeId")).execute()
-        val sessionId = resolveAnimeRequest.request.url.pathSegments.last()
-        return sessionId
+    private fun fetchSession(title: String, animeId: String): String {
+        return client.newCall(GET("$baseUrl/api?m=search&q=$title"))
+            .execute()
+            .body.string()
+            .substringAfter("\"id\":$animeId")
+            .substringAfter("\"session\":\"")
+            .substringBefore("\"")
     }
 
     private fun parseStatus(statusString: String): Int {
diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt
index f8140aa0..19b366a0 100644
--- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt
+++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt
@@ -35,6 +35,7 @@ import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Response
+import kotlin.math.pow
 
 class KwikExtractor(private val client: OkHttpClient) {
     private var cookies: String = ""
@@ -107,25 +108,52 @@ class KwikExtractor(private val client: OkHttpClient) {
     }
 
     private fun decrypt(fullString: String, key: String, v1: Int, v2: Int): String {
-        val keyIndexMap = key.withIndex().associate { it.value to it.index }
-        val sb = StringBuilder()
+        var r = ""
         var i = 0
-        val toFind = key[v2]
 
         while (i < fullString.length) {
-            val nextIndex = fullString.indexOf(toFind, i)
-            val decodedCharStr = buildString {
-                for (j in i until nextIndex) {
-                    append(keyIndexMap[fullString[j]] ?: -1)
-                }
+            var s = ""
+
+            while (fullString[i] != key[v2]) {
+                s += fullString[i]
+                ++i
             }
+            var j = 0
 
-            i = nextIndex + 1
+            while (j < key.length) {
+                s = s.replace(key[j].toString(), j.toString())
+                ++j
+            }
+            r += (getString(s, v2).toInt() - v1).toChar()
+            ++i
+        }
+        return r
+    }
 
-            val decodedChar = (decodedCharStr.toInt(v2) - v1).toChar()
-            sb.append(decodedChar)
+    private fun getString(content: String, s1: Int): String {
+        val s2 = 10
+        val characterMap = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/"
+
+        val slice2 = characterMap.slice(0 until s2)
+        var acc: Long = 0
+
+        for ((n, i) in content.reversed().withIndex()) {
+            acc += when (isNumber("$i")) {
+                true -> "$i".toLong()
+                false -> 0L
+            } * s1.toDouble().pow(n.toDouble()).toInt()
         }
 
-        return sb.toString()
+        var k = ""
+
+        while (acc > 0) {
+            k = slice2[(acc % s2).toInt()] + k
+            acc = (acc - (acc % s2)) / s2
+        }
+
+        return when (k != "") {
+            true -> k
+            false -> "0"
+        }
     }
 }
diff --git a/src/es/estrenosdoramas/build.gradle b/src/es/estrenosdoramas/build.gradle
deleted file mode 100644
index 6b707d95..00000000
--- a/src/es/estrenosdoramas/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-ext {
-    extName = 'EstrenosDoramas'
-    extClass = '.EstrenosDoramas'
-    extVersionCode = 1
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(':lib:okru-extractor'))
-    implementation(project(':lib:streamwish-extractor'))
-    implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib:voe-extractor'))
-    implementation(project(':lib:yourupload-extractor'))
-    implementation(project(':lib:vidguard-extractor'))
-}
\ No newline at end of file
diff --git a/src/es/estrenosdoramas/res/mipmap-hdpi/ic_launcher.png b/src/es/estrenosdoramas/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index dc6014a2..00000000
Binary files a/src/es/estrenosdoramas/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/estrenosdoramas/res/mipmap-mdpi/ic_launcher.png b/src/es/estrenosdoramas/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index fb32665b..00000000
Binary files a/src/es/estrenosdoramas/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/estrenosdoramas/res/mipmap-xhdpi/ic_launcher.png b/src/es/estrenosdoramas/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index c64a8b26..00000000
Binary files a/src/es/estrenosdoramas/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/estrenosdoramas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/estrenosdoramas/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index aafd62f1..00000000
Binary files a/src/es/estrenosdoramas/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/estrenosdoramas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/estrenosdoramas/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index fe054ec2..00000000
Binary files a/src/es/estrenosdoramas/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
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
deleted file mode 100644
index 8f94f8c2..00000000
--- a/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramas.kt
+++ /dev/null
@@ -1,220 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.estrenosdoramas
-
-import android.app.Application
-import android.content.SharedPreferences
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-import eu.kanade.tachiyomi.animesource.model.AnimesPage
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
-import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
-import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
-import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
-import eu.kanade.tachiyomi.lib.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 eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
-import okhttp3.Request
-import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-
-class EstrenosDoramas : ConfigurableAnimeSource, AnimeHttpSource() {
-
-    override val name = "EstrenosDoramas"
-
-    override val baseUrl = "https://estrenosdoramas.es"
-
-    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 = "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(
-            "StreamWish",
-            "Voe",
-            "Okru",
-            "YourUpload",
-            "FileLions",
-            "StreamHideVid",
-            "VidGuard",
-        )
-    }
-
-    override fun animeDetailsParse(response: Response): SAnime {
-        val document = response.asJsoup()
-        return SAnime.create().apply {
-            title = document.selectFirst(".entry-title")?.text()?.trim() ?: ""
-            description = document.selectFirst(".mindesc")?.text()?.trim()
-            genre = document.select(".genxed a").joinToString { it.text() }
-            thumbnail_url = document.selectFirst(".thumb img")?.attr("abs:src")
-            document.select(".spe > span").map {
-                val title = it.select("b").text()
-                when {
-                    title.contains("Estado") -> status = it.ownText().getStatus()
-                    title.contains("Casts") -> artist = it.select("a").joinToString { it.text() }
-                    title.contains("Network") -> author = it.select("a").joinToString { it.text() }
-                }
-            }
-        }
-    }
-
-    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/temporadas/?page=$page&order=popular", headers)
-
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val elements = document.select(".listupd article a")
-        val nextPage = document.select(".hpage .r, .pagination .next").any()
-        val animeList = elements.map { element ->
-            SAnime.create().apply {
-                setUrlWithoutDomain(element.attr("abs:href"))
-                title = element.attr("title")
-                thumbnail_url = element.selectFirst("img")!!.attr("abs:src")
-            }
-        }
-        return AnimesPage(animeList, nextPage)
-    }
-
-    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
-
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/temporadas/?page=$page&order=latest", headers)
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val params = EstrenosDoramasFilters.getSearchParameters(filters)
-        return when {
-            query.isNotBlank() -> GET("$baseUrl/page/$page/?s=$query", headers)
-            params.filter.isNotBlank() -> GET("$baseUrl/temporadas/${params.getQuery()}&page=$page", headers)
-            else -> popularAnimeRequest(page)
-        }
-    }
-
-    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.asJsoup()
-        return document.select("#myList li a").mapIndexed { idx, it ->
-            val title = it.select(".epl-title").text().trim()
-            val epNumber = try {
-                """(\d+(\.\d+)?)""".toRegex().find(title)?.groupValues?.get(1)?.toFloat() ?: (idx + 1f)
-            } catch (_: Exception) { idx + 1f }
-
-            SEpisode.create().apply {
-                episode_number = epNumber
-                name = title
-                scanlator = it.select(".epl-sub span").joinToString { it.text() }
-                setUrlWithoutDomain(it.attr("abs:href"))
-            }
-        }
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        return document.select("[data-embed]").parallelCatchingFlatMapBlocking {
-            val link = it.attr("data-embed")
-            val realLink = fetchUrls(client.newCall(GET(link)).execute().networkResponse.toString()).firstOrNull()
-            serverVideoResolver(realLink?.ifEmpty { link } ?: "")
-        }
-    }
-
-    /*--------------------------------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 voeExtractor by lazy { VoeExtractor(client) }
-    private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
-    private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
-
-    private fun serverVideoResolver(url: String): List<Video> {
-        return when {
-            arrayOf("ok.ru", "okru").any(url) -> okruExtractor.videosFromUrl(url)
-            arrayOf("filelions", "lion", "fviplions").any(url) -> streamWishExtractor.videosFromUrl(url, videoNameGen = { "FileLions:$it" })
-            arrayOf("wishembed", "streamwish", "strwish", "wish").any(url) -> streamWishExtractor.videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
-            arrayOf("vidhide", "streamhide", "guccihide", "streamvid").any(url) -> streamHideVidExtractor.videosFromUrl(url)
-            arrayOf("voe", "robertordercharacter", "donaldlineelse").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()
-        }
-    }
-
-    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 getFilterList(): AnimeFilterList = EstrenosDoramasFilters.FILTER_LIST
-
-    private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
-
-    private fun String.getStatus(): Int {
-        val status = this.trim()
-        return when {
-            status.contains("Ongoing") -> SAnime.ONGOING
-            status.contains("Completed") -> SAnime.COMPLETED
-            else -> SAnime.UNKNOWN
-        }
-    }
-
-    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 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/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramasFilters.kt b/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramasFilters.kt
deleted file mode 100644
index 2f05a12d..00000000
--- a/src/es/estrenosdoramas/src/eu/kanade/tachiyomi/animeextension/es/estrenosdoramas/EstrenosDoramasFilters.kt
+++ /dev/null
@@ -1,237 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.estrenosdoramas
-
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-
-object EstrenosDoramasFilters {
-    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>(EstrenosDoramasFiltersData.GENRES, "genre") +
-                filters.parseCheckbox<SeasonsFilter>(EstrenosDoramasFiltersData.SEASONS, "season") +
-                filters.parseCheckbox<StudiosFilter>(EstrenosDoramasFiltersData.STUDIOS, "studio") +
-                filters.parseCheckbox<CountriesFilter>(EstrenosDoramasFiltersData.COUNTRIES, "country") +
-                filters.parseCheckbox<NetworksFilter>(EstrenosDoramasFiltersData.NETWORKS, "network") +
-                filters.asQueryPart<StatusFilter>("status") +
-                filters.asQueryPart<TypesFilter>("type") +
-                filters.asQueryPart<SortFilter>("order"),
-        )
-    }
-
-    val FILTER_LIST get() = AnimeFilterList(
-        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
-        GenresFilter(),
-        SeasonsFilter(),
-        StudiosFilter(),
-        CountriesFilter(),
-        NetworksFilter(),
-        StatusFilter(),
-        TypesFilter(),
-        SortFilter(),
-    )
-
-    class GenresFilter : CheckBoxFilterList("Géneros", EstrenosDoramasFiltersData.GENRES.map { CheckBoxVal(it.first, false) })
-    class SeasonsFilter : CheckBoxFilterList("Temporadas", EstrenosDoramasFiltersData.SEASONS.map { CheckBoxVal(it.first, false) })
-    class StudiosFilter : CheckBoxFilterList("Estudio", EstrenosDoramasFiltersData.STUDIOS.map { CheckBoxVal(it.first, false) })
-    class CountriesFilter : CheckBoxFilterList("País", EstrenosDoramasFiltersData.COUNTRIES.map { CheckBoxVal(it.first, false) })
-    class NetworksFilter : CheckBoxFilterList("Networks", EstrenosDoramasFiltersData.NETWORKS.map { CheckBoxVal(it.first, false) })
-    class StatusFilter : QueryPartFilter("Estatus", EstrenosDoramasFiltersData.STATUS)
-    class TypesFilter : QueryPartFilter("Tipo", EstrenosDoramasFiltersData.TYPES)
-    class SortFilter : QueryPartFilter("Orden", EstrenosDoramasFiltersData.SORT)
-
-    private object EstrenosDoramasFiltersData {
-        val GENRES = arrayOf(
-            Pair("Action", "action"),
-            Pair("Adult Cast", "adult-cast"),
-            Pair("Adventure", "adventure"),
-            Pair("Business", "business"),
-            Pair("Comedy", "comedy"),
-            Pair("Crime", "crime"),
-            Pair("Documentary", "documentary"),
-            Pair("Drama", "drama"),
-            Pair("Ecchi", "ecchi"),
-            Pair("Family", "family"),
-            Pair("Fantasy", "fantasy"),
-            Pair("Food", "food"),
-            Pair("Gourmet", "gourmet"),
-            Pair("Harem", "harem"),
-            Pair("Historical", "historical"),
-            Pair("Horror", "horror"),
-            Pair("Isekai", "isekai"),
-            Pair("Law", "law"),
-            Pair("Life", "life"),
-            Pair("Martial Arts", "martial-arts"),
-            Pair("Mature", "mature"),
-            Pair("Medical", "medical"),
-            Pair("Melodrama", "melodrama"),
-            Pair("Military", "military"),
-            Pair("Music", "music"),
-            Pair("Mystery", "mystery"),
-            Pair("Mythology", "mythology"),
-            Pair("Political", "political"),
-            Pair("Psychological", "psychological"),
-            Pair("Reincarnation", "reincarnation"),
-            Pair("Romance", "romance"),
-            Pair("Sci-Fi", "sci-fi"),
-            Pair("Seinen", "seinen"),
-            Pair("Shoujo", "shoujo"),
-            Pair("Shounen", "shounen"),
-            Pair("Sitcom", "sitcom"),
-            Pair("Sports", "sports"),
-            Pair("Supernatural", "supernatural"),
-            Pair("Thriller", "thriller"),
-            Pair("War", "war"),
-            Pair("Workplace", "workplace"),
-            Pair("Wuxia", "wuxia"),
-            Pair("Youth", "youth"),
-        )
-
-        val SEASONS = arrayOf(
-            Pair("Winter 2024", "winter-2024"),
-        )
-
-        val STUDIOS = arrayOf(
-            Pair("Connect", "connect"),
-            Pair("Drive", "drive"),
-            Pair("HORNETS", "hornets"),
-            Pair("Okuruto Noboru", "okuruto-noboru"),
-            Pair("Seven Arcs", "seven-arcs"),
-            Pair("Shin-Ei Animation", "shin-ei-animation"),
-            Pair("SILVER LINK.", "silver-link"),
-            Pair("Studio Add", "studio-add"),
-            Pair("Studio Flad", "studio-flad"),
-            Pair("Studio Kai", "studio-kai"),
-            Pair("Studio PuYUKAI", "studio-puyukai"),
-            Pair("SynergySP", "synergysp"),
-            Pair("Trigger", "trigger"),
-        )
-
-        val COUNTRIES = arrayOf(
-            Pair("China", "china"),
-            Pair("Japan", "japan"),
-            Pair("South Korea", "south-korea"),
-            Pair("Taiwan", "taiwan"),
-            Pair("Thailand", "thailand"),
-        )
-
-        val NETWORKS = arrayOf(
-            Pair("Amazon Prime", "amazon-prime"),
-            Pair("BS Asahi", "bs-asahi"),
-            Pair("CCTV", "cctv"),
-            Pair("Channel 3", "channel-3"),
-            Pair("Channel 9", "channel-9"),
-            Pair("Channel A", "channel-a"),
-            Pair("COUPANG TV", "coupang-tv"),
-            Pair("Disney+", "disney"),
-            Pair("ENA", "ena"),
-            Pair("Fuji TV", "fuji-tv"),
-            Pair("Genie TV", "genie-tv"),
-            Pair("GMM 25", "gmm-25"),
-            Pair("GMM One", "gmm-one"),
-            Pair("GTV", "gtv"),
-            Pair("Hulu", "hulu"),
-            Pair("Hunan TV", "hunan-tv"),
-            Pair("iQiyi", "iqiyi"),
-            Pair("JSTV", "jstv"),
-            Pair("jTBC", "jtbc"),
-            Pair("KBS2", "kbs2"),
-            Pair("Mango TV", "mango-tv"),
-            Pair("MBC", "mbc"),
-            Pair("MBN", "mbn"),
-            Pair("MBS", "mbs"),
-            Pair("Mnet", "mnet"),
-            Pair("Naver TV Cast", "naver-tv-cast"),
-            Pair("Netflix", "netflix"),
-            Pair("One 31", "one-31"),
-            Pair("oneD", "oned"),
-            Pair("SBS", "sbs"),
-            Pair("SBS Plus", "sbs-plus"),
-            Pair("SET TV", "set-tv"),
-            Pair("Sohu TV", "sohu-tv"),
-            Pair("TBS", "tbs"),
-            Pair("Telasa", "telasa"),
-            Pair("Tencent Video", "tencent-video"),
-            Pair("Tokyo MX", "tokyo-mx"),
-            Pair("TV Chosun", "tv-chosun"),
-            Pair("TV Tokyo", "tv-tokyo"),
-            Pair("TVING", "tving"),
-            Pair("TVK", "tvk"),
-            Pair("tvN", "tvn"),
-            Pair("Viki", "viki"),
-            Pair("ViuTV", "viutv"),
-            Pair("vLive", "vlive"),
-            Pair("Wavve", "wavve"),
-            Pair("WeTV", "wetv"),
-            Pair("Workpoint TV", "workpoint-tv"),
-            Pair("Youku", "youku"),
-            Pair("ZJTV", "zjtv"),
-        )
-
-        val STATUS = arrayOf(
-            Pair("All", ""),
-            Pair("Ongoing", "Ongoing"),
-            Pair("Completed", "Completed"),
-        )
-
-        val TYPES = arrayOf(
-            Pair("All", ""),
-            Pair("Dorama", "Drama"),
-            Pair("TV Show", "TV Show"),
-            Pair("Anime", "Anime"),
-            Pair("Película", "Movie"),
-            Pair("Special", "Special"),
-        )
-
-        val SORT = arrayOf(
-            Pair("Latest Update", "update"),
-            Pair("A-Z", "title"),
-            Pair("Z-A", "titlereverse"),
-            Pair("Latest Added", "latest"),
-            Pair("Popular", "popular"),
-            Pair("Rating", "rating"),
-        )
-    }
-}
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index f47d942d..2c12913f 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiLA'
     extClass = '.Hentaila'
-    extVersionCode = 28
+    extVersionCode = 27
     isNsfw = true
 }
 
@@ -14,5 +14,4 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:streamhidevid-extractor'))
-    implementation(project(':lib:sendvid-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..e622f374 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
@@ -14,7 +14,6 @@ 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.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.voeextractor.VoeExtractor
@@ -31,6 +30,7 @@ import okhttp3.Response
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
+import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -65,7 +65,6 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
             "Mp4Upload",
             "BurstCloud",
             "StreamHideVid",
-            "Sendvid",
         )
 
         private val DATE_FORMATTER by lazy {
@@ -95,27 +94,45 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
-        val genreFilter = filterList.filterIsInstance<GenreFilter>().firstOrNull()
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
 
         if (query.isNotEmpty()) {
-            require(query.length >= 2) { "La búsqueda debe tener al menos 2 caracteres" }
+            if (query.length < 2) throw IOException("La búsqueda debe tener al menos 2 caracteres")
             return POST("$baseUrl/api/search", headers, FormBody.Builder().add("value", query).build())
         }
 
-        val urlBuilder = "$baseUrl/${if (genreFilter?.state != 0) "genero/${genreFilter?.toUriPart()}" else "directorio?p=$page"}"
-            .toHttpUrl().newBuilder()
+        var url = "$baseUrl/directorio?p=$page".toHttpUrl().newBuilder()
+
+        if (genreFilter.state != 0) {
+            url = "$baseUrl/genero/${genreFilter.toUriPart()}?p=$page".toHttpUrl().newBuilder()
+        }
 
         filterList.forEach { filter ->
             when (filter) {
-                is OrderFilter -> urlBuilder.addQueryParameter("filter", filter.toUriPart())
-                is StatusOngoingFilter -> if (filter.state) urlBuilder.addQueryParameter("status[1]", "on")
-                is StatusCompletedFilter -> if (filter.state) urlBuilder.addQueryParameter("status[2]", "on")
-                is UncensoredFilter -> if (filter.state) urlBuilder.addQueryParameter("uncensored", "on")
+                is OrderFilter -> {
+                    url.addQueryParameter("filter", filter.toUriPart())
+                }
+                is StatusOngoingFilter -> {
+                    if (filter.state) {
+                        url.addQueryParameter("status[1]", "on")
+                    }
+                }
+                is StatusCompletedFilter -> {
+                    if (filter.state) {
+                        url.addQueryParameter("status[2]", "on")
+                    }
+                }
+                is UncensoredFilter -> {
+                    if (filter.state) {
+                        url.addQueryParameter("uncensored", "on")
+                    }
+                }
+
                 else -> {}
             }
         }
 
-        return GET(urlBuilder.build().toString(), headers)
+        return GET(url.build().toString(), headers)
     }
 
     override fun searchAnimeParse(response: Response): AnimesPage {
@@ -133,7 +150,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
         }
 
         val document = response.asJsoup()
-        val animeList = document.select("div.columns main section.section div.grid.hentais article.hentai").map {
+        val animes = document.select("div.columns main section.section div.grid.hentais article.hentai").map {
             SAnime.create().apply {
                 title = it.select("header.h-header h2").text()
                 setUrlWithoutDomain(it.select("a").attr("abs:href"))
@@ -143,7 +160,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
 
         val hasNextPage = document.select("a.btn.rnd.npd.fa-arrow-right").any()
 
-        return AnimesPage(animeList, hasNextPage)
+        return AnimesPage(animes, hasNextPage)
     }
 
     override fun animeDetailsParse(response: Response): SAnime {
@@ -189,7 +206,6 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
     private val burstCloudExtractor by lazy { BurstCloudExtractor(client) }
     private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
-    private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -211,7 +227,6 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
                 "mp4upload" -> mp4uploadExtractor.videosFromUrl(urlServer, headers = headers)
                 "burst" -> burstCloudExtractor.videoFromUrl(urlServer, headers = headers)
                 "vidhide", "streamhide", "guccihide", "streamvid" -> streamHideVidExtractor.videosFromUrl(urlServer)
-                "sendvid" -> sendvidExtractor.videosFromUrl(urlServer)
                 else -> emptyList()
             }
         }
@@ -264,20 +279,20 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
             Pair("Casadas", "casadas"),
             Pair("Chikan", "chikan"),
             Pair("Ecchi", "ecchi"),
-            Pair("Enfermeras", "enfermeras"),
             Pair("Escolares", "escolares"),
+            Pair("Enfermeras", "enfermeras"),
             Pair("Futanari", "futanari"),
+            Pair("Harem", "Harem"),
             Pair("Gore", "gore"),
             Pair("Hardcore", "hardcore"),
-            Pair("Harem", "harem"),
             Pair("Incesto", "incesto"),
             Pair("Juegos Sexuales", "juegos-sexuales"),
-            Pair("Milfs", "milfs"),
             Pair("Maids", "maids"),
+            Pair("Milfs", "milfs"),
             Pair("Netorare", "netorare"),
             Pair("Ninfomania", "ninfomania"),
             Pair("Ninjas", "ninjas"),
-            Pair("Orgias", "orgias"),
+            Pair("Orgia", "orgia"),
             Pair("Romance", "romance"),
             Pair("Shota", "shota"),
             Pair("Softcore", "softcore"),
@@ -288,15 +303,9 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
             Pair("Vanilla", "vanilla"),
             Pair("Violacion", "violacion"),
             Pair("Virgenes", "virgenes"),
-            Pair("Yaoi", "yaoi"),
+            Pair("Yaoi", "Yaoi"),
             Pair("Yuri", "yuri"),
             Pair("Bondage", "bondage"),
-            Pair("Elfas", "elfas"),
-            Pair("Petit", "petit"),
-            Pair("Threesome", "threesome"),
-            Pair("Paizuri", "paizuri"),
-            Pair("Gal", "gal"),
-            Pair("Oyakodon", "oyakodon"),
         ),
     )
 
diff --git a/src/pt/animesbr/build.gradle b/src/pt/animesbr/build.gradle
deleted file mode 100644
index c66bc9eb..00000000
--- a/src/pt/animesbr/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-ext {
-    extName = 'AnimesBr'
-    extClass = '.AnimesBr'
-    themePkg = 'dooplay'
-    baseUrl = 'https://animesbr.tv'
-    overrideVersionCode = 1
-    isNsfw = true
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1")
-    implementation(project(":lib:vidmoly-extractor"))
-}
diff --git a/src/pt/animesbr/res/mipmap-hdpi/ic_launcher.png b/src/pt/animesbr/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 4b1f5cae..00000000
Binary files a/src/pt/animesbr/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesbr/res/mipmap-mdpi/ic_launcher.png b/src/pt/animesbr/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index d32cf0ce..00000000
Binary files a/src/pt/animesbr/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesbr/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animesbr/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6df7154c..00000000
Binary files a/src/pt/animesbr/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesbr/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animesbr/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324750a1..00000000
Binary files a/src/pt/animesbr/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesbr/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animesbr/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 986f334e..00000000
Binary files a/src/pt/animesbr/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/AnimesBr.kt b/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/AnimesBr.kt
deleted file mode 100644
index 921fa3a8..00000000
--- a/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/AnimesBr.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesbr
-
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.pt.animesbr.extractors.FourNimesExtractor
-import eu.kanade.tachiyomi.animeextension.pt.animesbr.extractors.RuplayExtractor
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.lib.vidmolyextractor.VidMolyExtractor
-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.parallelCatchingFlatMapBlocking
-import okhttp3.FormBody
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-
-class AnimesBr : DooPlay(
-    "pt-BR",
-    "Animes BR",
-    "https://animesbr.tv",
-) {
-
-    // ============================== Popular ===============================
-    override fun popularAnimeSelector() = "article.w_item_b > a"
-
-    override fun popularAnimeRequest(page: Int) = GET(baseUrl, headers)
-
-    // =============================== Latest ===============================
-    override val latestUpdatesPath = "episodios"
-
-    override fun latestUpdatesNextPageSelector() = "div.pagination > a.arrow_pag > i.fa-caret-right"
-
-    // =============================== Search ===============================
-
-    // =========================== Anime Details ============================
-    override val additionalInfoSelector = "div.wp-content"
-
-    override fun Document.getDescription(): String {
-        return select("$additionalInfoSelector p")
-            .first { !it.text().contains("Todos os Episódios") }
-            ?.let { it.text() + "\n" }
-            ?: ""
-    }
-
-    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()
-                }.replace("Todos os Episódios", "").trim()
-            }
-
-            genre = sheader.select("div.data div.sgeneros > a")
-                .eachText()
-                .joinToString()
-
-            doc.selectFirst("div#info")?.let { info ->
-                description = buildString {
-                    append(doc.getDescription())
-                    additionalInfoItems.forEach {
-                        info.getInfo(it)?.let(::append)
-                    }
-                }
-            }
-        }
-    }
-
-    // ============================ Video Links =============================
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val players = document.select("ul#playeroptionsul li")
-        return players.parallelCatchingFlatMapBlocking(::getPlayerVideos)
-    }
-
-    override val prefQualityValues = arrayOf("360p", "720p")
-    override val prefQualityEntries = prefQualityValues
-
-    private val fourNimesExtractor by lazy { FourNimesExtractor(client) }
-    private val ruplayExtractor by lazy { RuplayExtractor(client) }
-    private val vidMolyExtractor by lazy { VidMolyExtractor(client) }
-
-    private fun getPlayerVideos(player: Element): List<Video> {
-        val name = player.selectFirst("span.title")!!.text()
-            .run {
-                if (this.lowercase().endsWith("dub")) {
-                    "Dublado"
-                } else {
-                    "Legendado"
-                }
-            }
-
-        val url = getPlayerUrl(player) ?: return emptyList()
-
-        return when {
-            "4nimes.com" in url -> fourNimesExtractor.videosFromUrl(url, "$name - ")
-            "4youmovies" in url -> fourNimesExtractor.videosFromUrl(url, "$name - ")
-            "vidmoly" in url -> vidMolyExtractor.videosFromUrl(url, "$name - ")
-            "/embed/" in url -> ruplayExtractor.videosFromUrl(url, "$name - ")
-
-            else -> 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 fun genresListRequest() = GET("$baseUrl/generos/", headers)
-    override fun genresListSelector() = "div.wp-content a[href*=generos]"
-
-    // ============================== Settings ==============================
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoLanguagePref = ListPreference(screen.context).apply {
-            key = PREF_LANGUAGE_KEY
-            title = PREF_LANGUAGE_TITLE
-            entries = PREF_LANGUAGE_ENTRIES
-            entryValues = PREF_LANGUAGE_VALUES
-            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()
-            }
-        }
-
-        screen.addPreference(videoLanguagePref)
-        super.setupPreferenceScreen(screen)
-    }
-
-    // ============================= Utilities ==============================
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString(videoSortPrefKey, videoSortPrefDefault)!!
-        val language = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
-        return sortedWith(
-            compareBy(
-                { it.quality.lowercase().contains(language.lowercase()) },
-                { it.quality.lowercase().contains(quality.lowercase()) },
-                { REGEX_QUALITY.find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
-            ),
-        ).reversed()
-    }
-
-    companion object {
-        private val REGEX_QUALITY by lazy { Regex("""(\d+)p""") }
-
-        private const val PREF_LANGUAGE_KEY = "preferred_language"
-        private const val PREF_LANGUAGE_DEFAULT = "Legendado"
-        private const val PREF_LANGUAGE_TITLE = "Língua preferida"
-        private val PREF_LANGUAGE_VALUES = arrayOf("Legendado", "Dublado")
-        private val PREF_LANGUAGE_ENTRIES = PREF_LANGUAGE_VALUES
-    }
-}
diff --git a/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/extractors/FourNimesExtractor.kt b/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/extractors/FourNimesExtractor.kt
deleted file mode 100644
index f1c29b81..00000000
--- a/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/extractors/FourNimesExtractor.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesbr.extractors
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.Serializable
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-
-class FourNimesExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
-
-        val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
-            ?.let(JsUnpacker::unpackAndCombine)
-            ?: return emptyList()
-
-        val kaken = script.substringAfter("kaken", "")
-            .substringAfter('"')
-            .substringBefore('"')
-            .ifEmpty { null }
-            ?: return emptyList()
-
-        val now = System.currentTimeMillis()
-        val apiUrl = "https://${url.toHttpUrl().host}/api?$kaken&_=$now"
-
-        return client.newCall(GET(apiUrl)).execute().parseAs<Response>().sources.map { source ->
-            val videoUrl = source.file
-            val quality = source.label
-
-            Video(videoUrl, "$prefix 4nimes - $quality ".trim(), videoUrl)
-        }
-    }
-
-    @Serializable
-    data class Source(
-        val file: String,
-        val label: String,
-    )
-
-    @Serializable
-    data class Response(
-        val sources: List<Source>,
-    )
-}
diff --git a/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/extractors/RuplayExtractor.kt b/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/extractors/RuplayExtractor.kt
deleted file mode 100644
index 37c48478..00000000
--- a/src/pt/animesbr/src/eu/kanade/tachiyomi/animeextension/pt/animesbr/extractors/RuplayExtractor.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesbr.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class RuplayExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
-        return client.newCall(GET(url)).execute()
-            .body.string()
-            .substringAfter("Playerjs({")
-            .substringAfter("file:")
-            .substringAfter("\"")
-            .substringBefore("\"")
-            .split(",")
-            .map { file ->
-                val videoUrl = file.substringAfter("]")
-                val quality = file.substringAfter("[", "")
-                    .substringBefore("]")
-                    .ifEmpty { "Default" }
-
-                val headers = Headers.headersOf("Referer", videoUrl)
-                Video(videoUrl, "$prefix Ruplay - $quality".trim(), videoUrl, headers = headers)
-            }
-    }
-}
diff --git a/src/pt/animesdrive/build.gradle b/src/pt/animesdrive/build.gradle
deleted file mode 100644
index 0acd0554..00000000
--- a/src/pt/animesdrive/build.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-ext {
-    extName = 'AnimesDrive'
-    extClass = '.AnimesDrive'
-    themePkg = 'dooplay'
-    baseUrl = 'https://animesdrive.blog'
-    overrideVersionCode = 1
-    isNsfw = true
-}
-
-apply from: "$rootDir/common.gradle"
-
-dependencies {
-    implementation(project(":lib:blogger-extractor"))
-}
diff --git a/src/pt/animesdrive/res/mipmap-hdpi/ic_launcher.png b/src/pt/animesdrive/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 0998b77b..00000000
Binary files a/src/pt/animesdrive/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesdrive/res/mipmap-mdpi/ic_launcher.png b/src/pt/animesdrive/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index df522100..00000000
Binary files a/src/pt/animesdrive/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesdrive/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animesdrive/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index f390d858..00000000
Binary files a/src/pt/animesdrive/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesdrive/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animesdrive/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 2f1ddcba..00000000
Binary files a/src/pt/animesdrive/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesdrive/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animesdrive/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index c05d4073..00000000
Binary files a/src/pt/animesdrive/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/animesdrive/src/eu/kanade/tachiyomi/animeextension/pt/animesdrive/AnimesDrive.kt b/src/pt/animesdrive/src/eu/kanade/tachiyomi/animeextension/pt/animesdrive/AnimesDrive.kt
deleted file mode 100644
index 35b6a783..00000000
--- a/src/pt/animesdrive/src/eu/kanade/tachiyomi/animeextension/pt/animesdrive/AnimesDrive.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesdrive
-
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
-import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-
-class AnimesDrive : DooPlay(
-    "pt-BR",
-    "Animes Drive",
-    "https://animesdrive.blog",
-) {
-
-    // ============================== Popular ===============================
-    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/anime", headers)
-
-    // =============================== Latest ===============================
-    override fun latestUpdatesNextPageSelector() = "div.pagination > a.arrow_pag > i.fa-caret-right"
-
-    // =============================== Search ===============================
-
-    // =========================== Anime Details ============================
-    override val additionalInfoSelector = "div.wp-content"
-
-    override fun Document.getDescription(): String {
-        return select("$additionalInfoSelector p")
-            .first { !it.text().contains("Título Alternativo") }
-            ?.let { it.text() + "\n" }
-            ?: ""
-    }
-
-    fun Document.getAlternativeTitle(): String {
-        return select("$additionalInfoSelector p")
-            .first { it.text().contains("Título Alternativo") }
-            ?.let { it.text() + "\n" }
-            ?: ""
-    }
-
-    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()
-                }.trim()
-            }
-
-            genre = sheader.select("div.data div.sgeneros > a")
-                .eachText()
-                .joinToString()
-
-            // description = doc.getDescription()
-            doc.selectFirst("div#info")?.let { info ->
-                description = buildString {
-                    append(doc.getDescription())
-                    append(doc.getAlternativeTitle())
-                    additionalInfoItems.forEach {
-                        info.getInfo(it)?.let(::append)
-                    }
-                }
-            }
-        }
-    }
-
-    // ============================ Video Links =============================
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val players = document.select("ul#playeroptionsul li")
-        return players.parallelCatchingFlatMapBlocking(::getPlayerVideos)
-    }
-
-    override val prefQualityValues = arrayOf("360p", "720p", "1080p")
-    override val prefQualityEntries = prefQualityValues
-
-    private val bloggerExtractor by lazy { BloggerExtractor(client) }
-
-    private fun getPlayerVideos(player: Element): List<Video> {
-        val name = player.selectFirst("span.title")!!.text()
-            .run {
-                when (this) {
-                    "SD" -> "360p"
-                    "HD" -> "720p"
-                    "SD/HD" -> "720p"
-                    "FHD", "FULLHD" -> "1080p"
-                    else -> this
-                }
-            }
-
-        val url = getPlayerUrl(player)
-
-        return when {
-            "blogger.com" in url -> bloggerExtractor.videosFromUrl(url, headers)
-            "jwplayer?source=" in url -> {
-                val videoUrl = url.toHttpUrl().queryParameter("source") ?: return emptyList()
-
-                return listOf(
-                    Video(videoUrl, name, videoUrl, headers),
-                )
-            }
-
-            else -> emptyList()
-        }
-    }
-
-    private fun getPlayerUrl(player: Element): String {
-        val type = player.attr("data-type")
-        val id = player.attr("data-post")
-        val num = player.attr("data-nume")
-        return client.newCall(GET("$baseUrl/wp-json/dooplayer/v2/$id/$type/$num"))
-            .execute()
-            .let { response ->
-                response.body.string()
-                    .substringAfter("\"embed_url\":\"")
-                    .substringBefore("\",")
-                    .replace("\\", "")
-            }
-    }
-
-    // ============================= Utilities ==============================
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString(videoSortPrefKey, videoSortPrefDefault)!!
-        return sortedWith(
-            compareBy(
-                { it.quality.lowercase().contains(quality.lowercase()) },
-                { REGEX_QUALITY.find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
-            ),
-        ).reversed()
-    }
-
-    companion object {
-        private val REGEX_QUALITY by lazy { Regex("""(\d+)p""") }
-    }
-}
diff --git a/src/pt/anitube/build.gradle b/src/pt/anitube/build.gradle
index b84e0541..468f70ee 100644
--- a/src/pt/anitube/build.gradle
+++ b/src/pt/anitube/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Anitube'
     extClass = '.Anitube'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
index 25276c01..64856ada 100644
--- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
+++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
@@ -108,7 +108,7 @@ class AnitubeExtractor(
                 .body.string()
 
             val adsUrl = body.let {
-                Regex("""ADS_URL\s*=\s*['"]([^'"]+)['"]""")
+                Regex("""urlToFetch\s*=\s*['"]([^'"]+)['"]""")
                     .find(it)?.groups?.get(1)?.value
                     ?: ""
             }
diff --git a/src/tr/tranimeizle/AndroidManifest.xml b/src/tr/tranimeizle/AndroidManifest.xml
index 7d65d998..705fe332 100644
--- a/src/tr/tranimeizle/AndroidManifest.xml
+++ b/src/tr/tranimeizle/AndroidManifest.xml
@@ -13,7 +13,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="www.tranimeizle.top"
+                    android:host="www.tranimeizle.co"
                     android:pathPattern="/anime/..*"
                     android:scheme="https" />
             </intent-filter>
diff --git a/src/tr/tranimeizle/build.gradle b/src/tr/tranimeizle/build.gradle
index 71d887d4..75f30735 100644
--- a/src/tr/tranimeizle/build.gradle
+++ b/src/tr/tranimeizle/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'TR Anime Izle'
     extClass = '.TRAnimeIzle'
-    extVersionCode = 20
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
index 4a33fea9..f9a0a18f 100644
--- a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
+++ b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
@@ -43,7 +43,7 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     override val name = "TR Anime Izle"
 
-    override val baseUrl = "https://www.tranimeizle.top"
+    override val baseUrl = "https://www.tranimeizle.co"
 
     override val lang = "tr"
 
diff --git a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzleUrlActivity.kt b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzleUrlActivity.kt
index 6345d35e..ae9fb645 100644
--- a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzleUrlActivity.kt
+++ b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzleUrlActivity.kt
@@ -8,7 +8,7 @@ import android.util.Log
 import kotlin.system.exitProcess
 
 /**
- * Springboard that accepts https://www.tranimeizle.top/anime/<item> intents
+ * Springboard that accepts https://www.tranimeizle.co/anime/<item> intents
  * and redirects them to the main Aniyomi process.
  */
 class TRAnimeIzleUrlActivity : Activity() {