diff --git a/lib-multisrc/madara/assets/i18n/messages_en.properties b/lib-multisrc/madara/assets/i18n/messages_en.properties
new file mode 100644
index 000000000..4d11ccc50
--- /dev/null
+++ b/lib-multisrc/madara/assets/i18n/messages_en.properties
@@ -0,0 +1,27 @@
+author_filter_title=Author
+artist_filter_title=Artist
+year_filter_title=Year of Released
+status_filter_title=Status
+status_filter_completed=Completed
+status_filter_ongoing=Ongoing
+status_filter_canceled=Canceled
+status_filter_on_hold=On Hold
+order_by_filter_title=Order By
+order_by_filter_relevance=Relevance
+order_by_filter_latest=Latest
+order_by_filter_az=A-Z
+order_by_filter_rating=Rating
+order_by_filter_trending=Trending
+order_by_filter_views=Most Views
+order_by_filter_new=New
+genre_condition_filter_title=Genre condition
+genre_condition_filter_or=OR
+genre_condition_filter_and=AND
+adult_content_filter_title=Adult Content
+adult_content_filter_all=All
+adult_content_filter_none=None
+adult_content_filter_only=Only
+genre_filter_header=Genres filter may not work for all sources
+genre_filter_title=Genres
+genre_missing_warning=Press 'Reset' to attempt to show the genres
+alt_names_heading=Alternative Names: 
diff --git a/lib-multisrc/madara/assets/i18n/messages_pt_br.properties b/lib-multisrc/madara/assets/i18n/messages_pt_br.properties
new file mode 100644
index 000000000..8a25ed24b
--- /dev/null
+++ b/lib-multisrc/madara/assets/i18n/messages_pt_br.properties
@@ -0,0 +1,26 @@
+author_filter_title=Autor
+artist_filter_title=Artista
+year_filter_title=Ano de lançamento
+status_filter_title=Estado
+status_filter_completed=Completo
+status_filter_ongoing=Em andamento
+status_filter_canceled=Cancelado
+status_filter_on_hold=Pausado
+order_by_filter_title=Ordenar por
+order_by_filter_relevance=Relevância
+order_by_filter_latest=Recentes
+order_by_filter_rating=Avaliação
+order_by_filter_trending=Tendência
+order_by_filter_views=Visualizações
+order_by_filter_new=Novos
+genre_condition_filter_title=Operador dos gêneros
+genre_condition_filter_or=OU
+genre_condition_filter_and=E
+adult_content_filter_title=Conteúdo adulto
+adult_content_filter_all=Indiferente
+adult_content_filter_none=Nenhum
+adult_content_filter_only=Somente
+genre_filter_header=O filtro de gêneros pode não funcionar
+genre_filter_title=Gêneros
+genre_missing_warning=Aperte 'Redefinir' para tentar mostrar os gêneros
+alt_names_heading=Nomes alternativos: 
diff --git a/lib-multisrc/madara/build.gradle.kts b/lib-multisrc/madara/build.gradle.kts
index 723afc2b2..4abb04b09 100644
--- a/lib-multisrc/madara/build.gradle.kts
+++ b/lib-multisrc/madara/build.gradle.kts
@@ -2,9 +2,9 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 33
+baseVersionCode = 34
 
 dependencies {
     api(project(":lib:cryptoaes"))
-    api(project(":lib:randomua"))
+    api(project(":lib:i18n"))
 }
diff --git a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
index d5c7f99ba..5f15ca304 100644
--- a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
+++ b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
@@ -1,18 +1,11 @@
 package eu.kanade.tachiyomi.multisrc.madara
 
-import android.app.Application
-import android.content.SharedPreferences
 import android.util.Base64
-import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
-import eu.kanade.tachiyomi.lib.randomua.addRandomUAPreferenceToScreen
-import eu.kanade.tachiyomi.lib.randomua.getPrefCustomUA
-import eu.kanade.tachiyomi.lib.randomua.getPrefUAType
-import eu.kanade.tachiyomi.lib.randomua.setRandomUserAgent
+import eu.kanade.tachiyomi.lib.i18n.Intl
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservable
-import eu.kanade.tachiyomi.source.ConfigurableSource
+import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
@@ -21,57 +14,55 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-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.Calendar
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 
 abstract class Madara(
     override val name: String,
     override val baseUrl: String,
     final override val lang: String,
     private val dateFormat: SimpleDateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US),
-) : ParsedHttpSource(), ConfigurableSource {
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
+) : ParsedHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient by lazy {
-        network.cloudflareClient.newBuilder()
-            .setRandomUserAgent(
-                preferences.getPrefUAType(),
-                preferences.getPrefCustomUA(),
-            )
-            .connectTimeout(10, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .build()
-    }
+    override val client = network.cloudflareClient
 
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
 
+    protected val xhrHeaders by lazy {
+        headersBuilder()
+            .set("X-Requested-With", "XMLHttpRequest")
+            .build()
+    }
+
     protected open val json: Json by injectLazy()
 
+    protected val intl = Intl(
+        language = lang,
+        baseLanguage = "en",
+        availableLanguages = setOf("en", "pt-BR"),
+        classLoader = this::class.java.classLoader!!,
+    )
+
     /**
      * If enabled, will attempt to remove non-manga items in popular and latest.
      * The filter will not be used in search as the theme doesn't set the CSS class.
@@ -93,11 +84,6 @@ abstract class Madara(
      */
     private var genresList: List<Genre> = emptyList()
 
-    /**
-     * Inner variable to control the genre fetching failed state.
-     */
-    private var fetchGenresFailed: Boolean = false
-
     /**
      * Inner variable to control how much tries the genres request was called.
      */
@@ -114,11 +100,58 @@ abstract class Madara(
      */
     protected open val mangaSubString = "manga"
 
+    /**
+     * enable if the site use "madara_load_more" to load manga on the site
+     * Typically has "load More" instead of next/previous page
+     *
+     * with LoadMoreStrategy.AutoDetect it tries to detect if site uses `madara_load_more`
+     */
+    protected open val useLoadMoreRequest = LoadMoreStrategy.AutoDetect
+
+    enum class LoadMoreStrategy {
+        AutoDetect, Always, Never
+    }
+
+    /**
+     * internal variable to save if site uses load_more or not
+     */
+    private var loadMoreRequestDetected = LoadMoreDetection.Pending
+
+    private enum class LoadMoreDetection {
+        Pending, True, False
+    }
+
+    protected fun detectLoadMore(document: Document) {
+        if (useLoadMoreRequest == LoadMoreStrategy.AutoDetect &&
+            loadMoreRequestDetected == LoadMoreDetection.Pending
+        ) {
+            loadMoreRequestDetected = when (document.selectFirst("nav.navigation-ajax") != null) {
+                true -> LoadMoreDetection.True
+                false -> LoadMoreDetection.False
+            }
+        }
+    }
+
+    protected fun useLoadMoreRequest(): Boolean {
+        return when (useLoadMoreRequest) {
+            LoadMoreStrategy.Always -> true
+            LoadMoreStrategy.Never -> false
+            else -> loadMoreRequestDetected == LoadMoreDetection.True
+        }
+    }
+
     // Popular Manga
 
     override fun popularMangaParse(response: Response): MangasPage {
-        runCatching { fetchGenres() }
-        return super.popularMangaParse(response)
+        val document = response.asJsoup()
+
+        val entries = document.select(popularMangaSelector())
+            .map(::popularMangaFromElement)
+        val hasNextPage = popularMangaNextPageSelector()?.let { document.selectFirst(it) } != null
+
+        detectLoadMore(document)
+
+        return MangasPage(entries, hasNextPage)
     }
 
     // exclude/filter bilibili manga from list
@@ -130,12 +163,12 @@ abstract class Madara(
         val manga = SManga.create()
 
         with(element) {
-            select(popularMangaUrlSelector).first()?.let {
+            selectFirst(popularMangaUrlSelector)!!.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
                 manga.title = it.ownText()
             }
 
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
         }
@@ -143,15 +176,19 @@ abstract class Madara(
         return manga
     }
 
-    override fun popularMangaRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/$mangaSubString/${searchPage(page)}?m_orderby=views",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
+    override fun popularMangaRequest(page: Int): Request =
+        if (useLoadMoreRequest()) {
+            loadMoreRequest(page, popular = true)
+        } else {
+            GET("$baseUrl/$mangaSubString/${searchPage(page)}?m_orderby=views", headers)
+        }
 
-    override fun popularMangaNextPageSelector(): String? = searchMangaNextPageSelector()
+    override fun popularMangaNextPageSelector(): String? =
+        if (useLoadMoreRequest()) {
+            "body:not(:has(.no-posts))"
+        } else {
+            "div.nav-previous, nav.navigation-ajax, a.nextpostslink"
+        }
 
     // Latest Updates
 
@@ -162,53 +199,75 @@ abstract class Madara(
         return popularMangaFromElement(element)
     }
 
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/$mangaSubString/${searchPage(page)}?m_orderby=latest",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
+    override fun latestUpdatesRequest(page: Int): Request =
+        if (useLoadMoreRequest()) {
+            loadMoreRequest(page, popular = false)
+        } else {
+            GET("$baseUrl/$mangaSubString/${searchPage(page)}?m_orderby=latest", headers)
+        }
 
     override fun latestUpdatesNextPageSelector(): String? = popularMangaNextPageSelector()
 
     override fun latestUpdatesParse(response: Response): MangasPage {
-        val mp = super.latestUpdatesParse(response)
+        val mp = popularMangaParse(response)
         val mangas = mp.mangas.distinctBy { it.url }
         return MangasPage(mangas, mp.hasNextPage)
     }
 
+    // load more
+    protected fun loadMoreRequest(page: Int, popular: Boolean): Request {
+        val formBody = FormBody.Builder().apply {
+            add("action", "madara_load_more")
+            add("page", (page - 1).toString())
+            add("template", "madara-core/content/content-archive")
+            add("vars[orderby]", "meta_value_num")
+            add("vars[paged]", "1")
+            add("vars[post_type]", "wp-manga")
+            add("vars[post_status]", "publish")
+            add("vars[meta_key]", if (popular) "_wp_manga_views" else "_latest_update")
+            add("vars[order]", "desc")
+            add("vars[sidebar]", "right")
+            add("vars[manga_archives_item_layout]", "big_thumbnail")
+        }.build()
+
+        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
+    }
+
     // Search Manga
 
     override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
         if (query.startsWith(URL_SEARCH_PREFIX)) {
-            val mangaUrl = "$baseUrl/$mangaSubString/${query.substringAfter(URL_SEARCH_PREFIX)}"
-            return client.newCall(GET(mangaUrl, headers))
-                .asObservable().map { response ->
-                    MangasPage(listOf(mangaDetailsParse(response.asJsoup()).apply { url = "/$mangaSubString/${query.substringAfter(URL_SEARCH_PREFIX)}/" }), false)
+            val mangaUrl = "/$mangaSubString/${query.substringAfter(URL_SEARCH_PREFIX)}"
+            return client.newCall(GET("$baseUrl$mangaUrl", headers))
+                .asObservableSuccess().map { response ->
+                    val manga = mangaDetailsParse(response).apply {
+                        url = mangaUrl
+                    }
+
+                    MangasPage(listOf(manga), false)
                 }
         }
 
-        return client.newCall(searchMangaRequest(page, query, filters))
-            .asObservable().doOnNext { response ->
-                if (!response.isSuccessful) {
-                    response.close()
-                    // Error message for exceeding last page
-                    if (response.code == 404) {
-                        error("Already on the Last Page!")
-                    } else {
-                        throw Exception("HTTP error ${response.code}")
-                    }
-                }
-            }
-            .map { response ->
-                searchMangaParse(response)
-            }
+        return super.fetchSearchManga(page, query, filters)
     }
 
-    protected open fun searchPage(page: Int): String = "page/$page/"
+    protected open fun searchPage(page: Int): String {
+        return if (page == 1) {
+            ""
+        } else {
+            "page/$page/"
+        }
+    }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+        return if (useLoadMoreRequest()) {
+            searchLoadMoreRequest(page, query, filters)
+        } else {
+            searchRequest(page, query, filters)
+        }
+    }
+
+    protected open fun searchRequest(page: Int, query: String, filters: FilterList): Request {
         val url = "$baseUrl/${searchPage(page)}".toHttpUrl().newBuilder()
         url.addQueryParameter("s", query)
         url.addQueryParameter("post_type", "wp-manga")
@@ -260,108 +319,182 @@ abstract class Madara(
         return GET(url.build(), headers)
     }
 
-    protected open val authorFilterTitle: String = when (lang) {
-        "pt-BR" -> "Autor"
-        else -> "Author"
+    protected open fun searchLoadMoreRequest(page: Int, query: String, filters: FilterList): Request {
+        val formBody = FormBody.Builder().apply {
+            add("action", "madara_load_more")
+            add("page", (page - 1).toString())
+            add("template", "madara-core/content/content-search")
+            add("vars[paged]", "1")
+            add("vars[template]", "archive")
+            add("vars[sidebar]", "right")
+            add("vars[post_type]", "wp-manga")
+            add("vars[post_status]", "publish")
+            add("vars[manga_archives_item_layout]", "big_thumbnail")
+
+            if (filterNonMangaItems) {
+                add("vars[meta_query][0][key]", "_wp_manga_chapter_type")
+                add("vars[meta_query][0][value]", "manga")
+            }
+
+            add("vars[s]", query)
+
+            var metaQueryIdx = if (filterNonMangaItems) 1 else 0
+            var taxQueryIdx = 0
+            val genres = filters.filterIsInstance<GenreList>().firstOrNull()?.state
+                ?.filter { it.state }
+                ?.map { it.id }
+                .orEmpty()
+
+            filters.forEach { filter ->
+                when (filter) {
+                    is AuthorFilter -> {
+                        if (filter.state.isNotBlank()) {
+                            add("vars[tax_query][$taxQueryIdx][taxonomy]", "wp-manga-author")
+                            add("vars[tax_query][$taxQueryIdx][field]", "name")
+                            add("vars[tax_query][$taxQueryIdx][terms]", filter.state)
+
+                            taxQueryIdx++
+                        }
+                    }
+                    is ArtistFilter -> {
+                        if (filter.state.isNotBlank()) {
+                            add("vars[tax_query][$taxQueryIdx][taxonomy]", "wp-manga-artist")
+                            add("vars[tax_query][$taxQueryIdx][field]", "name")
+                            add("vars[tax_query][$taxQueryIdx][terms]", filter.state)
+
+                            taxQueryIdx++
+                        }
+                    }
+                    is YearFilter -> {
+                        if (filter.state.isNotBlank()) {
+                            add("vars[tax_query][$taxQueryIdx][taxonomy]", "wp-manga-release")
+                            add("vars[tax_query][$taxQueryIdx][field]", "name")
+                            add("vars[tax_query][$taxQueryIdx][terms]", filter.state)
+
+                            taxQueryIdx++
+                        }
+                    }
+                    is StatusFilter -> {
+                        val statuses = filter.state
+                            .filter { it.state }
+                            .map { it.id }
+
+                        if (statuses.isNotEmpty()) {
+                            add("vars[meta_query][$metaQueryIdx][key]", "_wp_manga_status")
+
+                            statuses.forEachIndexed { i, slug ->
+                                add("vars[meta_query][$metaQueryIdx][value][$i]", slug)
+                            }
+
+                            metaQueryIdx++
+                        }
+                    }
+                    is OrderByFilter -> {
+                        if (filter.state != 0) {
+                            when (filter.toUriPart()) {
+                                "latest" -> {
+                                    add("vars[orderby]", "meta_value_num")
+                                    add("vars[order]", "DESC")
+                                    add("vars[meta_key]", "_latest_update")
+                                }
+                                "alphabet" -> {
+                                    add("vars[orderby]", "post_title")
+                                    add("vars[order]", "ASC")
+                                }
+                                "rating" -> {
+                                    add("vars[orderby][query_average_reviews]", "DESC")
+                                    add("vars[orderby][query_total_reviews]", "DESC")
+                                }
+                                "trending" -> {
+                                    add("vars[orderby]", "meta_value_num")
+                                    add("vars[meta_key]", "_wp_manga_week_views_value")
+                                    add("vars[order]", "DESC")
+                                }
+                                "views" -> {
+                                    add("vars[orderby]", "meta_value_num")
+                                    add("vars[meta_key]", "_wp_manga_views")
+                                    add("vars[order]", "DESC")
+                                }
+                                else -> {
+                                    add("vars[orderby]", "date")
+                                    add("vars[order]", "DESC")
+                                }
+                            }
+                        }
+                    }
+                    is AdultContentFilter -> {
+                        if (filter.state != 0) {
+                            add("vars[meta_query][$metaQueryIdx][key]", "manga_adult_content")
+                            add(
+                                "vars[meta_query][$metaQueryIdx][compare]",
+                                if (filter.state == 1) "not exists" else "exists",
+                            )
+
+                            metaQueryIdx++
+                        }
+                    }
+                    is GenreConditionFilter -> {
+                        if (filter.state == 1 && genres.isNotEmpty()) {
+                            add("vars[tax_query][$taxQueryIdx][operation]", "AND")
+                        }
+                    }
+                    is GenreList -> {
+                        if (genres.isNotEmpty()) {
+                            add("vars[tax_query][$taxQueryIdx][taxonomy]", "wp-manga-genre")
+                            add("vars[tax_query][$taxQueryIdx][field]", "slug")
+
+                            genres.forEachIndexed { i, slug ->
+                                add("vars[tax_query][$taxQueryIdx][terms][$i]", slug)
+                            }
+
+                            taxQueryIdx++
+                        }
+                    }
+                    else -> {}
+                }
+            }
+        }.build()
+
+        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
     }
 
-    protected open val artistFilterTitle: String = when (lang) {
-        "pt-BR" -> "Artista"
-        else -> "Artist"
-    }
+    protected open val statusFilterOptions: Map<String, String> =
+        mapOf(
+            intl["status_filter_completed"] to "end",
+            intl["status_filter_ongoing"] to "on-going",
+            intl["status_filter_canceled"] to "canceled",
+            intl["status_filter_on_hold"] to "on-hold",
+        )
 
-    protected open val yearFilterTitle: String = when (lang) {
-        "pt-BR" -> "Ano de lançamento"
-        else -> "Year of Released"
-    }
-
-    protected open val statusFilterTitle: String = when (lang) {
-        "pt-BR" -> "Estado"
-        else -> "Status"
-    }
-
-    protected open val statusFilterOptions: Array<String> = when (lang) {
-        "pt-BR" -> arrayOf("Completo", "Em andamento", "Cancelado", "Pausado")
-        else -> arrayOf("Completed", "Ongoing", "Canceled", "On Hold")
-    }
-
-    protected open val statusFilterOptionsValues: Array<String> = arrayOf(
-        "end",
-        "on-going",
-        "canceled",
-        "on-hold",
+    protected open val orderByFilterOptions: Map<String, String> = mapOf(
+        intl["order_by_filter_relevance"] to "",
+        intl["order_by_filter_latest"] to "latest",
+        intl["order_by_filter_az"] to "alphabet",
+        intl["order_by_filter_rating"] to "rating",
+        intl["order_by_filter_trending"] to "trending",
+        intl["order_by_filter_views"] to "views",
+        intl["order_by_filter_new"] to "new-manga",
     )
 
-    protected open val orderByFilterTitle: String = when (lang) {
-        "pt-BR" -> "Ordenar por"
-        else -> "Order By"
-    }
-
-    protected open val orderByFilterOptions: Array<String> = when (lang) {
-        "pt-BR" -> arrayOf(
-            "Relevância",
-            "Recentes",
-            "A-Z",
-            "Avaliação",
-            "Tendência",
-            "Visualizações",
-            "Novos",
+    protected open val genreConditionFilterOptions: Array<String> =
+        arrayOf(
+            intl["genre_condition_filter_or"],
+            intl["genre_condition_filter_and"],
         )
-        else -> arrayOf(
-            "Relevance",
-            "Latest",
-            "A-Z",
-            "Rating",
-            "Trending",
-            "Most Views",
-            "New",
+
+    protected open val adultContentFilterOptions: Array<String> =
+        arrayOf(
+            intl["adult_content_filter_all"],
+            intl["adult_content_filter_none"],
+            intl["adult_content_filter_only"],
         )
+
+    open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>, state: Int = 0) :
+        Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray(), state) {
+        fun toUriPart() = vals[state].second
     }
 
-    protected open val orderByFilterOptionsValues: Array<String> = arrayOf(
-        "",
-        "latest",
-        "alphabet",
-        "rating",
-        "trending",
-        "views",
-        "new-manga",
-    )
-
-    protected open val genreConditionFilterTitle: String = when (lang) {
-        "pt-BR" -> "Operador dos gêneros"
-        else -> "Genre condition"
-    }
-
-    protected open val genreConditionFilterOptions: Array<String> = when (lang) {
-        "pt-BR" -> arrayOf("OU", "E")
-        else -> arrayOf("OR", "AND")
-    }
-
-    protected open val adultContentFilterTitle: String = when (lang) {
-        "pt-BR" -> "Conteúdo adulto"
-        else -> "Adult Content"
-    }
-
-    protected open val adultContentFilterOptions: Array<String> = when (lang) {
-        "pt-BR" -> arrayOf("Indiferente", "Nenhum", "Somente")
-        else -> arrayOf("All", "None", "Only")
-    }
-
-    protected open val genreFilterHeader: String = when (lang) {
-        "pt-BR" -> "O filtro de gêneros pode não funcionar"
-        else -> "Genres filter may not work for all sources"
-    }
-
-    protected open val genreFilterTitle: String = when (lang) {
-        "pt-BR" -> "Gêneros"
-        else -> "Genres"
-    }
-
-    protected open val genresMissingWarning: String = when (lang) {
-        "pt-BR" -> "Aperte 'Redefinir' para tentar mostrar os gêneros"
-        else -> "Press 'Reset' to attempt to show the genres"
-    }
+    open class Tag(val id: String, name: String) : Filter.CheckBox(name)
 
     protected class AuthorFilter(title: String) : Filter.Text(title)
     protected class ArtistFilter(title: String) : Filter.Text(title)
@@ -386,50 +519,60 @@ abstract class Madara(
     class Genre(name: String, val id: String = name) : Filter.CheckBox(name)
 
     override fun getFilterList(): FilterList {
+        launchIO { fetchGenres() }
+
         val filters = mutableListOf(
-            AuthorFilter(authorFilterTitle),
-            ArtistFilter(artistFilterTitle),
-            YearFilter(yearFilterTitle),
-            StatusFilter(statusFilterTitle, getStatusList()),
+            AuthorFilter(intl["author_filter_title"]),
+            ArtistFilter(intl["artist_filter_title"]),
+            YearFilter(intl["year_filter_title"]),
+            StatusFilter(
+                title = intl["status_filter_title"],
+                status = statusFilterOptions.map { Tag(it.key, it.value) },
+            ),
             OrderByFilter(
-                title = orderByFilterTitle,
-                options = orderByFilterOptions.zip(orderByFilterOptionsValues),
+                title = intl["order_by_filter_title"],
+                options = orderByFilterOptions.map { Pair(it.key, it.value) },
                 state = 0,
             ),
-            AdultContentFilter(adultContentFilterTitle, adultContentFilterOptions),
+            AdultContentFilter(
+                title = intl["adult_content_filter_title"],
+                options = adultContentFilterOptions,
+            ),
         )
 
         if (genresList.isNotEmpty()) {
             filters += listOf(
                 Filter.Separator(),
-                Filter.Header(genreFilterHeader),
-                GenreConditionFilter(genreConditionFilterTitle, genreConditionFilterOptions),
-                GenreList(genreFilterTitle, genresList),
+                Filter.Header(intl["genre_filter_header"]),
+                GenreConditionFilter(
+                    title = intl["genre_condition_filter_title"],
+                    options = genreConditionFilterOptions,
+                ),
+                GenreList(
+                    title = intl["genre_filter_title"],
+                    genres = genresList,
+                ),
             )
         } else if (fetchGenres) {
             filters += listOf(
                 Filter.Separator(),
-                Filter.Header(genresMissingWarning),
+                Filter.Header(intl["genre_missing_warning"]),
             )
         }
 
         return FilterList(filters)
     }
 
-    protected fun getStatusList() = statusFilterOptionsValues
-        .zip(statusFilterOptions)
-        .map { Tag(it.first, it.second) }
-
-    open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>, state: Int = 0) :
-        Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray(), state) {
-        fun toUriPart() = vals[state].second
-    }
-
-    open class Tag(val id: String, name: String) : Filter.CheckBox(name)
-
     override fun searchMangaParse(response: Response): MangasPage {
-        runCatching { fetchGenres() }
-        return super.searchMangaParse(response)
+        val document = response.asJsoup()
+
+        val entries = document.select(searchMangaSelector())
+            .map(::searchMangaFromElement)
+        val hasNextPage = searchMangaNextPageSelector()?.let { document.selectFirst(it) } != null
+
+        detectLoadMore(document)
+
+        return MangasPage(entries, hasNextPage)
     }
 
     override fun searchMangaSelector() = "div.c-tabs-item__content"
@@ -438,11 +581,11 @@ abstract class Madara(
         val manga = SManga.create()
 
         with(element) {
-            select("div.post-title a").first()?.let {
+            selectFirst("div.post-title a")!!.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
                 manga.title = it.ownText()
             }
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
         }
@@ -450,7 +593,7 @@ abstract class Madara(
         return manga
     }
 
-    override fun searchMangaNextPageSelector(): String? = "div.nav-previous, nav.navigation-ajax, a.nextpostslink"
+    override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
 
     // Manga Details Parse
 
@@ -493,9 +636,7 @@ abstract class Madara(
     override fun mangaDetailsParse(document: Document): SManga {
         val manga = SManga.create()
         with(document) {
-            select(mangaDetailsSelectorTitle).first()?.let {
-                manga.title = it.ownText()
-            }
+            manga.title = selectFirst(mangaDetailsSelectorTitle)!!.ownText()
             select(mangaDetailsSelectorAuthor).eachText().filter {
                 it.notUpdating()
             }.joinToString().takeIf { it.isNotBlank() }?.let {
@@ -515,7 +656,7 @@ abstract class Madara(
                     manga.description = it.text()
                 }
             }
-            select(mangaDetailsSelectorThumbnail).first()?.let {
+            selectFirst(mangaDetailsSelectorThumbnail)?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
             select(mangaDetailsSelectorStatus).last()?.let {
@@ -533,13 +674,6 @@ abstract class Madara(
                 .map { element -> element.text().lowercase(Locale.ROOT) }
                 .toMutableSet()
 
-            // add tag(s) to genre
-            val mangaTitle = try {
-                manga.title
-            } catch (_: UninitializedPropertyAccessException) {
-                "not initialized"
-            }
-
             if (mangaDetailsSelectorTag.isNotEmpty()) {
                 select(mangaDetailsSelectorTag).forEach { element ->
                     if (genres.contains(element.text()).not() &&
@@ -547,7 +681,7 @@ abstract class Madara(
                         element.text().contains("read", true).not() &&
                         element.text().contains(name, true).not() &&
                         element.text().contains(name.replace(" ", ""), true).not() &&
-                        element.text().contains(mangaTitle, true).not() &&
+                        element.text().contains(manga.title, true).not() &&
                         element.text().contains(altName, true).not()
                     ) {
                         genres.add(element.text().lowercase(Locale.ROOT))
@@ -556,13 +690,13 @@ abstract class Madara(
             }
 
             // add manga/manhwa/manhua thinggy to genre
-            document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let {
+            document.selectFirst(seriesTypeSelector)?.ownText()?.let {
                 if (it.isEmpty().not() && it.notUpdating() && it != "-" && genres.contains(it).not()) {
                     genres.add(it.lowercase(Locale.ROOT))
                 }
             }
 
-            manga.genre = genres.toList().joinToString(", ") { genre ->
+            manga.genre = genres.toList().joinToString { genre ->
                 genre.replaceFirstChar {
                     if (it.isLowerCase()) {
                         it.titlecase(
@@ -575,7 +709,7 @@ abstract class Madara(
             }
 
             // add alternative name to manga description
-            document.select(altNameSelector).firstOrNull()?.ownText()?.let {
+            document.selectFirst(altNameSelector)?.ownText()?.let {
                 if (it.isBlank().not() && it.notUpdating()) {
                     manga.description = when {
                         manga.description.isNullOrBlank() -> altName + it
@@ -600,17 +734,14 @@ abstract class Madara(
 
     open val seriesTypeSelector = ".post-content_item:contains(Type) .summary-content"
     open val altNameSelector = ".post-content_item:contains(Alt) .summary-content"
-    open val altName = when (lang) {
-        "pt-BR" -> "Nomes alternativos: "
-        else -> "Alternative Names: "
-    }
+    open val altName = intl["alt_names_heading"]
     open val updatingRegex = "Updating|Atualizando".toRegex(RegexOption.IGNORE_CASE)
 
     fun String.notUpdating(): Boolean {
         return this.contains(updatingRegex).not()
     }
 
-    fun String.containsIn(array: Array<String>): Boolean {
+    private fun String.containsIn(array: Array<String>): Boolean {
         return this.lowercase() in array.map { it.lowercase() }
     }
 
@@ -644,25 +775,18 @@ abstract class Madara(
             .add("manga", mangaId)
             .build()
 
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", form.contentLength().toString())
-            .add("Content-Type", form.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
         return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, form)
     }
 
     protected open fun xhrChaptersRequest(mangaUrl: String): Request {
-        val xhrHeaders = headersBuilder()
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
         return POST("$mangaUrl/ajax/chapters", xhrHeaders)
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
         val document = response.asJsoup()
+
+        launchIO { countViews(document) }
+
         val chaptersWrapper = document.select("div[id^=manga-chapters-holder]")
 
         var chapterElements = document.select(chapterListSelector())
@@ -692,8 +816,6 @@ abstract class Madara(
             xhrResponse.close()
         }
 
-        countViews(document)
-
         return chapterElements.map(::chapterFromElement)
     }
 
@@ -710,7 +832,7 @@ abstract class Madara(
         val chapter = SChapter.create()
 
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)!!.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
@@ -718,9 +840,9 @@ abstract class Madara(
             }
             // Dates can be part of a "new" graphic or plain text
             // Added "title" alternative
-            chapter.date_upload = select("img:not(.thumb)").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) }
-                ?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) }
-                ?: parseChapterDate(select(chapterDateSelector()).firstOrNull()?.text())
+            chapter.date_upload = selectFirst("img:not(.thumb)")?.attr("alt")?.let { parseRelativeDate(it) }
+                ?: selectFirst("span a")?.attr("title")?.let { parseRelativeDate(it) }
+                ?: parseChapterDate(selectFirst(chapterDateSelector())?.text())
         }
 
         return chapter
@@ -816,7 +938,7 @@ abstract class Madara(
     open val chapterProtectorSelector = "#chapter-protector-data"
 
     override fun pageListParse(document: Document): List<Page> {
-        countViews(document)
+        launchIO { countViews(document) }
 
         val chapterProtector = document.selectFirst(chapterProtectorSelector)
             ?: return document.select(pageListParseSelector).mapIndexed { index, element ->
@@ -836,7 +958,7 @@ abstract class Madara(
 
         val unsaltedCiphertext = Base64.decode(chapterData["ct"]!!.jsonPrimitive.content, Base64.DEFAULT)
         val salt = chapterData["s"]!!.jsonPrimitive.content.decodeHex()
-        val ciphertext = SALTED + salt + unsaltedCiphertext
+        val ciphertext = salted + salt + unsaltedCiphertext
 
         val rawImgArray = CryptoAES.decrypt(Base64.encodeToString(ciphertext, Base64.DEFAULT), password)
         val imgArrayString = json.parseToJsonElement(rawImgArray).jsonPrimitive.content
@@ -860,7 +982,7 @@ abstract class Madara(
     protected open val sendViewCount: Boolean = true
 
     protected open fun countViewsRequest(document: Document): Request? {
-        val wpMangaData = document.select("script#wp-manga-js-extra").firstOrNull()
+        val wpMangaData = document.selectFirst("script#wp-manga-js-extra")
             ?.data() ?: return null
 
         val wpMangaInfo = wpMangaData
@@ -882,8 +1004,6 @@ abstract class Madara(
             val formBody = formBuilder.build()
 
             val newHeaders = headersBuilder()
-                .set("Content-Length", formBody.contentLength().toString())
-                .set("Content-Type", formBody.contentType().toString())
                 .set("Referer", document.location())
                 .build()
 
@@ -912,16 +1032,15 @@ abstract class Madara(
     /**
      * Fetch the genres from the source to be used in the filters.
      */
-    protected open fun fetchGenres() {
-        if (fetchGenres && fetchGenresAttempts <= 3 && (genresList.isEmpty() || fetchGenresFailed)) {
-            val genres = runCatching {
-                client.newCall(genresRequest()).execute()
+    protected fun fetchGenres() {
+        if (fetchGenres && fetchGenresAttempts < 3 && genresList.isEmpty()) {
+            try {
+                genresList = client.newCall(genresRequest()).execute()
                     .use { parseGenres(it.asJsoup()) }
+            } catch (_: Exception) {
+            } finally {
+                fetchGenresAttempts++
             }
-
-            fetchGenresFailed = genres.isFailure
-            genresList = genres.getOrNull().orEmpty()
-            fetchGenresAttempts++
         }
     }
 
@@ -950,7 +1069,7 @@ abstract class Madara(
     }
 
     // https://stackoverflow.com/a/66614516
-    private fun String.decodeHex(): ByteArray {
+    protected fun String.decodeHex(): ByteArray {
         check(length % 2 == 0) { "Must have an even length" }
 
         return chunked(2)
@@ -958,13 +1077,14 @@ abstract class Madara(
             .toByteArray()
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        addRandomUAPreferenceToScreen(screen)
-    }
+    protected val salted = "Salted__".toByteArray(Charsets.UTF_8)
+
+    private val scope = CoroutineScope(Dispatchers.IO)
+
+    protected fun launchIO(block: () -> Unit) = scope.launch { block() }
 
     companion object {
         const val URL_SEARCH_PREFIX = "slug:"
-        val SALTED = "Salted__".toByteArray(Charsets.UTF_8)
     }
 }
 
diff --git a/src/all/comicznetv2/src/eu/kanade/tachiyomi/extension/all/comicznetv2/ComiczNetV2.kt b/src/all/comicznetv2/src/eu/kanade/tachiyomi/extension/all/comicznetv2/ComiczNetV2.kt
index c04d7bf89..de9f5e50e 100644
--- a/src/all/comicznetv2/src/eu/kanade/tachiyomi/extension/all/comicznetv2/ComiczNetV2.kt
+++ b/src/all/comicznetv2/src/eu/kanade/tachiyomi/extension/all/comicznetv2/ComiczNetV2.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ComiczNetV2 : Madara("Comicz.net v2", "https://v2.comiz.net", "all") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/all/grabberzone/src/eu/kanade/tachiyomi/extension/all/grabberzone/GrabberZone.kt b/src/all/grabberzone/src/eu/kanade/tachiyomi/extension/all/grabberzone/GrabberZone.kt
index 98a3b3502..04fdbaaf4 100644
--- a/src/all/grabberzone/src/eu/kanade/tachiyomi/extension/all/grabberzone/GrabberZone.kt
+++ b/src/all/grabberzone/src/eu/kanade/tachiyomi/extension/all/grabberzone/GrabberZone.kt
@@ -14,14 +14,6 @@ class GrabberZone : Madara(
 ) {
     override val mangaSubString = "comics"
 
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
     override fun chapterFromElement(element: Element): SChapter {
         return super.chapterFromElement(element).apply {
             name = element.selectFirst("a + a")!!.text()
diff --git a/src/all/mangacrazy/src/eu/kanade/tachiyomi/extension/all/mangacrazy/MangaCrazy.kt b/src/all/mangacrazy/src/eu/kanade/tachiyomi/extension/all/mangacrazy/MangaCrazy.kt
index c9fbab93f..09fecc3b4 100644
--- a/src/all/mangacrazy/src/eu/kanade/tachiyomi/extension/all/mangacrazy/MangaCrazy.kt
+++ b/src/all/mangacrazy/src/eu/kanade/tachiyomi/extension/all/mangacrazy/MangaCrazy.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaCrazy : Madara("MangaCrazy", "https://mangacrazy.net", "all") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/all/mangatopsite/src/eu/kanade/tachiyomi/extension/all/mangatopsite/MangaTopSite.kt b/src/all/mangatopsite/src/eu/kanade/tachiyomi/extension/all/mangatopsite/MangaTopSite.kt
index 5a82c94af..ff1555c38 100644
--- a/src/all/mangatopsite/src/eu/kanade/tachiyomi/extension/all/mangatopsite/MangaTopSite.kt
+++ b/src/all/mangatopsite/src/eu/kanade/tachiyomi/extension/all/mangatopsite/MangaTopSite.kt
@@ -12,6 +12,4 @@ class MangaTopSite : Madara(
 ) {
     override val useNewChapterEndpoint = false
     override val chapterUrlSuffix = ""
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/ar/azora/src/eu/kanade/tachiyomi/extension/ar/azora/Azora.kt b/src/ar/azora/src/eu/kanade/tachiyomi/extension/ar/azora/Azora.kt
index 040bf03fc..e55b7938c 100644
--- a/src/ar/azora/src/eu/kanade/tachiyomi/extension/ar/azora/Azora.kt
+++ b/src/ar/azora/src/eu/kanade/tachiyomi/extension/ar/azora/Azora.kt
@@ -1,16 +1,12 @@
 package eu.kanade.tachiyomi.extension.ar.azora
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.SChapter
-import okhttp3.Request
 import org.jsoup.nodes.Element
 
 class Azora : Madara("Azora", "https://azoramoon.com", "ar") {
     override val mangaSubString = "series"
     override val useNewChapterEndpoint = false
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/page/$page/?m_orderby=views", headers)
     override fun chapterListSelector() = "li.wp-manga-chapter:not(.premium-block)" // Filter fake chapters
     override fun chapterFromElement(element: Element): SChapter {
         val chapter = SChapter.create()
diff --git a/src/ar/comicarab/src/eu/kanade/tachiyomi/extension/ar/comicarab/ComicArab.kt b/src/ar/comicarab/src/eu/kanade/tachiyomi/extension/ar/comicarab/ComicArab.kt
index 6dc77be66..ef6cab20e 100644
--- a/src/ar/comicarab/src/eu/kanade/tachiyomi/extension/ar/comicarab/ComicArab.kt
+++ b/src/ar/comicarab/src/eu/kanade/tachiyomi/extension/ar/comicarab/ComicArab.kt
@@ -9,12 +9,4 @@ class ComicArab : Madara(
     "https://comicarab.com",
     "ar",
     dateFormat = SimpleDateFormat("dd MMMM، yyyy", Locale("ar")),
-) {
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-}
+)
diff --git a/src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt b/src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt
index 01c672433..f640172ac 100644
--- a/src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt
+++ b/src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt
@@ -6,17 +6,20 @@ import android.widget.Toast
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.extension.BuildConfig
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class EmpireWebtoon : Madara(
-    "Empire Webtoon",
-    "https://webtoonsempireron.com",
-    "ar",
-    SimpleDateFormat("d MMMM، yyyy", Locale("ar")),
-) {
+class EmpireWebtoon :
+    Madara(
+        "Empire Webtoon",
+        "https://webtoonsempireron.com",
+        "ar",
+        SimpleDateFormat("d MMMM، yyyy", Locale("ar")),
+    ),
+    ConfigurableSource {
 
     private val defaultBaseUrl = "https://webtoonsempireron.com"
 
@@ -30,8 +33,6 @@ class EmpireWebtoon : Madara(
 
     override val useNewChapterEndpoint = false
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     companion object {
         private const val RESTART_TACHIYOMI = "Restart Tachiyomi to apply new setting."
         private const val BASE_URL_PREF_TITLE = "Override BaseUrl"
@@ -53,8 +54,6 @@ class EmpireWebtoon : Madara(
             }
         }
         screen.addPreference(baseUrlPref)
-
-        super.setupPreferenceScreen(screen)
     }
 
     private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)!!
diff --git a/src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt b/src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt
index bc5611341..d8d589c36 100644
--- a/src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt
+++ b/src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt
@@ -6,14 +6,13 @@ import android.widget.Toast
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.extension.BuildConfig
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
-import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
@@ -22,7 +21,16 @@ import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class Mangalek : Madara("مانجا ليك", "https://manga-lek.net", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar"))) {
+class Mangalek :
+    Madara(
+        "مانجا ليك",
+        "https://manga-lek.net",
+        "ar",
+        SimpleDateFormat("MMMM dd, yyyy", Locale("ar")),
+    ),
+    ConfigurableSource {
+
+    override val fetchGenres = false
 
     override val chapterUrlSuffix = ""
 
@@ -55,22 +63,10 @@ class Mangalek : Madara("مانجا ليك", "https://manga-lek.net", "ar", Simp
             }
         }
         screen.addPreference(baseUrlPref)
-
-        super.setupPreferenceScreen(screen)
     }
 
     private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)!!
 
-    override fun popularMangaRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/$mangaSubString/${searchPage(page)}",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request = popularMangaRequest(page)
-
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request =
         POST(
             "$baseUrl/wp-admin/admin-ajax.php",
diff --git a/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt b/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt
index c123bc0ce..00a0e05be 100644
--- a/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt
+++ b/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt
@@ -6,12 +6,20 @@ import android.widget.Toast
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.extension.BuildConfig
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class Mangalink : Madara("مانجا لينك", "https://manga-link.com", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar"))) {
+class Mangalink :
+    Madara(
+        "مانجا لينك",
+        "https://manga-link.com",
+        "ar",
+        SimpleDateFormat("MMMM dd, yyyy", Locale("ar")),
+    ),
+    ConfigurableSource {
 
     override val chapterUrlSuffix = ""
 
@@ -44,8 +52,6 @@ class Mangalink : Madara("مانجا لينك", "https://manga-link.com", "ar",
             }
         }
         screen.addPreference(baseUrlPref)
-
-        super.setupPreferenceScreen(screen)
     }
     private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)!!
 }
diff --git a/src/ar/mangalionz/src/eu/kanade/tachiyomi/extension/ar/mangalionz/MangaLionz.kt b/src/ar/mangalionz/src/eu/kanade/tachiyomi/extension/ar/mangalionz/MangaLionz.kt
index 908bedc82..36a6cbbcc 100644
--- a/src/ar/mangalionz/src/eu/kanade/tachiyomi/extension/ar/mangalionz/MangaLionz.kt
+++ b/src/ar/mangalionz/src/eu/kanade/tachiyomi/extension/ar/mangalionz/MangaLionz.kt
@@ -9,12 +9,12 @@ class MangaLionz : Madara("MangaLionz", "https://mangalionz.org", "ar") {
         val manga = SManga.create()
 
         with(element) {
-            select(popularMangaUrlSelector).first()?.let {
+            selectFirst(popularMangaUrlSelector)!!.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
                 manga.title = it.ownText()
             }
 
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)?.replace("mangalionz", "mangalek")
             }
         }
diff --git a/src/ar/mangarose/src/eu/kanade/tachiyomi/extension/ar/mangarose/MangaRose.kt b/src/ar/mangarose/src/eu/kanade/tachiyomi/extension/ar/mangarose/MangaRose.kt
index f6a988470..846d9ee5c 100644
--- a/src/ar/mangarose/src/eu/kanade/tachiyomi/extension/ar/mangarose/MangaRose.kt
+++ b/src/ar/mangarose/src/eu/kanade/tachiyomi/extension/ar/mangarose/MangaRose.kt
@@ -9,12 +9,4 @@ class MangaRose : Madara(
     "https://mangarose.net",
     "ar",
     dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("ar")),
-) {
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-}
+)
diff --git a/src/ar/mangaspark/src/eu/kanade/tachiyomi/extension/ar/mangaspark/MangaSpark.kt b/src/ar/mangaspark/src/eu/kanade/tachiyomi/extension/ar/mangaspark/MangaSpark.kt
index e35aaa4b0..c909ea6db 100644
--- a/src/ar/mangaspark/src/eu/kanade/tachiyomi/extension/ar/mangaspark/MangaSpark.kt
+++ b/src/ar/mangaspark/src/eu/kanade/tachiyomi/extension/ar/mangaspark/MangaSpark.kt
@@ -13,6 +13,4 @@ class MangaSpark : Madara(
     override val chapterUrlSuffix = ""
 
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/ar/mangastarz/src/eu/kanade/tachiyomi/extension/ar/mangastarz/MangaStarz.kt b/src/ar/mangastarz/src/eu/kanade/tachiyomi/extension/ar/mangastarz/MangaStarz.kt
index 4001e5888..433401911 100644
--- a/src/ar/mangastarz/src/eu/kanade/tachiyomi/extension/ar/mangastarz/MangaStarz.kt
+++ b/src/ar/mangastarz/src/eu/kanade/tachiyomi/extension/ar/mangastarz/MangaStarz.kt
@@ -13,6 +13,4 @@ class MangaStarz : Madara(
     override val chapterUrlSuffix = ""
 
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/allporncomic/src/eu/kanade/tachiyomi/extension/en/allporncomic/AllPornComic.kt b/src/en/allporncomic/src/eu/kanade/tachiyomi/extension/en/allporncomic/AllPornComic.kt
index 5b5e54767..971057270 100644
--- a/src/en/allporncomic/src/eu/kanade/tachiyomi/extension/en/allporncomic/AllPornComic.kt
+++ b/src/en/allporncomic/src/eu/kanade/tachiyomi/extension/en/allporncomic/AllPornComic.kt
@@ -1,11 +1,5 @@
 package eu.kanade.tachiyomi.extension.en.allporncomic
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Request
 
-class AllPornComic : Madara("AllPornComic", "https://allporncomic.com", "en") {
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=views", headers)
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=latest", headers)
-    override fun searchMangaNextPageSelector() = "a[rel=next]"
-}
+class AllPornComic : Madara("AllPornComic", "https://allporncomic.com", "en")
diff --git a/src/en/aquamanga/src/eu/kanade/tachiyomi/extension/en/aquamanga/AquaManga.kt b/src/en/aquamanga/src/eu/kanade/tachiyomi/extension/en/aquamanga/AquaManga.kt
index 3304e6eb9..992b0e248 100644
--- a/src/en/aquamanga/src/eu/kanade/tachiyomi/extension/en/aquamanga/AquaManga.kt
+++ b/src/en/aquamanga/src/eu/kanade/tachiyomi/extension/en/aquamanga/AquaManga.kt
@@ -8,8 +8,6 @@ import kotlin.random.Random
 class AquaManga : Madara("Aqua Manga", "https://aquamanga.org", "en") {
     override val useNewChapterEndpoint = false
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun headersBuilder(): Headers.Builder = super.headersBuilder()
         .add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8")
         .add("Accept-Language", "en-US,en;q=0.5")
diff --git a/src/en/asurascansus/src/eu/kanade/tachiyomi/extension/en/asurascansus/AsuraScansUs.kt b/src/en/asurascansus/src/eu/kanade/tachiyomi/extension/en/asurascansus/AsuraScansUs.kt
index 5e1b63b87..4d565615a 100644
--- a/src/en/asurascansus/src/eu/kanade/tachiyomi/extension/en/asurascansus/AsuraScansUs.kt
+++ b/src/en/asurascansus/src/eu/kanade/tachiyomi/extension/en/asurascansus/AsuraScansUs.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class AsuraScansUs : Madara("Asura Scans.us (unoriginal)", "https://asurascans.us", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/babelwuxia/src/eu/kanade/tachiyomi/extension/en/babelwuxia/BabelWuxia.kt b/src/en/babelwuxia/src/eu/kanade/tachiyomi/extension/en/babelwuxia/BabelWuxia.kt
index 832949a70..e169f23b1 100644
--- a/src/en/babelwuxia/src/eu/kanade/tachiyomi/extension/en/babelwuxia/BabelWuxia.kt
+++ b/src/en/babelwuxia/src/eu/kanade/tachiyomi/extension/en/babelwuxia/BabelWuxia.kt
@@ -1,37 +1,11 @@
 package eu.kanade.tachiyomi.extension.en.babelwuxia
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.source.model.MangasPage
-import okhttp3.Response
 
 class BabelWuxia : Madara("Babel Wuxia", "https://babelwuxia.com", "en") {
 
     // moved from MangaThemesia
     override val versionId = 2
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
-    override fun popularMangaParse(response: Response) =
-        super.popularMangaParse(response).fixNextPage()
-
-    override fun latestUpdatesParse(response: Response) =
-        super.latestUpdatesParse(response).fixNextPage()
-
-    override fun searchMangaParse(response: Response) =
-        super.searchMangaParse(response).fixNextPage()
-
-    private fun MangasPage.fixNextPage(): MangasPage {
-        return if (mangas.size < 12) {
-            MangasPage(mangas, false)
-        } else {
-            this
-        }
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/en/bananamanga/src/eu/kanade/tachiyomi/extension/en/bananamanga/BananaManga.kt b/src/en/bananamanga/src/eu/kanade/tachiyomi/extension/en/bananamanga/BananaManga.kt
index dcadac1e9..014827502 100644
--- a/src/en/bananamanga/src/eu/kanade/tachiyomi/extension/en/bananamanga/BananaManga.kt
+++ b/src/en/bananamanga/src/eu/kanade/tachiyomi/extension/en/bananamanga/BananaManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class BananaManga : Madara("Banana Manga", "https://bananamanga.net", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/coffeemanga/src/eu/kanade/tachiyomi/extension/en/coffeemanga/CoffeeManga.kt b/src/en/coffeemanga/src/eu/kanade/tachiyomi/extension/en/coffeemanga/CoffeeManga.kt
index dd652e198..4e82b4f33 100644
--- a/src/en/coffeemanga/src/eu/kanade/tachiyomi/extension/en/coffeemanga/CoffeeManga.kt
+++ b/src/en/coffeemanga/src/eu/kanade/tachiyomi/extension/en/coffeemanga/CoffeeManga.kt
@@ -6,8 +6,6 @@ import org.jsoup.nodes.Element
 class CoffeeManga : Madara("Coffee Manga", "https://coffeemanga.io", "en") {
     override val useNewChapterEndpoint = false
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun imageFromElement(element: Element): String? {
         return when {
             element.hasAttr("data-src") && element.attr("data-src").isNotEmpty() -> element.attr("abs:data-src")
diff --git a/src/en/coloredmanga/src/eu/kanade/tachiyomi/extension/en/coloredmanga/ColoredManga.kt b/src/en/coloredmanga/src/eu/kanade/tachiyomi/extension/en/coloredmanga/ColoredManga.kt
index be16c5d06..488c654b3 100644
--- a/src/en/coloredmanga/src/eu/kanade/tachiyomi/extension/en/coloredmanga/ColoredManga.kt
+++ b/src/en/coloredmanga/src/eu/kanade/tachiyomi/extension/en/coloredmanga/ColoredManga.kt
@@ -11,6 +11,4 @@ class ColoredManga : Madara(
     dateFormat = SimpleDateFormat("dd-MMM", Locale.ENGLISH),
 ) {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/comicscans/src/eu/kanade/tachiyomi/extension/en/comicscans/ComicScans.kt b/src/en/comicscans/src/eu/kanade/tachiyomi/extension/en/comicscans/ComicScans.kt
index 910b11d70..4203ed248 100644
--- a/src/en/comicscans/src/eu/kanade/tachiyomi/extension/en/comicscans/ComicScans.kt
+++ b/src/en/comicscans/src/eu/kanade/tachiyomi/extension/en/comicscans/ComicScans.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ComicScans : Madara("Comic Scans", "https://www.comicscans.org", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/creepyscans/src/eu/kanade/tachiyomi/extension/en/creepyscans/CreepyScans.kt b/src/en/creepyscans/src/eu/kanade/tachiyomi/extension/en/creepyscans/CreepyScans.kt
index 7289de59c..4836d793e 100644
--- a/src/en/creepyscans/src/eu/kanade/tachiyomi/extension/en/creepyscans/CreepyScans.kt
+++ b/src/en/creepyscans/src/eu/kanade/tachiyomi/extension/en/creepyscans/CreepyScans.kt
@@ -14,7 +14,6 @@ import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
@@ -35,26 +34,6 @@ class CreepyScans : Madara(
 
     override val useNewChapterEndpoint = true
 
-    // Popular
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/$mangaSubString/?m_orderby=views",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
-
-    // Latest
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/$mangaSubString/?m_orderby=latest",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
-
     // Search
 
     override fun fetchSearchManga(
@@ -142,11 +121,13 @@ class CreepyScans : Madara(
         Filter.Select<String>("Genre", vals.map { it.first }.toTypedArray())
 
     override fun getFilterList(): FilterList {
+        launchIO { fetchGenres() }
+
         val filters = buildList(4) {
             add(
                 OrderByFilter(
-                    title = orderByFilterTitle,
-                    options = orderByFilterOptions.zip(orderByFilterOptionsValues),
+                    title = intl["order_by_filter_title"],
+                    options = orderByFilterOptions.map { Pair(it.key, it.value) },
                     state = 0,
                 ),
             )
diff --git a/src/en/darkscan/src/eu/kanade/tachiyomi/extension/en/darkscan/DarkScan.kt b/src/en/darkscan/src/eu/kanade/tachiyomi/extension/en/darkscan/DarkScan.kt
index 3c890e1ed..cf2a260a7 100644
--- a/src/en/darkscan/src/eu/kanade/tachiyomi/extension/en/darkscan/DarkScan.kt
+++ b/src/en/darkscan/src/eu/kanade/tachiyomi/extension/en/darkscan/DarkScan.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class DarkScan : Madara("Dark-scan", "https://dark-scan.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt b/src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt
index 7632bcc59..6a3621579 100644
--- a/src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt
+++ b/src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt
@@ -27,14 +27,6 @@ class DragonTea : Madara(
 
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
     private val pageIndexRegex = Regex("""image-(\d+)[a-z]+""", RegexOption.IGNORE_CASE)
 
     override fun pageListParse(document: Document): List<Page> {
@@ -69,20 +61,8 @@ class DragonTea : Madara(
 
         val unsaltedCiphertext = Base64.decode(cipherData["ct"]!!.jsonPrimitive.content, Base64.DEFAULT)
         val salt = cipherData["s"]!!.jsonPrimitive.content.decodeHex()
-        val saltedCiphertext = SALTED + salt + unsaltedCiphertext
+        val saltedCiphertext = salted + salt + unsaltedCiphertext
 
         return json.parseToJsonElement(CryptoAES.decrypt(Base64.encodeToString(saltedCiphertext, Base64.DEFAULT), key))
     }
-
-    private fun String.decodeHex(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-            .toByteArray()
-    }
-
-    companion object {
-        private val SALTED = "Salted__".toByteArray(Charsets.UTF_8)
-    }
 }
diff --git a/src/en/elitemanga/src/eu/kanade/tachiyomi/extension/en/elitemanga/EliteManga.kt b/src/en/elitemanga/src/eu/kanade/tachiyomi/extension/en/elitemanga/EliteManga.kt
index 5f396483e..58bf5a868 100644
--- a/src/en/elitemanga/src/eu/kanade/tachiyomi/extension/en/elitemanga/EliteManga.kt
+++ b/src/en/elitemanga/src/eu/kanade/tachiyomi/extension/en/elitemanga/EliteManga.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class EliteManga : Madara("Elite Manga", "https://www.elitemanga.org", "en") {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/factmanga/src/eu/kanade/tachiyomi/extension/en/factmanga/FactManga.kt b/src/en/factmanga/src/eu/kanade/tachiyomi/extension/en/factmanga/FactManga.kt
index af542a68e..72ec19bd9 100644
--- a/src/en/factmanga/src/eu/kanade/tachiyomi/extension/en/factmanga/FactManga.kt
+++ b/src/en/factmanga/src/eu/kanade/tachiyomi/extension/en/factmanga/FactManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class FactManga : Madara("FactManga", "https://factmanga.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/firescans/src/eu/kanade/tachiyomi/extension/en/firescans/FireScans.kt b/src/en/firescans/src/eu/kanade/tachiyomi/extension/en/firescans/FireScans.kt
index a91394af4..805f83a3e 100644
--- a/src/en/firescans/src/eu/kanade/tachiyomi/extension/en/firescans/FireScans.kt
+++ b/src/en/firescans/src/eu/kanade/tachiyomi/extension/en/firescans/FireScans.kt
@@ -20,7 +20,7 @@ class FireScans : Madara("Fire Scans", "https://firescans.xyz", "en") {
     override val useNewChapterEndpoint: Boolean = true
 
     override fun pageListParse(document: Document): List<Page> {
-        countViews(document)
+        launchIO { countViews(document) }
 
         val chapterProtector = document.selectFirst(chapterProtectorSelector)
             ?: return document.select(pageListParseSelector).mapIndexed { index, element ->
@@ -46,7 +46,7 @@ class FireScans : Madara("Fire Scans", "https://firescans.xyz", "en") {
 
         val unsaltedCiphertext = Base64.decode(chapterData["ct"]!!.jsonPrimitive.content, Base64.DEFAULT)
         val salt = chapterData["s"]!!.jsonPrimitive.content.decodeHex()
-        val ciphertext = SALTED + salt + unsaltedCiphertext
+        val ciphertext = salted + salt + unsaltedCiphertext
 
         val rawImgArray = CryptoAES.decrypt(Base64.encodeToString(ciphertext, Base64.DEFAULT), password)
         val imgArrayString = json.parseToJsonElement(rawImgArray).jsonPrimitive.content
@@ -56,12 +56,4 @@ class FireScans : Madara("Fire Scans", "https://firescans.xyz", "en") {
             Page(idx, document.location(), it.jsonPrimitive.content)
         }
     }
-
-    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/en/firstkissdashmanga/src/eu/kanade/tachiyomi/extension/en/firstkissdashmanga/FirstKissDashManga.kt b/src/en/firstkissdashmanga/src/eu/kanade/tachiyomi/extension/en/firstkissdashmanga/FirstKissDashManga.kt
index 6438932b5..c8a984264 100644
--- a/src/en/firstkissdashmanga/src/eu/kanade/tachiyomi/extension/en/firstkissdashmanga/FirstKissDashManga.kt
+++ b/src/en/firstkissdashmanga/src/eu/kanade/tachiyomi/extension/en/firstkissdashmanga/FirstKissDashManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class FirstKissDashManga : Madara("1st Kiss-Manga (unoriginal)", "https://1stkiss-manga.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/firstmanhwa/src/eu/kanade/tachiyomi/extension/en/firstmanhwa/FirstManhwa.kt b/src/en/firstmanhwa/src/eu/kanade/tachiyomi/extension/en/firstmanhwa/FirstManhwa.kt
index d7569cbd0..419f3f8c1 100644
--- a/src/en/firstmanhwa/src/eu/kanade/tachiyomi/extension/en/firstmanhwa/FirstManhwa.kt
+++ b/src/en/firstmanhwa/src/eu/kanade/tachiyomi/extension/en/firstmanhwa/FirstManhwa.kt
@@ -6,6 +6,4 @@ class FirstManhwa : Madara("1st Manhwa", "https://1stmanhwa.com", "en") {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div.summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/freemanhwa/src/eu/kanade/tachiyomi/extension/en/freemanhwa/FreeManhwa.kt b/src/en/freemanhwa/src/eu/kanade/tachiyomi/extension/en/freemanhwa/FreeManhwa.kt
index 3b86977e4..ec7b453ae 100644
--- a/src/en/freemanhwa/src/eu/kanade/tachiyomi/extension/en/freemanhwa/FreeManhwa.kt
+++ b/src/en/freemanhwa/src/eu/kanade/tachiyomi/extension/en/freemanhwa/FreeManhwa.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class FreeManhwa : Madara("Free Manhwa", "https://manhwas.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/girlslovemanga/src/eu/kanade/tachiyomi/extension/en/girlslovemanga/GirlsLoveManga.kt b/src/en/girlslovemanga/src/eu/kanade/tachiyomi/extension/en/girlslovemanga/GirlsLoveManga.kt
index 76ce55f5f..5dc30132a 100644
--- a/src/en/girlslovemanga/src/eu/kanade/tachiyomi/extension/en/girlslovemanga/GirlsLoveManga.kt
+++ b/src/en/girlslovemanga/src/eu/kanade/tachiyomi/extension/en/girlslovemanga/GirlsLoveManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class GirlsLoveManga : Madara("Girls Love Manga!", "https://glmanga.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/globalbloging/src/eu/kanade/tachiyomi/extension/en/globalbloging/GlobalBloging.kt b/src/en/globalbloging/src/eu/kanade/tachiyomi/extension/en/globalbloging/GlobalBloging.kt
index 34ea81417..ad47279cf 100644
--- a/src/en/globalbloging/src/eu/kanade/tachiyomi/extension/en/globalbloging/GlobalBloging.kt
+++ b/src/en/globalbloging/src/eu/kanade/tachiyomi/extension/en/globalbloging/GlobalBloging.kt
@@ -12,8 +12,6 @@ class GlobalBloging : Madara(
 ) {
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     // =========================== Manga Details ============================
 
     override val mangaDetailsSelectorThumbnail = "${super.mangaDetailsSelectorThumbnail}[src~=.]"
diff --git a/src/en/goodgirlsscan/src/eu/kanade/tachiyomi/extension/en/goodgirlsscan/GoodGirlsScan.kt b/src/en/goodgirlsscan/src/eu/kanade/tachiyomi/extension/en/goodgirlsscan/GoodGirlsScan.kt
index 0ec7c82bf..757923e42 100644
--- a/src/en/goodgirlsscan/src/eu/kanade/tachiyomi/extension/en/goodgirlsscan/GoodGirlsScan.kt
+++ b/src/en/goodgirlsscan/src/eu/kanade/tachiyomi/extension/en/goodgirlsscan/GoodGirlsScan.kt
@@ -2,72 +2,21 @@ package eu.kanade.tachiyomi.extension.en.goodgirlsscan
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SManga
-import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import org.jsoup.nodes.Element
 
 class GoodGirlsScan : Madara("Good Girls Scan", "https://goodgirls.moe", "en") {
-
     override val fetchGenres = false
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
     override fun searchMangaSelector() = "article.wp-manga"
     override fun searchMangaNextPageSelector() = "div.paginator .nav-next"
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div.summary-content"
     override val mangaDetailsSelectorDescription = "div.summary-specialfields"
     override fun chapterListSelector() = "li.wp-manga-chapter:not(.vip-permission)"
 
-    private fun madaraLoadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "right")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[meta_query][0][paged]", "1")
-            add("vars[meta_query][0][orderby]", "meta_value_num")
-            add("vars[meta_query][0][template]", "archive")
-            add("vars[meta_query][0][sidebar]", "right")
-            add("vars[meta_query][0][post_type]", "wp-manga")
-            add("vars[meta_query][0][post_status]", "publish")
-            add("vars[meta_query][0][meta_key]", metaKey)
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "default")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return madaraLoadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return madaraLoadMoreRequest(page - 1, "_latest_update")
-    }
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
     // heavily modified madara theme, throws 5xx errors on any search filter
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val url = "$baseUrl/${searchPage(page)}".toHttpUrl().newBuilder().apply {
diff --git a/src/en/gourmetscans/src/eu/kanade/tachiyomi/extension/en/gourmetscans/GourmetScans.kt b/src/en/gourmetscans/src/eu/kanade/tachiyomi/extension/en/gourmetscans/GourmetScans.kt
index 1821a4130..657a736f0 100644
--- a/src/en/gourmetscans/src/eu/kanade/tachiyomi/extension/en/gourmetscans/GourmetScans.kt
+++ b/src/en/gourmetscans/src/eu/kanade/tachiyomi/extension/en/gourmetscans/GourmetScans.kt
@@ -21,8 +21,6 @@ class GourmetScans : Madara(
 
     // Search
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val url = baseUrl.toHttpUrl().newBuilder()
 
@@ -77,23 +75,23 @@ class GourmetScans : Madara(
 
     private var genresList: List<Pair<String, String>> = emptyList()
 
-    class GenreFilter(val vals: List<Pair<String, String>>) :
+    class GenreFilter(vals: List<Pair<String, String>>) :
         UriPartFilter("Genre", vals.toTypedArray())
 
     override fun getFilterList(): FilterList {
         val filters = buildList(4) {
-            add(YearFilter(yearFilterTitle))
+            add(YearFilter(intl["year_filter_title"]))
             add(
                 OrderByFilter(
-                    title = orderByFilterTitle,
-                    options = orderByFilterOptions.zip(orderByFilterOptionsValues),
+                    title = intl["order_by_filter_title"],
+                    options = orderByFilterOptions.map { Pair(it.key, it.value) },
                     state = 0,
                 ),
             )
             add(Filter.Separator())
 
             if (genresList.isEmpty()) {
-                add(Filter.Header(genresMissingWarning))
+                add(Filter.Header(intl["genre_missing_warning"]))
             } else {
                 add(GenreFilter(listOf(Pair("<select>", "")) + genresList))
             }
diff --git a/src/en/hentai3z/src/eu/kanade/tachiyomi/extension/en/hentai3z/Hentai3z.kt b/src/en/hentai3z/src/eu/kanade/tachiyomi/extension/en/hentai3z/Hentai3z.kt
index 4563a8c3d..e7eec1e9d 100644
--- a/src/en/hentai3z/src/eu/kanade/tachiyomi/extension/en/hentai3z/Hentai3z.kt
+++ b/src/en/hentai3z/src/eu/kanade/tachiyomi/extension/en/hentai3z/Hentai3z.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class Hentai3z : Madara("Hentai3z", "https://hentai3z.xyz", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/hentai4free/src/eu/kanade/tachiyomi/extension/en/hentai4free/Hentai4Free.kt b/src/en/hentai4free/src/eu/kanade/tachiyomi/extension/en/hentai4free/Hentai4Free.kt
index d8b2e7729..f0863bb75 100644
--- a/src/en/hentai4free/src/eu/kanade/tachiyomi/extension/en/hentai4free/Hentai4Free.kt
+++ b/src/en/hentai4free/src/eu/kanade/tachiyomi/extension/en/hentai4free/Hentai4Free.kt
@@ -8,8 +8,6 @@ class Hentai4Free : Madara("Hentai4Free", "https://hentai4free.net", "en") {
     override val useNewChapterEndpoint = true
     override val mangaSubString = "hentai"
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun popularMangaSelector() = searchMangaSelector()
 
     override fun popularMangaRequest(page: Int): Request =
diff --git a/src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt b/src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt
index 9f80bf97a..24a817a08 100644
--- a/src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt
+++ b/src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt
@@ -22,10 +22,10 @@ class Hentairead : Madara("HentaiRead", "https://hentairead.com", "en", dateForm
     override val pageListParseSelector = "li.chapter-image-item > a > div.image-wrapper"
 
     override fun pageListParse(document: Document): List<Page> {
-        super.countViews(document)
+        launchIO { countViews(document) }
 
         return document.select(pageListParseSelector).mapIndexed { index, element ->
-            var pageUri: String? = element.select("img").first()?.let {
+            val pageUri: String? = element.selectFirst("img")!!.let {
                 it.absUrl(if (it.hasAttr("data-src")) "data-src" else "src")
             }
             Page(
diff --git a/src/en/hentaixdickgirl/src/eu/kanade/tachiyomi/extension/en/hentaixdickgirl/HentaiXDickgirl.kt b/src/en/hentaixdickgirl/src/eu/kanade/tachiyomi/extension/en/hentaixdickgirl/HentaiXDickgirl.kt
index 1e6704a68..1a4a1b9e6 100644
--- a/src/en/hentaixdickgirl/src/eu/kanade/tachiyomi/extension/en/hentaixdickgirl/HentaiXDickgirl.kt
+++ b/src/en/hentaixdickgirl/src/eu/kanade/tachiyomi/extension/en/hentaixdickgirl/HentaiXDickgirl.kt
@@ -7,14 +7,6 @@ import org.jsoup.nodes.Document
 
 class HentaiXDickgirl : Madara("HentaiXDickgirl", "https://hentaixdickgirl.com", "en") {
 
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
     override fun mangaDetailsParse(document: Document): SManga {
         return super.mangaDetailsParse(document).apply {
             update_strategy = UpdateStrategy.ONLY_FETCH_ONCE
diff --git a/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt b/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt
index ecfbff564..f72335994 100644
--- a/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt
+++ b/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt
@@ -6,23 +6,22 @@ import android.widget.Toast
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Interceptor
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
-class Hiperdex : Madara("Hiperdex", "https://hiperdex.com", "en") {
+class Hiperdex :
+    Madara(
+        "Hiperdex",
+        "https://hiperdex.com",
+        "en",
+    ),
+    ConfigurableSource {
     override val useNewChapterEndpoint: Boolean = true
 
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
     override val baseUrl by lazy { getPrefBaseUrl() }
 
     private val preferences by lazy {
@@ -103,8 +102,6 @@ class Hiperdex : Madara("Hiperdex", "https://hiperdex.com", "en") {
             }
         }
         screen.addPreference(baseUrlPref)
-
-        super.setupPreferenceScreen(screen)
     }
 
     private var SharedPreferences.baseUrlHost
diff --git a/src/en/isekaiscantop/src/eu/kanade/tachiyomi/extension/en/isekaiscantop/IsekaiScanTop.kt b/src/en/isekaiscantop/src/eu/kanade/tachiyomi/extension/en/isekaiscantop/IsekaiScanTop.kt
index 54614826c..6dc162e3d 100644
--- a/src/en/isekaiscantop/src/eu/kanade/tachiyomi/extension/en/isekaiscantop/IsekaiScanTop.kt
+++ b/src/en/isekaiscantop/src/eu/kanade/tachiyomi/extension/en/isekaiscantop/IsekaiScanTop.kt
@@ -40,9 +40,6 @@ class IsekaiScanTop : Madara(
 
         if (chapterElements.isEmpty() && !chaptersWrapper.isNullOrEmpty()) {
             val mangaId = chaptersWrapper.attr("data-id")
-            val xhrHeaders = headersBuilder()
-                .add("X-Requested-With", "XMLHttpRequest")
-                .build()
             val xhrRequest = GET("$baseUrl/ajax-list-chapter?mangaID=$mangaId", xhrHeaders)
             val xhrResponse = client.newCall(xhrRequest).execute()
 
@@ -50,7 +47,7 @@ class IsekaiScanTop : Madara(
             xhrResponse.close()
         }
 
-        countViews(document)
+        launchIO { countViews(document) }
         return chapterElements.map(::chapterFromElement)
     }
 
@@ -65,7 +62,7 @@ class IsekaiScanTop : Madara(
         }
     }
 
-    override fun searchPage(page: Int): String = "search?page=$page"
+    override fun searchPage(page: Int) = "search?page=$page"
 
-    override fun searchMangaNextPageSelector(): String? = "ul.pagination li:last-child a"
+    override fun searchMangaNextPageSelector() = "ul.pagination li:last-child a"
 }
diff --git a/src/en/jimanga/src/eu/kanade/tachiyomi/extension/en/jimanga/Jimanga.kt b/src/en/jimanga/src/eu/kanade/tachiyomi/extension/en/jimanga/Jimanga.kt
index df1e41e13..e40bcdcd5 100644
--- a/src/en/jimanga/src/eu/kanade/tachiyomi/extension/en/jimanga/Jimanga.kt
+++ b/src/en/jimanga/src/eu/kanade/tachiyomi/extension/en/jimanga/Jimanga.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class Jimanga : Madara("Jimanga", "https://jimanga.com", "en") {
     override val useNewChapterEndpoint = false
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/luffymanga/src/eu/kanade/tachiyomi/extension/en/luffymanga/LuffyManga.kt b/src/en/luffymanga/src/eu/kanade/tachiyomi/extension/en/luffymanga/LuffyManga.kt
index 36a37b3af..be5710924 100644
--- a/src/en/luffymanga/src/eu/kanade/tachiyomi/extension/en/luffymanga/LuffyManga.kt
+++ b/src/en/luffymanga/src/eu/kanade/tachiyomi/extension/en/luffymanga/LuffyManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class LuffyManga : Madara("Luffy Manga", "https://luffymanga.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/luxmanga/src/eu/kanade/tachiyomi/extension/en/luxmanga/LuxManga.kt b/src/en/luxmanga/src/eu/kanade/tachiyomi/extension/en/luxmanga/LuxManga.kt
index c85b356a1..acf7a3727 100644
--- a/src/en/luxmanga/src/eu/kanade/tachiyomi/extension/en/luxmanga/LuxManga.kt
+++ b/src/en/luxmanga/src/eu/kanade/tachiyomi/extension/en/luxmanga/LuxManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class LuxManga : Madara("LuxManga", "https://luxmanga.net", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manga18h/src/eu/kanade/tachiyomi/extension/en/manga18h/Manga18h.kt b/src/en/manga18h/src/eu/kanade/tachiyomi/extension/en/manga18h/Manga18h.kt
index ef951efe4..bf3131d41 100644
--- a/src/en/manga18h/src/eu/kanade/tachiyomi/extension/en/manga18h/Manga18h.kt
+++ b/src/en/manga18h/src/eu/kanade/tachiyomi/extension/en/manga18h/Manga18h.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class Manga18h : Madara("Manga 18h", "https://manga18h.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt b/src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt
index 509fc6725..27c1752d9 100644
--- a/src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt
+++ b/src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class Manga18x : Madara("Manga 18x", "https://manga18x.net", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangabee/src/eu/kanade/tachiyomi/extension/en/mangabee/MangaBee.kt b/src/en/mangabee/src/eu/kanade/tachiyomi/extension/en/mangabee/MangaBee.kt
index 9a80c001c..c7b822b1b 100644
--- a/src/en/mangabee/src/eu/kanade/tachiyomi/extension/en/mangabee/MangaBee.kt
+++ b/src/en/mangabee/src/eu/kanade/tachiyomi/extension/en/mangabee/MangaBee.kt
@@ -12,6 +12,4 @@ class MangaBee : Madara(
 ) {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaclashtv/src/eu/kanade/tachiyomi/extension/en/mangaclashtv/MangaClashTv.kt b/src/en/mangaclashtv/src/eu/kanade/tachiyomi/extension/en/mangaclashtv/MangaClashTv.kt
index 9f85cc217..5776a9a9b 100644
--- a/src/en/mangaclashtv/src/eu/kanade/tachiyomi/extension/en/mangaclashtv/MangaClashTv.kt
+++ b/src/en/mangaclashtv/src/eu/kanade/tachiyomi/extension/en/mangaclashtv/MangaClashTv.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaClashTv : Madara("MangaClash.tv (unoriginal)", "https://mangaclash.tv", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangadash1001com/src/eu/kanade/tachiyomi/extension/en/mangadash1001com/MangaDash1001Com.kt b/src/en/mangadash1001com/src/eu/kanade/tachiyomi/extension/en/mangadash1001com/MangaDash1001Com.kt
index 88b3cd0ea..c4a2777b4 100644
--- a/src/en/mangadash1001com/src/eu/kanade/tachiyomi/extension/en/mangadash1001com/MangaDash1001Com.kt
+++ b/src/en/mangadash1001com/src/eu/kanade/tachiyomi/extension/en/mangadash1001com/MangaDash1001Com.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaDash1001Com : Madara("Manga-1001.com", "https://manga-1001.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangadinotop/src/eu/kanade/tachiyomi/extension/en/mangadinotop/MangaDinoTop.kt b/src/en/mangadinotop/src/eu/kanade/tachiyomi/extension/en/mangadinotop/MangaDinoTop.kt
index ef4d3cce1..cce43ab3e 100644
--- a/src/en/mangadinotop/src/eu/kanade/tachiyomi/extension/en/mangadinotop/MangaDinoTop.kt
+++ b/src/en/mangadinotop/src/eu/kanade/tachiyomi/extension/en/mangadinotop/MangaDinoTop.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaDinoTop : Madara("MangaDino.top (unoriginal)", "https://mangadino.top", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangahentai/src/eu/kanade/tachiyomi/extension/en/mangahentai/MangaHentai.kt b/src/en/mangahentai/src/eu/kanade/tachiyomi/extension/en/mangahentai/MangaHentai.kt
index 3d5de98bd..2f402bfbb 100644
--- a/src/en/mangahentai/src/eu/kanade/tachiyomi/extension/en/mangahentai/MangaHentai.kt
+++ b/src/en/mangahentai/src/eu/kanade/tachiyomi/extension/en/mangahentai/MangaHentai.kt
@@ -6,6 +6,4 @@ class MangaHentai : Madara("Manga Hentai", "https://mangahentai.me", "en") {
     override val mangaSubString = "manga-hentai"
 
     override val useNewChapterEndpoint: Boolean = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangakitsu/src/eu/kanade/tachiyomi/extension/en/mangakitsu/MangaKitsu.kt b/src/en/mangakitsu/src/eu/kanade/tachiyomi/extension/en/mangakitsu/MangaKitsu.kt
index db609628e..6bb87ac52 100644
--- a/src/en/mangakitsu/src/eu/kanade/tachiyomi/extension/en/mangakitsu/MangaKitsu.kt
+++ b/src/en/mangakitsu/src/eu/kanade/tachiyomi/extension/en/mangakitsu/MangaKitsu.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class MangaKitsu : Madara("Manga Kitsu", "https://mangakitsu.com", "en") {
     override val useNewChapterEndpoint = false
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div.summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaleveling/src/eu/kanade/tachiyomi/extension/en/mangaleveling/MangaLeveling.kt b/src/en/mangaleveling/src/eu/kanade/tachiyomi/extension/en/mangaleveling/MangaLeveling.kt
index 48e6b8e01..4b939050a 100644
--- a/src/en/mangaleveling/src/eu/kanade/tachiyomi/extension/en/mangaleveling/MangaLeveling.kt
+++ b/src/en/mangaleveling/src/eu/kanade/tachiyomi/extension/en/mangaleveling/MangaLeveling.kt
@@ -12,7 +12,7 @@ class MangaLeveling : Madara("Manga Leveling", "https://mangaleveling.com", "en"
         val chapter = SChapter.create()
 
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)!!.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
@@ -20,9 +20,9 @@ class MangaLeveling : Madara("Manga Leveling", "https://mangaleveling.com", "en"
             }
             // Dates can be part of a "new" graphic or plain text
             // Added "title" alternative
-            chapter.date_upload = select("img:not(.thumb)").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) }
-                ?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) }
-                ?: parseChapterDate(select(chapterDateSelector()).firstOrNull()?.text())
+            chapter.date_upload = selectFirst("img:not(.thumb)")?.attr("alt")?.let { parseRelativeDate(it) }
+                ?: selectFirst("span a")?.attr("title")?.let { parseRelativeDate(it) }
+                ?: parseChapterDate(selectFirst(chapterDateSelector())?.text())
         }
 
         return chapter
diff --git a/src/en/manganelobiz/src/eu/kanade/tachiyomi/extension/en/manganelobiz/ManganeloBiz.kt b/src/en/manganelobiz/src/eu/kanade/tachiyomi/extension/en/manganelobiz/ManganeloBiz.kt
index 81ea5245f..3317e650a 100644
--- a/src/en/manganelobiz/src/eu/kanade/tachiyomi/extension/en/manganelobiz/ManganeloBiz.kt
+++ b/src/en/manganelobiz/src/eu/kanade/tachiyomi/extension/en/manganelobiz/ManganeloBiz.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManganeloBiz : Madara("Manganelo.biz", "https://manganelo.biz", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manganelowebsite/src/eu/kanade/tachiyomi/extension/en/manganelowebsite/ManganeloWebsite.kt b/src/en/manganelowebsite/src/eu/kanade/tachiyomi/extension/en/manganelowebsite/ManganeloWebsite.kt
index b4c39d910..ce4b55288 100644
--- a/src/en/manganelowebsite/src/eu/kanade/tachiyomi/extension/en/manganelowebsite/ManganeloWebsite.kt
+++ b/src/en/manganelowebsite/src/eu/kanade/tachiyomi/extension/en/manganelowebsite/ManganeloWebsite.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManganeloWebsite : Madara("Manganelo.website (unoriginal)", "https://manganelo.website", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manganerds/src/eu/kanade/tachiyomi/extension/en/manganerds/MangaNerds.kt b/src/en/manganerds/src/eu/kanade/tachiyomi/extension/en/manganerds/MangaNerds.kt
index eb162e60b..7f448a5e8 100644
--- a/src/en/manganerds/src/eu/kanade/tachiyomi/extension/en/manganerds/MangaNerds.kt
+++ b/src/en/manganerds/src/eu/kanade/tachiyomi/extension/en/manganerds/MangaNerds.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaNerds : Madara("Manga Nerds", "https://manganerds.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaonlineteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangaonlineteamunoriginal/MangaOnlineTeamUnoriginal.kt b/src/en/mangaonlineteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangaonlineteamunoriginal/MangaOnlineTeamUnoriginal.kt
index 44491dd7b..d0f46e1fa 100644
--- a/src/en/mangaonlineteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangaonlineteamunoriginal/MangaOnlineTeamUnoriginal.kt
+++ b/src/en/mangaonlineteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangaonlineteamunoriginal/MangaOnlineTeamUnoriginal.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaOnlineTeamUnoriginal : Madara("MangaOnline.team (unoriginal)", "https://mangaonline.team", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaowlblog/src/eu/kanade/tachiyomi/extension/en/mangaowlblog/MangaOwlBlog.kt b/src/en/mangaowlblog/src/eu/kanade/tachiyomi/extension/en/mangaowlblog/MangaOwlBlog.kt
index e51f92183..e6d953c48 100644
--- a/src/en/mangaowlblog/src/eu/kanade/tachiyomi/extension/en/mangaowlblog/MangaOwlBlog.kt
+++ b/src/en/mangaowlblog/src/eu/kanade/tachiyomi/extension/en/mangaowlblog/MangaOwlBlog.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaOwlBlog : Madara("MangaOwl.blog (unoriginal)", "https://mangaowl.blog", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaowlio/src/eu/kanade/tachiyomi/extension/en/mangaowlio/MangaOwlIo.kt b/src/en/mangaowlio/src/eu/kanade/tachiyomi/extension/en/mangaowlio/MangaOwlIo.kt
index 8f41cc9f7..9e88eb1e6 100644
--- a/src/en/mangaowlio/src/eu/kanade/tachiyomi/extension/en/mangaowlio/MangaOwlIo.kt
+++ b/src/en/mangaowlio/src/eu/kanade/tachiyomi/extension/en/mangaowlio/MangaOwlIo.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaOwlIo : Madara("MangaOwl.io (unoriginal)", "https://mangaowl.io", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaowlone/src/eu/kanade/tachiyomi/extension/en/mangaowlone/MangaOwlOne.kt b/src/en/mangaowlone/src/eu/kanade/tachiyomi/extension/en/mangaowlone/MangaOwlOne.kt
index 36d7ad2f6..08e2f123f 100644
--- a/src/en/mangaowlone/src/eu/kanade/tachiyomi/extension/en/mangaowlone/MangaOwlOne.kt
+++ b/src/en/mangaowlone/src/eu/kanade/tachiyomi/extension/en/mangaowlone/MangaOwlOne.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class MangaOwlOne : Madara("MangaOwl.one (unoriginal)", "https://mangaowl.one", "en") {
     override val useNewChapterEndpoint = false
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaowlus/src/eu/kanade/tachiyomi/extension/en/mangaowlus/MangaOwlUs.kt b/src/en/mangaowlus/src/eu/kanade/tachiyomi/extension/en/mangaowlus/MangaOwlUs.kt
index 4b5dba41b..74d0be3e8 100644
--- a/src/en/mangaowlus/src/eu/kanade/tachiyomi/extension/en/mangaowlus/MangaOwlUs.kt
+++ b/src/en/mangaowlus/src/eu/kanade/tachiyomi/extension/en/mangaowlus/MangaOwlUs.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaOwlUs : Madara("MangaOwl.us (unoriginal)", "https://mangaowl.us", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangapure/src/eu/kanade/tachiyomi/extension/en/mangapure/MangaPure.kt b/src/en/mangapure/src/eu/kanade/tachiyomi/extension/en/mangapure/MangaPure.kt
index a918c44ea..9103356e3 100644
--- a/src/en/mangapure/src/eu/kanade/tachiyomi/extension/en/mangapure/MangaPure.kt
+++ b/src/en/mangapure/src/eu/kanade/tachiyomi/extension/en/mangapure/MangaPure.kt
@@ -51,7 +51,7 @@ class MangaPure : Madara(
             xhrResponse.close()
         }
 
-        countViews(document)
+        launchIO { countViews(document) }
         return chapterElements.map(::chapterFromElement)
     }
 
diff --git a/src/en/mangaqueencom/src/eu/kanade/tachiyomi/extension/en/mangaqueencom/MangaQueenCom.kt b/src/en/mangaqueencom/src/eu/kanade/tachiyomi/extension/en/mangaqueencom/MangaQueenCom.kt
index ac7398fb7..5de1c73df 100644
--- a/src/en/mangaqueencom/src/eu/kanade/tachiyomi/extension/en/mangaqueencom/MangaQueenCom.kt
+++ b/src/en/mangaqueencom/src/eu/kanade/tachiyomi/extension/en/mangaqueencom/MangaQueenCom.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaQueenCom : Madara("Manga Queen.com", "https://mangaqueen.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangarawinfo/src/eu/kanade/tachiyomi/extension/en/mangarawinfo/MangaRawInfo.kt b/src/en/mangarawinfo/src/eu/kanade/tachiyomi/extension/en/mangarawinfo/MangaRawInfo.kt
index aadc1a1be..d58f71977 100644
--- a/src/en/mangarawinfo/src/eu/kanade/tachiyomi/extension/en/mangarawinfo/MangaRawInfo.kt
+++ b/src/en/mangarawinfo/src/eu/kanade/tachiyomi/extension/en/mangarawinfo/MangaRawInfo.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaRawInfo : Madara("Manga-Raw.info (unoriginal)", "https://manga-raw.info", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangarockteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangarockteamunoriginal/MangaRockTeamUnoriginal.kt b/src/en/mangarockteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangarockteamunoriginal/MangaRockTeamUnoriginal.kt
index fe7d0fb26..4eac10879 100644
--- a/src/en/mangarockteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangarockteamunoriginal/MangaRockTeamUnoriginal.kt
+++ b/src/en/mangarockteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangarockteamunoriginal/MangaRockTeamUnoriginal.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaRockTeamUnoriginal : Madara("Manga Rock.team (unoriginal)", "https://mangarock.team", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangarosie/src/eu/kanade/tachiyomi/extension/en/mangarosie/MangaRosie.kt b/src/en/mangarosie/src/eu/kanade/tachiyomi/extension/en/mangarosie/MangaRosie.kt
index 08b563be9..2ba8e4091 100644
--- a/src/en/mangarosie/src/eu/kanade/tachiyomi/extension/en/mangarosie/MangaRosie.kt
+++ b/src/en/mangarosie/src/eu/kanade/tachiyomi/extension/en/mangarosie/MangaRosie.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class MangaRosie : Madara("MangaRosie", "https://mangarosie.in", "en") {
     override val useNewChapterEndpoint = false
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div.summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangarubycom/src/eu/kanade/tachiyomi/extension/en/mangarubycom/MangaRubyCom.kt b/src/en/mangarubycom/src/eu/kanade/tachiyomi/extension/en/mangarubycom/MangaRubyCom.kt
index c75ef9336..ed6cb831f 100644
--- a/src/en/mangarubycom/src/eu/kanade/tachiyomi/extension/en/mangarubycom/MangaRubyCom.kt
+++ b/src/en/mangarubycom/src/eu/kanade/tachiyomi/extension/en/mangarubycom/MangaRubyCom.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class MangaRubyCom : Madara("MangaRuby.com", "https://mangaruby.com", "en") {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaryu/src/eu/kanade/tachiyomi/extension/en/mangaryu/Mangaryu.kt b/src/en/mangaryu/src/eu/kanade/tachiyomi/extension/en/mangaryu/Mangaryu.kt
index 616998644..411312295 100644
--- a/src/en/mangaryu/src/eu/kanade/tachiyomi/extension/en/mangaryu/Mangaryu.kt
+++ b/src/en/mangaryu/src/eu/kanade/tachiyomi/extension/en/mangaryu/Mangaryu.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class Mangaryu : Madara("Mangaryu", "https://mangaryu.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangatxgg/src/eu/kanade/tachiyomi/extension/en/mangatxgg/MangaTxGg.kt b/src/en/mangatxgg/src/eu/kanade/tachiyomi/extension/en/mangatxgg/MangaTxGg.kt
index 2a3fc8826..b004db293 100644
--- a/src/en/mangatxgg/src/eu/kanade/tachiyomi/extension/en/mangatxgg/MangaTxGg.kt
+++ b/src/en/mangatxgg/src/eu/kanade/tachiyomi/extension/en/mangatxgg/MangaTxGg.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaTxGg : Madara("Manga Tx.gg (unoriginal)", "https://mangatx.gg", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangatyrant/src/eu/kanade/tachiyomi/extension/en/mangatyrant/MangaTyrant.kt b/src/en/mangatyrant/src/eu/kanade/tachiyomi/extension/en/mangatyrant/MangaTyrant.kt
index 88557eba3..0095187eb 100644
--- a/src/en/mangatyrant/src/eu/kanade/tachiyomi/extension/en/mangatyrant/MangaTyrant.kt
+++ b/src/en/mangatyrant/src/eu/kanade/tachiyomi/extension/en/mangatyrant/MangaTyrant.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class MangaTyrant : Madara("MangaTyrant", "https://mangatyrant.com", "en") {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/mangaupdatestop/src/eu/kanade/tachiyomi/extension/en/mangaupdatestop/MangaUpdatesTop.kt b/src/en/mangaupdatestop/src/eu/kanade/tachiyomi/extension/en/mangaupdatestop/MangaUpdatesTop.kt
index e8319f828..9cfc55d5e 100644
--- a/src/en/mangaupdatestop/src/eu/kanade/tachiyomi/extension/en/mangaupdatestop/MangaUpdatesTop.kt
+++ b/src/en/mangaupdatestop/src/eu/kanade/tachiyomi/extension/en/mangaupdatestop/MangaUpdatesTop.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class MangaUpdatesTop : Madara("MangaUpdates.top (unoriginal)", "https://mangaupdates.top", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhuadex/src/eu/kanade/tachiyomi/extension/en/manhuadex/ManhuaDex.kt b/src/en/manhuadex/src/eu/kanade/tachiyomi/extension/en/manhuadex/ManhuaDex.kt
index 38509251f..58463fa71 100644
--- a/src/en/manhuadex/src/eu/kanade/tachiyomi/extension/en/manhuadex/ManhuaDex.kt
+++ b/src/en/manhuadex/src/eu/kanade/tachiyomi/extension/en/manhuadex/ManhuaDex.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManhuaDex : Madara("ManhuaDex", "https://manhuadex.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt b/src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt
index cfac96d24..6af293188 100644
--- a/src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt
+++ b/src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt
@@ -1,11 +1,8 @@
 package eu.kanade.tachiyomi.extension.en.manhuafast
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.CacheControl
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import java.util.concurrent.TimeUnit
 
 class ManhuaFast : Madara("ManhuaFast", "https://manhuafast.com", "en") {
@@ -16,22 +13,4 @@ class ManhuaFast : Madara("ManhuaFast", "https://manhuafast.com", "en") {
 
     // The website does not flag the content.
     override val filterNonMangaItems = false
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/${searchPage(page)}?s&post_type=wp-manga&m_orderby=views",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
-
-    override fun popularMangaSelector() = searchMangaSelector()
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET(
-            url = "$baseUrl/${searchPage(page)}?s&post_type=wp-manga&m_orderby=latest",
-            headers = headers,
-            cache = CacheControl.FORCE_NETWORK,
-        )
-    }
 }
diff --git a/src/en/manhuafastnet/src/eu/kanade/tachiyomi/extension/en/manhuafastnet/ManhuaFastNet.kt b/src/en/manhuafastnet/src/eu/kanade/tachiyomi/extension/en/manhuafastnet/ManhuaFastNet.kt
index cca61bb0c..ab09bb89c 100644
--- a/src/en/manhuafastnet/src/eu/kanade/tachiyomi/extension/en/manhuafastnet/ManhuaFastNet.kt
+++ b/src/en/manhuafastnet/src/eu/kanade/tachiyomi/extension/en/manhuafastnet/ManhuaFastNet.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManhuaFastNet : Madara("ManhuaFast.net (unoriginal)", "https://manhuafast.net", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhuamanhwa/src/eu/kanade/tachiyomi/extension/en/manhuamanhwa/ManhuaManhwa.kt b/src/en/manhuamanhwa/src/eu/kanade/tachiyomi/extension/en/manhuamanhwa/ManhuaManhwa.kt
index ee089eb82..9d5433f5e 100644
--- a/src/en/manhuamanhwa/src/eu/kanade/tachiyomi/extension/en/manhuamanhwa/ManhuaManhwa.kt
+++ b/src/en/manhuamanhwa/src/eu/kanade/tachiyomi/extension/en/manhuamanhwa/ManhuaManhwa.kt
@@ -12,6 +12,4 @@ class ManhuaManhwa : Madara(
 ) {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhuamanhwaonline/src/eu/kanade/tachiyomi/extension/en/manhuamanhwaonline/ManhuaManhwaOnline.kt b/src/en/manhuamanhwaonline/src/eu/kanade/tachiyomi/extension/en/manhuamanhwaonline/ManhuaManhwaOnline.kt
index 81aea3a59..972a0be64 100644
--- a/src/en/manhuamanhwaonline/src/eu/kanade/tachiyomi/extension/en/manhuamanhwaonline/ManhuaManhwaOnline.kt
+++ b/src/en/manhuamanhwaonline/src/eu/kanade/tachiyomi/extension/en/manhuamanhwaonline/ManhuaManhwaOnline.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManhuaManhwaOnline : Madara("ManhuaManhwa.online", "https://manhuamanhwa.online", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhuascaninfo/src/eu/kanade/tachiyomi/extension/en/manhuascaninfo/ManhuaScanInfo.kt b/src/en/manhuascaninfo/src/eu/kanade/tachiyomi/extension/en/manhuascaninfo/ManhuaScanInfo.kt
index 7a88dd1db..bb253dea7 100644
--- a/src/en/manhuascaninfo/src/eu/kanade/tachiyomi/extension/en/manhuascaninfo/ManhuaScanInfo.kt
+++ b/src/en/manhuascaninfo/src/eu/kanade/tachiyomi/extension/en/manhuascaninfo/ManhuaScanInfo.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManhuaScanInfo : Madara("ManhuaScan.info (unoriginal)", "https://manhuascan.info", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhuazonghe/src/eu/kanade/tachiyomi/extension/en/manhuazonghe/ManhuaZonghe.kt b/src/en/manhuazonghe/src/eu/kanade/tachiyomi/extension/en/manhuazonghe/ManhuaZonghe.kt
index 212ec0eb0..fba773755 100644
--- a/src/en/manhuazonghe/src/eu/kanade/tachiyomi/extension/en/manhuazonghe/ManhuaZonghe.kt
+++ b/src/en/manhuazonghe/src/eu/kanade/tachiyomi/extension/en/manhuazonghe/ManhuaZonghe.kt
@@ -6,6 +6,4 @@ class ManhuaZonghe : Madara("Manhua Zonghe", "https://manhuazonghe.com", "en") {
     override val useNewChapterEndpoint = false
     override val filterNonMangaItems = false
     override val mangaSubString = "manhua"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhwa2read/src/eu/kanade/tachiyomi/extension/en/manhwa2read/Manhwa2Read.kt b/src/en/manhwa2read/src/eu/kanade/tachiyomi/extension/en/manhwa2read/Manhwa2Read.kt
index fbd6a1571..d8f4989db 100644
--- a/src/en/manhwa2read/src/eu/kanade/tachiyomi/extension/en/manhwa2read/Manhwa2Read.kt
+++ b/src/en/manhwa2read/src/eu/kanade/tachiyomi/extension/en/manhwa2read/Manhwa2Read.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class Manhwa2Read : Madara("Manhwa2Read", "https://manhwa2read.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhwafull/src/eu/kanade/tachiyomi/extension/en/manhwafull/Manhwafull.kt b/src/en/manhwafull/src/eu/kanade/tachiyomi/extension/en/manhwafull/Manhwafull.kt
index 77e804e4b..9227a477a 100644
--- a/src/en/manhwafull/src/eu/kanade/tachiyomi/extension/en/manhwafull/Manhwafull.kt
+++ b/src/en/manhwafull/src/eu/kanade/tachiyomi/extension/en/manhwafull/Manhwafull.kt
@@ -1,26 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.manhwafull
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.CacheControl
-import okhttp3.Request
+import java.text.SimpleDateFormat
+import java.util.Locale
 
-class Manhwafull : Madara("Manhwafull", "https://manhwafull.com", "en") {
-
-    override fun popularMangaNextPageSelector(): String? = "a.nextpostslink"
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET(
-            "$baseUrl/manga-mwf/page/$page/?m_orderby=views",
-            headers,
-            CacheControl.FORCE_NETWORK,
-        )
-    }
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET(
-            "$baseUrl/manga-mwf/page/$page/?m_orderby=latest",
-            headers,
-            CacheControl.FORCE_NETWORK,
-        )
-    }
-}
+class Manhwafull : Madara("Manhwafull", "https://manhwafull.com", "en", SimpleDateFormat("MM/dd/yyyy", Locale.ENGLISH))
diff --git a/src/en/manhwamanhua/src/eu/kanade/tachiyomi/extension/en/manhwamanhua/ManhwaManhua.kt b/src/en/manhwamanhua/src/eu/kanade/tachiyomi/extension/en/manhwamanhua/ManhwaManhua.kt
index db15b5db2..55a4dcbda 100644
--- a/src/en/manhwamanhua/src/eu/kanade/tachiyomi/extension/en/manhwamanhua/ManhwaManhua.kt
+++ b/src/en/manhwamanhua/src/eu/kanade/tachiyomi/extension/en/manhwamanhua/ManhwaManhua.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class ManhwaManhua : Madara("ManhwaManhua", "https://manhwamanhua.com", "en") {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhwanew/src/eu/kanade/tachiyomi/extension/en/manhwanew/ManhwaNew.kt b/src/en/manhwanew/src/eu/kanade/tachiyomi/extension/en/manhwanew/ManhwaNew.kt
index 17be4d42d..c5f39269e 100644
--- a/src/en/manhwanew/src/eu/kanade/tachiyomi/extension/en/manhwanew/ManhwaNew.kt
+++ b/src/en/manhwanew/src/eu/kanade/tachiyomi/extension/en/manhwanew/ManhwaNew.kt
@@ -12,6 +12,4 @@ class ManhwaNew : Madara(
 ) {
     override val useNewChapterEndpoint = true
     override val filterNonMangaItems = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/manhwaz/src/eu/kanade/tachiyomi/extension/en/manhwaz/ManhwaZ.kt b/src/en/manhwaz/src/eu/kanade/tachiyomi/extension/en/manhwaz/ManhwaZ.kt
index 65d133a84..88e080218 100644
--- a/src/en/manhwaz/src/eu/kanade/tachiyomi/extension/en/manhwaz/ManhwaZ.kt
+++ b/src/en/manhwaz/src/eu/kanade/tachiyomi/extension/en/manhwaz/ManhwaZ.kt
@@ -108,9 +108,7 @@ class ManhwaZ : Madara(
         val mangaList = document.select(".page-search > .container > .row > div")
             .map(::searchMangaFromElement)
 
-        val hasNextPage = searchMangaNextPageSelector().let { selector ->
-            document.select(selector).first()
-        } != null
+        val hasNextPage = document.selectFirst(searchMangaNextPageSelector()) != null
 
         return MangasPage(mangaList, hasNextPage)
     }
diff --git a/src/en/midnightmessscans/src/eu/kanade/tachiyomi/extension/en/midnightmessscans/MidnightMessScans.kt b/src/en/midnightmessscans/src/eu/kanade/tachiyomi/extension/en/midnightmessscans/MidnightMessScans.kt
index ed234ca2e..7f4f3394d 100644
--- a/src/en/midnightmessscans/src/eu/kanade/tachiyomi/extension/en/midnightmessscans/MidnightMessScans.kt
+++ b/src/en/midnightmessscans/src/eu/kanade/tachiyomi/extension/en/midnightmessscans/MidnightMessScans.kt
@@ -12,19 +12,19 @@ class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.or
     override fun mangaDetailsParse(document: Document): SManga {
         val manga = SManga.create()
         with(document) {
-            select("div.post-title h3").first()?.let {
+            selectFirst("div.post-title h3")!!.let {
                 manga.title = it.ownText()
             }
-            select("div.author-content").first()?.let {
+            selectFirst("div.author-content")?.let {
                 if (it.text().notUpdating()) manga.author = it.text()
             }
-            select("div.artist-content").first()?.let {
+            selectFirst("div.artist-content")?.let {
                 if (it.text().notUpdating()) manga.artist = it.text()
             }
             select("div.summary_content div.post-content").let {
                 manga.description = it.select("div.manga-excerpt").text()
             }
-            select("div.summary_image img").first()?.let {
+            selectFirst("div.summary_image img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
             select("div.summary-content").last()?.let {
@@ -48,7 +48,7 @@ class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.or
             }
 
             // add manga/manhwa/manhua thinggy to genre
-            document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let {
+            document.selectFirst(seriesTypeSelector)?.ownText()?.let {
                 if (it.isEmpty().not() && it.notUpdating() && it != "-" && genres.contains(it).not()) {
                     genres.add(it.lowercase(Locale.ROOT))
                 }
diff --git a/src/en/milftoon/src/eu/kanade/tachiyomi/extension/en/milftoon/Milftoon.kt b/src/en/milftoon/src/eu/kanade/tachiyomi/extension/en/milftoon/Milftoon.kt
index 8c9aee4a0..d9d1b6d7a 100644
--- a/src/en/milftoon/src/eu/kanade/tachiyomi/extension/en/milftoon/Milftoon.kt
+++ b/src/en/milftoon/src/eu/kanade/tachiyomi/extension/en/milftoon/Milftoon.kt
@@ -1,10 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.milftoon
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Request
 
 class Milftoon : Madara("Milftoon", "https://milftoon.xxx", "en") {
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/page/$page/?m_orderby=views", headers)
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page/?m_orderby=latest", headers)
+    override val mangaSubString = "comics"
 }
diff --git a/src/en/mmscans/src/eu/kanade/tachiyomi/extension/en/mmscans/MMScans.kt b/src/en/mmscans/src/eu/kanade/tachiyomi/extension/en/mmscans/MMScans.kt
index 03252b7a7..67b0d2cea 100644
--- a/src/en/mmscans/src/eu/kanade/tachiyomi/extension/en/mmscans/MMScans.kt
+++ b/src/en/mmscans/src/eu/kanade/tachiyomi/extension/en/mmscans/MMScans.kt
@@ -1,71 +1,30 @@
 package eu.kanade.tachiyomi.extension.en.mmscans
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import okhttp3.FormBody
-import okhttp3.Request
 import org.jsoup.nodes.Element
 
 class MMScans : Madara("MMScans", "https://mm-scans.org", "en") {
 
     // The site customized the listing and does not include a .manga class.
     override val filterNonMangaItems = false
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 
     override val popularMangaUrlSelector = "div.item-summary a"
     override fun chapterListSelector() = "li.chapter-li"
     override fun searchMangaSelector() = ".search-wrap >.tab-content-wrap > a"
-    override fun searchMangaNextPageSelector(): String? = "body:not(:has(.no-posts))"
 
-    fun oldLoadMoreRequest(page: Int, metaKey: String): Request {
-        val form = FormBody.Builder()
-            .add("action", "madara_load_more")
-            .add("page", page.toString())
-            .add("template", "madara-core/content/content-archive")
-            .add("vars[paged]", "1")
-            .add("vars[orderby]", "meta_value_num")
-            .add("vars[template]", "archive")
-            .add("vars[sidebar]", "right")
-            .add("vars[post_type]", "wp-manga")
-            .add("vars[post_status]", "publish")
-            .add("vars[meta_key]", metaKey)
-            .add("vars[meta_query][0][paged]", "1")
-            .add("vars[meta_query][0][orderby]", "meta_value_num")
-            .add("vars[meta_query][0][template]", "archive")
-            .add("vars[meta_query][0][sidebar]", "right")
-            .add("vars[meta_query][0][post_type]", "wp-manga")
-            .add("vars[meta_query][0][post_status]", "publish")
-            .add("vars[meta_query][0][meta_key]", metaKey)
-            .add("vars[meta_query][relation]", "AND")
-            .add("vars[manga_archives_item_layout]", "default")
-            .build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", form.contentLength().toString())
-            .add("Content-Type", form.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, form)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return oldLoadMoreRequest(page - 1, "_wp_manga_views")
-    }
-    override fun latestUpdatesRequest(page: Int): Request {
-        return oldLoadMoreRequest(page - 1, "_latest_update")
-    }
     override fun popularMangaFromElement(element: Element): SManga {
         val manga = SManga.create()
 
         with(element) {
-            select(popularMangaUrlSelector).first()?.let {
+            selectFirst(popularMangaUrlSelector)?.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
                 manga.title = it.selectFirst("h3")!!.ownText()
             }
 
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
         }
@@ -77,13 +36,13 @@ class MMScans : Madara("MMScans", "https://mm-scans.org", "en") {
         val chapter = SChapter.create()
 
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)!!.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
                 chapter.name = urlElement.selectFirst(".chapter-title-date p")!!.text()
             }
-            chapter.date_upload = parseChapterDate(select(chapterDateSelector()).firstOrNull()?.text())
+            chapter.date_upload = parseChapterDate(selectFirst(chapterDateSelector())?.text())
         }
 
         return chapter
diff --git a/src/en/nitroscans/src/eu/kanade/tachiyomi/extension/en/nitroscans/NitroScans.kt b/src/en/nitroscans/src/eu/kanade/tachiyomi/extension/en/nitroscans/NitroScans.kt
index a04aff3ed..c5c1f771f 100644
--- a/src/en/nitroscans/src/eu/kanade/tachiyomi/extension/en/nitroscans/NitroScans.kt
+++ b/src/en/nitroscans/src/eu/kanade/tachiyomi/extension/en/nitroscans/NitroScans.kt
@@ -10,6 +10,4 @@ class NitroScans : Madara("Nitro Manga", "https://nitromanga.com", "en") {
     override val filterNonMangaItems = false
 
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/onlymanhwa/src/eu/kanade/tachiyomi/extension/en/onlymanhwa/OnlyManhwa.kt b/src/en/onlymanhwa/src/eu/kanade/tachiyomi/extension/en/onlymanhwa/OnlyManhwa.kt
index 5013f8987..f91a64d35 100644
--- a/src/en/onlymanhwa/src/eu/kanade/tachiyomi/extension/en/onlymanhwa/OnlyManhwa.kt
+++ b/src/en/onlymanhwa/src/eu/kanade/tachiyomi/extension/en/onlymanhwa/OnlyManhwa.kt
@@ -13,6 +13,4 @@ class OnlyManhwa : Madara(
     override val useNewChapterEndpoint = true
     override val mangaSubString = "manhwa"
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div.summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/opscans/src/eu/kanade/tachiyomi/extension/en/opscans/OPSCANS.kt b/src/en/opscans/src/eu/kanade/tachiyomi/extension/en/opscans/OPSCANS.kt
index c35e54f5c..108de919d 100644
--- a/src/en/opscans/src/eu/kanade/tachiyomi/extension/en/opscans/OPSCANS.kt
+++ b/src/en/opscans/src/eu/kanade/tachiyomi/extension/en/opscans/OPSCANS.kt
@@ -4,12 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class OPSCANS : Madara("OPSCANS", "https://opchapters.com", "en") {
     override val versionId = 2
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
 }
diff --git a/src/en/paragonscans/src/eu/kanade/tachiyomi/extension/en/paragonscans/ParagonScans.kt b/src/en/paragonscans/src/eu/kanade/tachiyomi/extension/en/paragonscans/ParagonScans.kt
index ef4d7ba70..4c63ec91f 100644
--- a/src/en/paragonscans/src/eu/kanade/tachiyomi/extension/en/paragonscans/ParagonScans.kt
+++ b/src/en/paragonscans/src/eu/kanade/tachiyomi/extension/en/paragonscans/ParagonScans.kt
@@ -14,8 +14,6 @@ class ParagonScans : Madara(
     override val useNewChapterEndpoint = true
     override val mangaSubString = "mangax"
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun parseChapterDate(date: String?): Long {
         date ?: return 0
 
diff --git a/src/en/pawmanga/src/eu/kanade/tachiyomi/extension/en/pawmanga/PawManga.kt b/src/en/pawmanga/src/eu/kanade/tachiyomi/extension/en/pawmanga/PawManga.kt
index f82a6f971..1d7847b91 100644
--- a/src/en/pawmanga/src/eu/kanade/tachiyomi/extension/en/pawmanga/PawManga.kt
+++ b/src/en/pawmanga/src/eu/kanade/tachiyomi/extension/en/pawmanga/PawManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class PawManga : Madara("Paw Manga", "https://pawmanga.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/pmscans/src/eu/kanade/tachiyomi/extension/en/pmscans/PMScans.kt b/src/en/pmscans/src/eu/kanade/tachiyomi/extension/en/pmscans/PMScans.kt
index 98969144e..673d951e3 100644
--- a/src/en/pmscans/src/eu/kanade/tachiyomi/extension/en/pmscans/PMScans.kt
+++ b/src/en/pmscans/src/eu/kanade/tachiyomi/extension/en/pmscans/PMScans.kt
@@ -12,6 +12,4 @@ class PMScans : Madara(
 ) {
     override val versionId = 2
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/ponymanga/src/eu/kanade/tachiyomi/extension/en/ponymanga/PonyManga.kt b/src/en/ponymanga/src/eu/kanade/tachiyomi/extension/en/ponymanga/PonyManga.kt
index 559b8df95..58ccf40ea 100644
--- a/src/en/ponymanga/src/eu/kanade/tachiyomi/extension/en/ponymanga/PonyManga.kt
+++ b/src/en/ponymanga/src/eu/kanade/tachiyomi/extension/en/ponymanga/PonyManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class PonyManga : Madara("Pony Manga", "https://ponymanga.com", "en") {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/readmanhua/src/eu/kanade/tachiyomi/extension/en/readmanhua/ReadManhua.kt b/src/en/readmanhua/src/eu/kanade/tachiyomi/extension/en/readmanhua/ReadManhua.kt
index 401242795..ca95b68f8 100644
--- a/src/en/readmanhua/src/eu/kanade/tachiyomi/extension/en/readmanhua/ReadManhua.kt
+++ b/src/en/readmanhua/src/eu/kanade/tachiyomi/extension/en/readmanhua/ReadManhua.kt
@@ -19,7 +19,7 @@ class ReadManhua : Madara(
         val year = Calendar.getInstance().get(Calendar.YEAR).toLong()
 
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)?.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
@@ -27,8 +27,8 @@ class ReadManhua : Madara(
             }
 
             // Dates can be part of a "new" graphic or plain text
-            chapter.date_upload = select("img").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) }
-                ?: parseChapterDate(select("span.chapter-release-date i").firstOrNull()?.text() + " " + year)
+            chapter.date_upload = selectFirst("img")?.attr("alt")?.let { parseRelativeDate(it) }
+                ?: parseChapterDate(selectFirst("span.chapter-release-date i")?.text() + " " + year)
         }
 
         return chapter
diff --git a/src/en/sectscans/src/eu/kanade/tachiyomi/extension/en/sectscans/SectScans.kt b/src/en/sectscans/src/eu/kanade/tachiyomi/extension/en/sectscans/SectScans.kt
index 1f7f7cbdf..b22206009 100644
--- a/src/en/sectscans/src/eu/kanade/tachiyomi/extension/en/sectscans/SectScans.kt
+++ b/src/en/sectscans/src/eu/kanade/tachiyomi/extension/en/sectscans/SectScans.kt
@@ -19,8 +19,6 @@ class SectScans : Madara("SectScans", "https://sectscans.com", "en") {
 
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     // =========================== Manga Details ============================
 
     override val mangaDetailsSelectorTitle = ".post-title"
diff --git a/src/en/setsuscans/src/eu/kanade/tachiyomi/extension/en/setsuscans/SetsuScans.kt b/src/en/setsuscans/src/eu/kanade/tachiyomi/extension/en/setsuscans/SetsuScans.kt
index 9688788d8..336006ebb 100644
--- a/src/en/setsuscans/src/eu/kanade/tachiyomi/extension/en/setsuscans/SetsuScans.kt
+++ b/src/en/setsuscans/src/eu/kanade/tachiyomi/extension/en/setsuscans/SetsuScans.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension.en.setsuscans
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import eu.kanade.tachiyomi.source.model.MangasPage
 import okhttp3.Interceptor
 import okhttp3.Response
 
@@ -60,31 +59,7 @@ class SetsuScans : Madara(
     }
 
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
-    override fun popularMangaParse(response: Response) =
-        super.popularMangaParse(response).fixNextPage()
-
-    override fun latestUpdatesParse(response: Response) =
-        super.latestUpdatesParse(response).fixNextPage()
-
-    override fun searchMangaParse(response: Response) =
-        super.searchMangaParse(response).fixNextPage()
-
-    private fun MangasPage.fixNextPage(): MangasPage {
-        return if (mangas.size < 12) {
-            MangasPage(mangas, false)
-        } else {
-            this
-        }
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(status) + div.summary-content"
 }
diff --git a/src/en/shibamanga/src/eu/kanade/tachiyomi/extension/en/shibamanga/ShibaManga.kt b/src/en/shibamanga/src/eu/kanade/tachiyomi/extension/en/shibamanga/ShibaManga.kt
index e37cf7b74..65c29dd4b 100644
--- a/src/en/shibamanga/src/eu/kanade/tachiyomi/extension/en/shibamanga/ShibaManga.kt
+++ b/src/en/shibamanga/src/eu/kanade/tachiyomi/extension/en/shibamanga/ShibaManga.kt
@@ -12,12 +12,4 @@ class ShibaManga : Madara(
 ) {
     override val filterNonMangaItems = false
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
 }
diff --git a/src/en/theblank/src/eu/kanade/tachiyomi/extension/en/theblank/TheBlank.kt b/src/en/theblank/src/eu/kanade/tachiyomi/extension/en/theblank/TheBlank.kt
index a28fb4075..0097e2db9 100644
--- a/src/en/theblank/src/eu/kanade/tachiyomi/extension/en/theblank/TheBlank.kt
+++ b/src/en/theblank/src/eu/kanade/tachiyomi/extension/en/theblank/TheBlank.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.theblank
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import eu.kanade.tachiyomi.source.model.MangasPage
-import okhttp3.Response
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -19,29 +17,5 @@ class TheBlank : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
-    override fun popularMangaParse(response: Response) =
-        super.popularMangaParse(response).fixNextPage()
-
-    override fun latestUpdatesParse(response: Response) =
-        super.latestUpdatesParse(response).fixNextPage()
-
-    override fun searchMangaParse(response: Response) =
-        super.searchMangaParse(response).fixNextPage()
-
-    private fun MangasPage.fixNextPage(): MangasPage {
-        return if (mangas.size < 12) {
-            MangasPage(mangas, false)
-        } else {
-            this
-        }
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/en/toongod/src/eu/kanade/tachiyomi/extension/en/toongod/ToonGod.kt b/src/en/toongod/src/eu/kanade/tachiyomi/extension/en/toongod/ToonGod.kt
index 9f8bbb409..7c5c18fda 100644
--- a/src/en/toongod/src/eu/kanade/tachiyomi/extension/en/toongod/ToonGod.kt
+++ b/src/en/toongod/src/eu/kanade/tachiyomi/extension/en/toongod/ToonGod.kt
@@ -7,6 +7,4 @@ import java.util.Locale
 class ToonGod : Madara("ToonGod", "https://www.toongod.org", "en", SimpleDateFormat("d MMM yyyy", Locale.US)) {
     override val mangaSubString = "webtoons"
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/Toonily.kt b/src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/Toonily.kt
index 3324db7ca..c6816652d 100644
--- a/src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/Toonily.kt
+++ b/src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/Toonily.kt
@@ -24,14 +24,6 @@ class Toonily : Madara(
 
     override val mangaSubString = "webtoon"
 
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
-
     private fun searchPage(page: Int, query: String): String {
         val urlQuery = query.trim()
             .lowercase(Locale.US)
diff --git a/src/en/toonizy/src/eu/kanade/tachiyomi/extension/en/toonizy/Toonizy.kt b/src/en/toonizy/src/eu/kanade/tachiyomi/extension/en/toonizy/Toonizy.kt
index fce888281..88a30ae38 100644
--- a/src/en/toonizy/src/eu/kanade/tachiyomi/extension/en/toonizy/Toonizy.kt
+++ b/src/en/toonizy/src/eu/kanade/tachiyomi/extension/en/toonizy/Toonizy.kt
@@ -11,6 +11,4 @@ class Toonizy : Madara(
     dateFormat = SimpleDateFormat("MMM d, yy", Locale.ENGLISH),
 ) {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/topmanhua/src/eu/kanade/tachiyomi/extension/en/topmanhua/TopManhua.kt b/src/en/topmanhua/src/eu/kanade/tachiyomi/extension/en/topmanhua/TopManhua.kt
index b7484f7b9..750a65acb 100644
--- a/src/en/topmanhua/src/eu/kanade/tachiyomi/extension/en/topmanhua/TopManhua.kt
+++ b/src/en/topmanhua/src/eu/kanade/tachiyomi/extension/en/topmanhua/TopManhua.kt
@@ -14,6 +14,4 @@ class TopManhua : Madara("Top Manhua", "https://topmanhua.com", "en", SimpleDate
     override val filterNonMangaItems = false
 
     override val mangaSubString = "manhua"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/webdexscans/src/eu/kanade/tachiyomi/extension/en/webdexscans/WebdexScans.kt b/src/en/webdexscans/src/eu/kanade/tachiyomi/extension/en/webdexscans/WebdexScans.kt
index 76a544648..9e24230f2 100644
--- a/src/en/webdexscans/src/eu/kanade/tachiyomi/extension/en/webdexscans/WebdexScans.kt
+++ b/src/en/webdexscans/src/eu/kanade/tachiyomi/extension/en/webdexscans/WebdexScans.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class WebdexScans : Madara("Webdex Scans", "https://webdexscans.com", "en") {
     override val useNewChapterEndpoint = true
     override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div.summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/webtooncity/src/eu/kanade/tachiyomi/extension/en/webtooncity/WebtoonCity.kt b/src/en/webtooncity/src/eu/kanade/tachiyomi/extension/en/webtooncity/WebtoonCity.kt
index 9418a5078..e423f5f53 100644
--- a/src/en/webtooncity/src/eu/kanade/tachiyomi/extension/en/webtooncity/WebtoonCity.kt
+++ b/src/en/webtooncity/src/eu/kanade/tachiyomi/extension/en/webtooncity/WebtoonCity.kt
@@ -5,6 +5,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class WebtoonCity : Madara("Webtoon City", "https://webtooncity.com", "en") {
     override val useNewChapterEndpoint = false
     override val mangaSubString = "webtoon"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/webtoonxyz/src/eu/kanade/tachiyomi/extension/en/webtoonxyz/WebtoonXYZ.kt b/src/en/webtoonxyz/src/eu/kanade/tachiyomi/extension/en/webtoonxyz/WebtoonXYZ.kt
index 0923594d3..e0e7eabcd 100644
--- a/src/en/webtoonxyz/src/eu/kanade/tachiyomi/extension/en/webtoonxyz/WebtoonXYZ.kt
+++ b/src/en/webtoonxyz/src/eu/kanade/tachiyomi/extension/en/webtoonxyz/WebtoonXYZ.kt
@@ -1,13 +1,10 @@
 package eu.kanade.tachiyomi.extension.en.webtoonxyz
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 
 class WebtoonXYZ : Madara("WebtoonXYZ", "https://www.webtoon.xyz", "en", SimpleDateFormat("dd MMMM yyyy", Locale.US)) {
-    private fun pagePath(page: Int) = if (page > 1) "page/$page/" else ""
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=views", headers)
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=latest", headers)
+    override val mangaSubString = "read"
+    override val sendViewCount = false
 }
diff --git a/src/en/whalemanga/src/eu/kanade/tachiyomi/extension/en/whalemanga/WhaleManga.kt b/src/en/whalemanga/src/eu/kanade/tachiyomi/extension/en/whalemanga/WhaleManga.kt
index 8bfd2975a..9555c971e 100644
--- a/src/en/whalemanga/src/eu/kanade/tachiyomi/extension/en/whalemanga/WhaleManga.kt
+++ b/src/en/whalemanga/src/eu/kanade/tachiyomi/extension/en/whalemanga/WhaleManga.kt
@@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class WhaleManga : Madara("WhaleManga", "https://whalemanga.com", "en") {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/en/wuxiaworld/src/eu/kanade/tachiyomi/extension/en/wuxiaworld/WuxiaWorld.kt b/src/en/wuxiaworld/src/eu/kanade/tachiyomi/extension/en/wuxiaworld/WuxiaWorld.kt
index ce7c6996f..69899a938 100644
--- a/src/en/wuxiaworld/src/eu/kanade/tachiyomi/extension/en/wuxiaworld/WuxiaWorld.kt
+++ b/src/en/wuxiaworld/src/eu/kanade/tachiyomi/extension/en/wuxiaworld/WuxiaWorld.kt
@@ -1,13 +1,8 @@
 package eu.kanade.tachiyomi.extension.en.wuxiaworld
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.FilterList
-import okhttp3.Request
 
 class WuxiaWorld : Madara("WuxiaWorld", "https://wuxiaworld.site", "en") {
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/tag/webcomic/page/$page/?m_orderby=views", headers)
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/tag/webcomic/page/$page/?m_orderby=latest", headers)
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList) = super.searchMangaRequest(page, "$query comics", filters)
-    override fun popularMangaNextPageSelector() = "div.nav-previous.float-left"
+    override val mangaSubString = "novel"
+    override val useNewChapterEndpoint = true
 }
diff --git a/src/es/barmanga/src/eu/kanade/tachiyomi/extension/es/barmanga/BarManga.kt b/src/es/barmanga/src/eu/kanade/tachiyomi/extension/es/barmanga/BarManga.kt
index 17c6d91e5..730d8dc24 100644
--- a/src/es/barmanga/src/eu/kanade/tachiyomi/extension/es/barmanga/BarManga.kt
+++ b/src/es/barmanga/src/eu/kanade/tachiyomi/extension/es/barmanga/BarManga.kt
@@ -1,9 +1,6 @@
 package eu.kanade.tachiyomi.extension.es.barmanga
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.FormBody
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -13,40 +10,6 @@ class BarManga : Madara(
     "es",
     SimpleDateFormat("MM/dd/yyyy", Locale.ROOT),
 ) {
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
     override val mangaDetailsSelectorDescription = "div.flamesummary > div.manga-excerpt"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
 }
diff --git a/src/es/housemangas/src/eu/kanade/tachiyomi/extension/es/housemangas/HouseMangas.kt b/src/es/housemangas/src/eu/kanade/tachiyomi/extension/es/housemangas/HouseMangas.kt
index 078fae945..2332724e0 100644
--- a/src/es/housemangas/src/eu/kanade/tachiyomi/extension/es/housemangas/HouseMangas.kt
+++ b/src/es/housemangas/src/eu/kanade/tachiyomi/extension/es/housemangas/HouseMangas.kt
@@ -1,10 +1,7 @@
 package eu.kanade.tachiyomi.extension.es.housemangas
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -20,42 +17,7 @@ class HouseMangas : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 
     override val mangaDetailsSelectorStatus = "div.post-content_item:contains(Estado) > div.summary-content"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "right")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "default")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
 }
diff --git a/src/es/ikifeng/src/eu/kanade/tachiyomi/extension/es/ikifeng/Ikifeng.kt b/src/es/ikifeng/src/eu/kanade/tachiyomi/extension/es/ikifeng/Ikifeng.kt
index 77415b0ff..b257ef1a7 100644
--- a/src/es/ikifeng/src/eu/kanade/tachiyomi/extension/es/ikifeng/Ikifeng.kt
+++ b/src/es/ikifeng/src/eu/kanade/tachiyomi/extension/es/ikifeng/Ikifeng.kt
@@ -12,8 +12,6 @@ class Ikifeng : Madara("Lector Online", "https://lectorunm.life", "es", SimpleDa
 
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun chapterListParse(response: Response): List<SChapter> {
         return super.chapterListParse(response).reversed()
     }
diff --git a/src/es/kenhuascan/src/eu/kanade/tachiyomi/extension/es/kenhuascan/KenhuaScan.kt b/src/es/kenhuascan/src/eu/kanade/tachiyomi/extension/es/kenhuascan/KenhuaScan.kt
index e16f7c6ad..2297f0b5d 100644
--- a/src/es/kenhuascan/src/eu/kanade/tachiyomi/extension/es/kenhuascan/KenhuaScan.kt
+++ b/src/es/kenhuascan/src/eu/kanade/tachiyomi/extension/es/kenhuascan/KenhuaScan.kt
@@ -1,11 +1,8 @@
 package eu.kanade.tachiyomi.extension.es.kenhuascan
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -21,40 +18,5 @@ class KenhuaScan : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/es/lectormangalat/src/eu/kanade/tachiyomi/extension/es/lectormangalat/LectorMangaLat.kt b/src/es/lectormangalat/src/eu/kanade/tachiyomi/extension/es/lectormangalat/LectorMangaLat.kt
index c8f28f285..fe553d332 100644
--- a/src/es/lectormangalat/src/eu/kanade/tachiyomi/extension/es/lectormangalat/LectorMangaLat.kt
+++ b/src/es/lectormangalat/src/eu/kanade/tachiyomi/extension/es/lectormangalat/LectorMangaLat.kt
@@ -1,11 +1,8 @@
 package eu.kanade.tachiyomi.extension.es.lectormangalat
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -24,41 +21,5 @@ class LectorMangaLat : Madara(
 
     override val useNewChapterEndpoint = true
 
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
-
     override val pageListParseSelector = "div.reading-content div.page-break > img"
 }
diff --git a/src/es/legendsnofansub/src/eu/kanade/tachiyomi/extension/es/legendsnofansub/LegendsNoFansub.kt b/src/es/legendsnofansub/src/eu/kanade/tachiyomi/extension/es/legendsnofansub/LegendsNoFansub.kt
index 1076637e6..c1cd31d5c 100644
--- a/src/es/legendsnofansub/src/eu/kanade/tachiyomi/extension/es/legendsnofansub/LegendsNoFansub.kt
+++ b/src/es/legendsnofansub/src/eu/kanade/tachiyomi/extension/es/legendsnofansub/LegendsNoFansub.kt
@@ -1,11 +1,8 @@
 package eu.kanade.tachiyomi.extension.es.legendsnofansub
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
-import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -21,40 +18,5 @@ class LegendsNoFansub : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/es/mangaland/src/eu/kanade/tachiyomi/extension/es/mangaland/Mangaland.kt b/src/es/mangaland/src/eu/kanade/tachiyomi/extension/es/mangaland/Mangaland.kt
index caafbe629..bd743e69a 100644
--- a/src/es/mangaland/src/eu/kanade/tachiyomi/extension/es/mangaland/Mangaland.kt
+++ b/src/es/mangaland/src/eu/kanade/tachiyomi/extension/es/mangaland/Mangaland.kt
@@ -1,10 +1,7 @@
 package eu.kanade.tachiyomi.extension.es.mangaland
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -20,42 +17,5 @@ class Mangaland : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[meta_query][0][0][key]", "_wp_manga_chapter_type")
-            add("vars[meta_query][0][0][value]", "manga")
-            add("vars[meta_query][0][relation]", "AND")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/es/mangasnosekai/src/eu/kanade/tachiyomi/extension/es/mangasnosekai/MangasNoSekai.kt b/src/es/mangasnosekai/src/eu/kanade/tachiyomi/extension/es/mangasnosekai/MangasNoSekai.kt
index ac0fd0b42..f5404ca4a 100644
--- a/src/es/mangasnosekai/src/eu/kanade/tachiyomi/extension/es/mangasnosekai/MangasNoSekai.kt
+++ b/src/es/mangasnosekai/src/eu/kanade/tachiyomi/extension/es/mangasnosekai/MangasNoSekai.kt
@@ -37,15 +37,15 @@ class MangasNoSekai : Madara(
         val manga = SManga.create()
 
         with(element) {
-            select(popularMangaUrlSelector).first()?.let {
+            selectFirst(popularMangaUrlSelector)!!.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
             }
 
-            select("figcaption").first()?.let {
+            selectFirst("figcaption")!!.let {
                 manga.title = it.text()
             }
 
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
         }
@@ -53,10 +53,6 @@ class MangasNoSekai : Madara(
         return manga
     }
 
-    override fun searchPage(page: Int): String {
-        return if (page > 1) "page/$page/" else ""
-    }
-
     override fun searchMangaNextPageSelector() = "nav.navigation a.next"
 
     override val mangaDetailsSelectorTitle = "div.thumble-container p.titleMangaSingle"
@@ -121,14 +117,14 @@ class MangasNoSekai : Madara(
         return manga
     }
 
-    override val orderByFilterOptionsValues: Array<String> = arrayOf(
-        "",
-        "latest2",
-        "alphabet",
-        "rating",
-        "trending",
-        "views2",
-        "new-manga",
+    override val orderByFilterOptions: Map<String, String> = mapOf(
+        intl["order_by_filter_relevance"] to "",
+        intl["order_by_filter_latest"] to "latest2",
+        intl["order_by_filter_az"] to "alphabet",
+        intl["order_by_filter_rating"] to "rating",
+        intl["order_by_filter_trending"] to "trending",
+        intl["order_by_filter_views"] to "views2",
+        intl["order_by_filter_new"] to "new-manga",
     )
 
     private fun altChapterRequest(mangaId: String, page: Int): Request {
@@ -138,18 +134,13 @@ class MangasNoSekai : Madara(
             .add("page", page.toString())
             .build()
 
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", form.contentLength().toString())
-            .add("Content-Type", form.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
         return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, form)
     }
 
     private val altChapterListSelector = "div.wp-manga-chapter"
     override fun chapterListParse(response: Response): List<SChapter> {
         val document = response.asJsoup()
+        launchIO { countViews(document) }
 
         val mangaUrl = document.location().removeSuffix("/")
 
@@ -171,18 +162,16 @@ class MangasNoSekai : Madara(
                 page++
             } while (xhrDocument.select(altChapterListSelector).isNotEmpty())
 
-            countViews(document)
             return chapterElements.map(::altChapterFromElement)
         }
 
-        countViews(document)
         return chapterElements.map(::chapterFromElement)
     }
 
     private fun altChapterFromElement(element: Element) = SChapter.create().apply {
         setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href"))
         name = element.select("div.text-sm").text()
-        date_upload = element.select("time").firstOrNull()?.text()?.let {
+        date_upload = element.selectFirst("time")?.text()?.let {
             parseChapterDate(it)
         } ?: 0
     }
diff --git a/src/es/manhwalatino/src/eu/kanade/tachiyomi/extension/es/manhwalatino/ManhwaLatino.kt b/src/es/manhwalatino/src/eu/kanade/tachiyomi/extension/es/manhwalatino/ManhwaLatino.kt
index 89924f572..0df63d345 100644
--- a/src/es/manhwalatino/src/eu/kanade/tachiyomi/extension/es/manhwalatino/ManhwaLatino.kt
+++ b/src/es/manhwalatino/src/eu/kanade/tachiyomi/extension/es/manhwalatino/ManhwaLatino.kt
@@ -47,16 +47,16 @@ class ManhwaLatino : Madara(
         val chapter = SChapter.create()
 
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)!!.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
                 chapter.name = urlElement.wholeText().substringAfter("\n")
             }
 
-            chapter.date_upload = select("img:not(.thumb)").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) }
-                ?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) }
-                ?: parseChapterDate(select(chapterDateSelector()).firstOrNull()?.text())
+            chapter.date_upload = selectFirst("img:not(.thumb)")?.attr("alt")?.let { parseRelativeDate(it) }
+                ?: selectFirst("span a")?.attr("title")?.let { parseRelativeDate(it) }
+                ?: parseChapterDate(selectFirst(chapterDateSelector())?.text())
         }
 
         return chapter
diff --git a/src/es/mhscans/src/eu/kanade/tachiyomi/extension/es/mhscans/MHScans.kt b/src/es/mhscans/src/eu/kanade/tachiyomi/extension/es/mhscans/MHScans.kt
index 1f1a4be99..6be6f49a7 100644
--- a/src/es/mhscans/src/eu/kanade/tachiyomi/extension/es/mhscans/MHScans.kt
+++ b/src/es/mhscans/src/eu/kanade/tachiyomi/extension/es/mhscans/MHScans.kt
@@ -1,11 +1,8 @@
 package eu.kanade.tachiyomi.extension.es.mhscans
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -21,40 +18,5 @@ class MHScans : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/es/nekoscans/src/eu/kanade/tachiyomi/extension/es/nekoscans/NekoScans.kt b/src/es/nekoscans/src/eu/kanade/tachiyomi/extension/es/nekoscans/NekoScans.kt
index 3162add58..8e6ea4eb4 100644
--- a/src/es/nekoscans/src/eu/kanade/tachiyomi/extension/es/nekoscans/NekoScans.kt
+++ b/src/es/nekoscans/src/eu/kanade/tachiyomi/extension/es/nekoscans/NekoScans.kt
@@ -7,7 +7,6 @@ import eu.kanade.tachiyomi.source.model.Page
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
 import org.jsoup.nodes.Document
-import java.lang.IllegalArgumentException
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
diff --git a/src/es/noblessetranslations/src/eu/kanade/tachiyomi/extension/es/noblessetranslations/NoblesseTranslations.kt b/src/es/noblessetranslations/src/eu/kanade/tachiyomi/extension/es/noblessetranslations/NoblesseTranslations.kt
index db09730b7..d01965337 100644
--- a/src/es/noblessetranslations/src/eu/kanade/tachiyomi/extension/es/noblessetranslations/NoblesseTranslations.kt
+++ b/src/es/noblessetranslations/src/eu/kanade/tachiyomi/extension/es/noblessetranslations/NoblesseTranslations.kt
@@ -1,9 +1,6 @@
 package eu.kanade.tachiyomi.extension.es.noblessetranslations
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.FormBody
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -14,45 +11,10 @@ class NoblesseTranslations : Madara(
     dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale("es")),
 ) {
     override val useNewChapterEndpoint = true
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
     override val mangaSubString = "manga"
 
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
     override val mangaDetailsSelectorDescription = "div.summary_content > div.post-content div.manga-summary"
     override val mangaDetailsSelectorStatus = "div.summary_content > div.post-content div.post-content_item:has(div.summary-heading:contains(Status)) div.summary-content"
     override val mangaDetailsSelectorTag = "div.tags-content a.notUsed" // Site uses this for the scanlator
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "full")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
 }
diff --git a/src/es/ragnarokscan/src/eu/kanade/tachiyomi/extension/es/ragnarokscan/RagnarokScan.kt b/src/es/ragnarokscan/src/eu/kanade/tachiyomi/extension/es/ragnarokscan/RagnarokScan.kt
index 8ffac26c9..b5ac3d986 100644
--- a/src/es/ragnarokscan/src/eu/kanade/tachiyomi/extension/es/ragnarokscan/RagnarokScan.kt
+++ b/src/es/ragnarokscan/src/eu/kanade/tachiyomi/extension/es/ragnarokscan/RagnarokScan.kt
@@ -30,12 +30,12 @@ class RagnarokScan : Madara(
         val manga = SManga.create()
 
         with(element) {
-            select(popularMangaUrlSelector).first()?.let {
+            selectFirst(popularMangaUrlSelector)!!.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
                 manga.title = it.attr("title")
             }
 
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
         }
@@ -47,7 +47,7 @@ class RagnarokScan : Madara(
         val chapter = SChapter.create()
 
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)!!.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
diff --git a/src/es/richtoscan/src/eu/kanade/tachiyomi/extension/es/richtoscan/RichtoScan.kt b/src/es/richtoscan/src/eu/kanade/tachiyomi/extension/es/richtoscan/RichtoScan.kt
index 904d2f9a4..6c812c041 100644
--- a/src/es/richtoscan/src/eu/kanade/tachiyomi/extension/es/richtoscan/RichtoScan.kt
+++ b/src/es/richtoscan/src/eu/kanade/tachiyomi/extension/es/richtoscan/RichtoScan.kt
@@ -1,10 +1,7 @@
 package eu.kanade.tachiyomi.extension.es.richtoscan
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -20,40 +17,5 @@ class RichtoScan : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "right")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "default")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/es/taurusfansub/src/eu/kanade/tachiyomi/extension/es/taurusfansub/TaurusFansub.kt b/src/es/taurusfansub/src/eu/kanade/tachiyomi/extension/es/taurusfansub/TaurusFansub.kt
index aeb7b6928..623c238ab 100644
--- a/src/es/taurusfansub/src/eu/kanade/tachiyomi/extension/es/taurusfansub/TaurusFansub.kt
+++ b/src/es/taurusfansub/src/eu/kanade/tachiyomi/extension/es/taurusfansub/TaurusFansub.kt
@@ -1,10 +1,7 @@
 package eu.kanade.tachiyomi.extension.es.taurusfansub
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -20,41 +17,7 @@ class TaurusFansub : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 
-    override fun popularMangaNextPageSelector() = "body:not(:has(.no-posts))"
     override val mangaDetailsSelectorDescription = "div.tab-summary > div.tab-content > div#tab-reducir > div.contenedor"
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "right")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "OR")
-            add("vars[manga_archives_item_layout]", "big_thumbnail")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
 }
diff --git a/src/fr/mangahubfr/src/eu/kanade/tachiyomi/extension/fr/mangahubfr/MangaHubFr.kt b/src/fr/mangahubfr/src/eu/kanade/tachiyomi/extension/fr/mangahubfr/MangaHubFr.kt
index 2794d135b..86843791e 100644
--- a/src/fr/mangahubfr/src/eu/kanade/tachiyomi/extension/fr/mangahubfr/MangaHubFr.kt
+++ b/src/fr/mangahubfr/src/eu/kanade/tachiyomi/extension/fr/mangahubfr/MangaHubFr.kt
@@ -13,7 +13,7 @@ class MangaHubFr : Madara("MangaHub.fr", "https://mangahub.fr", "fr", dateFormat
     override val chapterUrlSuffix = ""
 
     override fun pageListParse(document: Document): List<Page> {
-        countViews(document)
+        launchIO { countViews(document) }
 
         return document.select(pageListParseSelector)
             .mapIndexed { index, element ->
diff --git a/src/fr/readergen/src/eu/kanade/tachiyomi/extension/fr/readergen/ReaderGen.kt b/src/fr/readergen/src/eu/kanade/tachiyomi/extension/fr/readergen/ReaderGen.kt
index 4127e93bf..3f97d7289 100644
--- a/src/fr/readergen/src/eu/kanade/tachiyomi/extension/fr/readergen/ReaderGen.kt
+++ b/src/fr/readergen/src/eu/kanade/tachiyomi/extension/fr/readergen/ReaderGen.kt
@@ -1,11 +1,7 @@
 package eu.kanade.tachiyomi.extension.fr.readergen
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Request
 
 class ReaderGen : Madara("ReaderGen", "https://fr.readergen.fr", "fr") {
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/page/$page/?s&post_type=wp-manga&m_orderby=views", headers)
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page/?s&post_type=wp-manga&m_orderby=latest", headers)
-    override fun popularMangaSelector() = searchMangaSelector()
+    override val useNewChapterEndpoint = true
 }
diff --git a/src/id/birdtoon/src/eu/kanade/tachiyomi/extension/id/birdtoon/BirdToon.kt b/src/id/birdtoon/src/eu/kanade/tachiyomi/extension/id/birdtoon/BirdToon.kt
index 59cb32059..e4f9afe76 100644
--- a/src/id/birdtoon/src/eu/kanade/tachiyomi/extension/id/birdtoon/BirdToon.kt
+++ b/src/id/birdtoon/src/eu/kanade/tachiyomi/extension/id/birdtoon/BirdToon.kt
@@ -4,12 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class BirdToon : Madara("BirdToon", "https://birdtoon.net", "id") {
     override val mangaSubString = "komik"
-
-    override fun searchPage(page: Int): String {
-        return if (page > 1) {
-            "page/$page/"
-        } else {
-            ""
-        }
-    }
 }
diff --git a/src/id/komikgue/src/eu/kanade/tachiyomi/extension/id/komikgue/KomikGue.kt b/src/id/komikgue/src/eu/kanade/tachiyomi/extension/id/komikgue/KomikGue.kt
index d067b98c4..eb93a567c 100644
--- a/src/id/komikgue/src/eu/kanade/tachiyomi/extension/id/komikgue/KomikGue.kt
+++ b/src/id/komikgue/src/eu/kanade/tachiyomi/extension/id/komikgue/KomikGue.kt
@@ -11,6 +11,4 @@ class KomikGue : Madara(
     dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("id")),
 ) {
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/id/mgkomik/src/eu/kanade/tachiyomi/extension/id/mgkomik/MGKomik.kt b/src/id/mgkomik/src/eu/kanade/tachiyomi/extension/id/mgkomik/MGKomik.kt
index 5d420749f..c768ee2fe 100644
--- a/src/id/mgkomik/src/eu/kanade/tachiyomi/extension/id/mgkomik/MGKomik.kt
+++ b/src/id/mgkomik/src/eu/kanade/tachiyomi/extension/id/mgkomik/MGKomik.kt
@@ -8,20 +8,26 @@ import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import okhttp3.Headers
 import okhttp3.Interceptor
-import okhttp3.OkHttpClient
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 
-class MGKomik : Madara("MG Komik", "https://mgkomik.id", "id", SimpleDateFormat("dd MMM yy", Locale.US)) {
+class MGKomik :
+    Madara(
+        "MG Komik",
+        "https://mgkomik.id",
+        "id",
+        SimpleDateFormat("dd MMM yy", Locale.US),
+    ),
+    ConfigurableSource {
 
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
@@ -47,12 +53,12 @@ class MGKomik : Madara("MG Komik", "https://mgkomik.id", "id", SimpleDateFormat(
 
                         var listUserAgentString = parseTachiUa.desktop + parseTachiUa.mobile
 
-                        listUserAgentString = listUserAgentString!!.filter {
+                        listUserAgentString = listUserAgentString.filter {
                             listOf("windows", "android").any { filter ->
                                 it.contains(filter, ignoreCase = true)
                             }
                         }
-                        userAgent = listUserAgentString!!.random()
+                        userAgent = listUserAgentString.random()
                         checkedUa = true
                     }
                     uaResponse.close()
@@ -87,11 +93,8 @@ class MGKomik : Madara("MG Komik", "https://mgkomik.id", "id", SimpleDateFormat(
         val mobile: List<String> = emptyList(),
     )
 
-    // disable random ua in ext setting from multisrc (.setRandomUserAgent)
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(uaIntercept)
-        .connectTimeout(10, TimeUnit.SECONDS)
-        .readTimeout(30, TimeUnit.SECONDS)
         .build()
 
     override fun headersBuilder(): Headers.Builder {
@@ -107,7 +110,6 @@ class MGKomik : Madara("MG Komik", "https://mgkomik.id", "id", SimpleDateFormat(
 
         return builder
     }
-    override fun searchPage(page: Int): String = if (page > 1) "page/$page/" else ""
 
     override val mangaSubString = "komik"
 
@@ -115,16 +117,15 @@ class MGKomik : Madara("MG Komik", "https://mgkomik.id", "id", SimpleDateFormat(
 
     override val chapterUrlSuffix = ""
 
-    // remove random ua in setting ext from multisrc and use custom one
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val prefCustomUserAgent = EditTextPreference(screen.context).apply {
+        EditTextPreference(screen.context).apply {
             key = PREF_KEY_CUSTOM_UA
             title = TITLE_CUSTOM_UA
             summary = (preferences.getString(PREF_KEY_CUSTOM_UA, "")!!.trim() + SUMMARY_STRING_CUSTOM_UA).trim()
             setOnPreferenceChangeListener { _, newValue ->
                 val customUa = newValue as String
                 preferences.edit().putString(PREF_KEY_CUSTOM_UA, customUa).apply()
-                if (customUa.isNullOrBlank()) {
+                if (customUa.isBlank()) {
                     Toast.makeText(screen.context, RESTART_APP_STRING, Toast.LENGTH_LONG).show()
                 } else {
                     userAgent = null
@@ -133,8 +134,7 @@ class MGKomik : Madara("MG Komik", "https://mgkomik.id", "id", SimpleDateFormat(
 
                 true
             }
-        }
-        screen.addPreference(prefCustomUserAgent)
+        }.also(screen::addPreference)
     }
 
     companion object {
diff --git a/src/id/shinigami/src/eu/kanade/tachiyomi/extension/id/shinigami/Shinigami.kt b/src/id/shinigami/src/eu/kanade/tachiyomi/extension/id/shinigami/Shinigami.kt
index a9aa81c11..e5cef7712 100644
--- a/src/id/shinigami/src/eu/kanade/tachiyomi/extension/id/shinigami/Shinigami.kt
+++ b/src/id/shinigami/src/eu/kanade/tachiyomi/extension/id/shinigami/Shinigami.kt
@@ -9,10 +9,8 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
-import okhttp3.OkHttpClient
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import java.util.concurrent.TimeUnit
 
 class Shinigami : Madara("Shinigami", "https://shinigamitoon.com", "id") {
     // moved from Reaper Scans (id) to Shinigami (id)
@@ -20,8 +18,6 @@ class Shinigami : Madara("Shinigami", "https://shinigamitoon.com", "id") {
 
     override val useNewChapterEndpoint = false
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun headersBuilder() = super.headersBuilder().apply {
         add("Sec-Fetch-Dest", "document")
         add("Sec-Fetch-Mode", "navigate")
@@ -30,7 +26,7 @@ class Shinigami : Madara("Shinigami", "https://shinigamitoon.com", "id") {
         add("X-Requested-With", randomString((1..20).random())) // added for webview, and removed in interceptor for normal use
     }
 
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor { chain ->
             val request = chain.request()
             val headers = request.headers.newBuilder().apply {
@@ -39,8 +35,6 @@ class Shinigami : Madara("Shinigami", "https://shinigamitoon.com", "id") {
 
             chain.proceed(request.newBuilder().headers(headers).build())
         }
-        .connectTimeout(10, TimeUnit.SECONDS)
-        .readTimeout(30, TimeUnit.SECONDS)
         .rateLimit(3)
         .build()
 
@@ -87,7 +81,7 @@ class Shinigami : Madara("Shinigami", "https://shinigamitoon.com", "id") {
         val salt = chapterData.s.decodeHex()
 
         val unsaltedCiphertext = Base64.decode(chapterData.ct, Base64.DEFAULT)
-        val ciphertext = SALTED + salt + unsaltedCiphertext
+        val ciphertext = salted + salt + unsaltedCiphertext
 
         val decrypted = CryptoAES.decrypt(Base64.encodeToString(ciphertext, Base64.DEFAULT), key)
         val data = json.decodeFromString<List<String>>(decrypted)
@@ -96,15 +90,6 @@ class Shinigami : Madara("Shinigami", "https://shinigamitoon.com", "id") {
         }
     }
 
-    // https://stackoverflow.com/a/66614516
-    private fun String.decodeHex(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-            .toByteArray()
-    }
-
     private fun randomString(length: Int): String {
         val charPool = ('a'..'z') + ('A'..'Z')
         return List(length) { charPool.random() }.joinToString("")
diff --git a/src/id/worldmanhwas/src/eu/kanade/tachiyomi/extension/id/worldmanhwas/WorldManhwas.kt b/src/id/worldmanhwas/src/eu/kanade/tachiyomi/extension/id/worldmanhwas/WorldManhwas.kt
index 27c015977..1dcf26a2a 100644
--- a/src/id/worldmanhwas/src/eu/kanade/tachiyomi/extension/id/worldmanhwas/WorldManhwas.kt
+++ b/src/id/worldmanhwas/src/eu/kanade/tachiyomi/extension/id/worldmanhwas/WorldManhwas.kt
@@ -6,6 +6,4 @@ import java.util.Locale
 
 class WorldManhwas : Madara("WorldManhwas", "https://worldmanhwas.zone", "id", SimpleDateFormat("MMMM dd, yyyy", Locale("id"))) {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/pt/burningscans/src/eu/kanade/tachiyomi/extension/pt/burningscans/BurningScans.kt b/src/pt/burningscans/src/eu/kanade/tachiyomi/extension/pt/burningscans/BurningScans.kt
index 2e08eaf7c..452f74711 100644
--- a/src/pt/burningscans/src/eu/kanade/tachiyomi/extension/pt/burningscans/BurningScans.kt
+++ b/src/pt/burningscans/src/eu/kanade/tachiyomi/extension/pt/burningscans/BurningScans.kt
@@ -19,8 +19,6 @@ class BurningScans : Madara(
 
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun genresRequest(): Request {
         return GET("$baseUrl/?s=&post_type=wp-manga", headers)
     }
diff --git a/src/pt/gekkouscan/src/eu/kanade/tachiyomi/extension/pt/gekkouscan/GekkouScans.kt b/src/pt/gekkouscan/src/eu/kanade/tachiyomi/extension/pt/gekkouscan/GekkouScans.kt
index 7da5da32f..8695f53ab 100644
--- a/src/pt/gekkouscan/src/eu/kanade/tachiyomi/extension/pt/gekkouscan/GekkouScans.kt
+++ b/src/pt/gekkouscan/src/eu/kanade/tachiyomi/extension/pt/gekkouscan/GekkouScans.kt
@@ -29,6 +29,4 @@ class GekkouScans : Madara(
     override val mangaDetailsSelectorTitle = "#manga-title"
 
     override val mangaDetailsSelectorStatus = ".summary-heading:contains(Status) ~ .summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/pt/huntersscans/src/eu/kanade/tachiyomi/extension/pt/huntersscans/HuntersScans.kt b/src/pt/huntersscans/src/eu/kanade/tachiyomi/extension/pt/huntersscans/HuntersScans.kt
index ce171501b..a787b0da5 100644
--- a/src/pt/huntersscans/src/eu/kanade/tachiyomi/extension/pt/huntersscans/HuntersScans.kt
+++ b/src/pt/huntersscans/src/eu/kanade/tachiyomi/extension/pt/huntersscans/HuntersScans.kt
@@ -1,11 +1,8 @@
 package eu.kanade.tachiyomi.extension.pt.huntersscans
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import okhttp3.FormBody
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -22,38 +19,5 @@ class HuntersScans : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    private fun loadMoreRequest(page: Int, metaKey: String): Request {
-        val formBody = FormBody.Builder().apply {
-            add("action", "madara_load_more")
-            add("page", page.toString())
-            add("template", "madara-core/content/content-archive")
-            add("vars[paged]", "1")
-            add("vars[orderby]", "meta_value_num")
-            add("vars[template]", "archive")
-            add("vars[sidebar]", "right")
-            add("vars[post_type]", "wp-manga")
-            add("vars[post_status]", "publish")
-            add("vars[meta_key]", metaKey)
-            add("vars[order]", "desc")
-            add("vars[meta_query][relation]", "AND")
-            add("vars[manga_archives_item_layout]", "default")
-        }.build()
-
-        val xhrHeaders = headersBuilder()
-            .add("Content-Length", formBody.contentLength().toString())
-            .add("Content-Type", formBody.contentType().toString())
-            .add("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, formBody)
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_wp_manga_views")
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return loadMoreRequest(page - 1, "_latest_update")
-    }
+    override val useLoadMoreRequest = LoadMoreStrategy.Always
 }
diff --git a/src/pt/ninjascan/src/eu/kanade/tachiyomi/extension/pt/ninjascan/NinjaScan.kt b/src/pt/ninjascan/src/eu/kanade/tachiyomi/extension/pt/ninjascan/NinjaScan.kt
index 4eff4c376..ace45916e 100644
--- a/src/pt/ninjascan/src/eu/kanade/tachiyomi/extension/pt/ninjascan/NinjaScan.kt
+++ b/src/pt/ninjascan/src/eu/kanade/tachiyomi/extension/pt/ninjascan/NinjaScan.kt
@@ -16,6 +16,4 @@ class NinjaScan : Madara(
         .build()
 
     override val useNewChapterEndpoint = true
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/ru/mangamammy/src/eu/kanade/tachiyomi/extension/ru/mangamammy/MangaMammy.kt b/src/ru/mangamammy/src/eu/kanade/tachiyomi/extension/ru/mangamammy/MangaMammy.kt
index a477f0846..87ed781a5 100644
--- a/src/ru/mangamammy/src/eu/kanade/tachiyomi/extension/ru/mangamammy/MangaMammy.kt
+++ b/src/ru/mangamammy/src/eu/kanade/tachiyomi/extension/ru/mangamammy/MangaMammy.kt
@@ -14,8 +14,6 @@ class MangaMammy : Madara(
 ) {
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun popularMangaSelector() = searchMangaSelector()
 
     override fun popularMangaRequest(page: Int): Request =
diff --git a/src/th/cattranslator/src/eu/kanade/tachiyomi/extension/th/cattranslator/CatTranslator.kt b/src/th/cattranslator/src/eu/kanade/tachiyomi/extension/th/cattranslator/CatTranslator.kt
index 02547066c..747408ea9 100644
--- a/src/th/cattranslator/src/eu/kanade/tachiyomi/extension/th/cattranslator/CatTranslator.kt
+++ b/src/th/cattranslator/src/eu/kanade/tachiyomi/extension/th/cattranslator/CatTranslator.kt
@@ -13,13 +13,13 @@ class CatTranslator : Madara(
         val manga = SManga.create()
 
         with(element) {
-            select(if (isSearch) "div.post-title a" else popularMangaUrlSelector).first()?.let {
+            selectFirst(if (isSearch) "div.post-title a" else popularMangaUrlSelector)!!.let {
                 manga.setUrlWithoutDomain(it.attr("abs:href"))
                 manga.url = manga.url.removePrefix("/manga")
                 manga.title = it.ownText()
             }
 
-            select("img").first()?.let {
+            selectFirst("img")?.let {
                 manga.thumbnail_url = imageFromElement(it)
             }
         }
diff --git a/src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/Doodmanga.kt b/src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/Doodmanga.kt
index 682f5c672..40578cfb0 100644
--- a/src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/Doodmanga.kt
+++ b/src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/Doodmanga.kt
@@ -17,7 +17,7 @@ class Doodmanga : Madara("Doodmanga", "https://www.doodmanga.com", "th", SimpleD
 
     override val pageListParseSelector = "div.text-center > p > img, div.text-center > img, div.text-center > script"
     override fun pageListParse(document: Document): List<Page> {
-        super.countViews(document)
+        launchIO { countViews(document) }
 
         return document.select(pageListParseSelector).mapIndexedNotNull { index, element ->
             val src = when (element.tagName()) {
diff --git a/src/th/kingsmanga/src/eu/kanade/tachiyomi/extension/th/kingsmanga/KingsManga.kt b/src/th/kingsmanga/src/eu/kanade/tachiyomi/extension/th/kingsmanga/KingsManga.kt
index adf99355d..a1df2a588 100644
--- a/src/th/kingsmanga/src/eu/kanade/tachiyomi/extension/th/kingsmanga/KingsManga.kt
+++ b/src/th/kingsmanga/src/eu/kanade/tachiyomi/extension/th/kingsmanga/KingsManga.kt
@@ -11,6 +11,4 @@ class KingsManga : Madara(
     dateFormat = SimpleDateFormat("d MMMM yyyy", Locale("th")),
 ) {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/th/mangadeemak/src/eu/kanade/tachiyomi/extension/th/mangadeemak/MangaDeemak.kt b/src/th/mangadeemak/src/eu/kanade/tachiyomi/extension/th/mangadeemak/MangaDeemak.kt
index 15974a6dc..0529bc6d0 100644
--- a/src/th/mangadeemak/src/eu/kanade/tachiyomi/extension/th/mangadeemak/MangaDeemak.kt
+++ b/src/th/mangadeemak/src/eu/kanade/tachiyomi/extension/th/mangadeemak/MangaDeemak.kt
@@ -7,11 +7,7 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 
 class MangaDeemak : Madara("MangaDeemak", "https://mangadeemak.com", "th", SimpleDateFormat("d MMMM yyyy", Locale("th"))) {
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/manga/page/$page/?m_orderby=trending", headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET("$baseUrl/manga/page/$page/", headers)
+    override fun genresRequest(): Request {
+        return GET("$baseUrl/?s=&post_type=wp-manga", headers)
     }
 }
diff --git a/src/th/nekopostco/src/eu/kanade/tachiyomi/extension/th/nekopostco/NekoPostCo.kt b/src/th/nekopostco/src/eu/kanade/tachiyomi/extension/th/nekopostco/NekoPostCo.kt
index e6f41d554..dc5e0a330 100644
--- a/src/th/nekopostco/src/eu/kanade/tachiyomi/extension/th/nekopostco/NekoPostCo.kt
+++ b/src/th/nekopostco/src/eu/kanade/tachiyomi/extension/th/nekopostco/NekoPostCo.kt
@@ -11,6 +11,4 @@ class NekoPostCo : Madara(
     dateFormat = SimpleDateFormat("d MMMM yyyy", Locale("th")),
 ) {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/tr/evascans/src/eu/kanade/tachiyomi/extension/tr/evascans/EvaScans.kt b/src/tr/evascans/src/eu/kanade/tachiyomi/extension/tr/evascans/EvaScans.kt
index 6e5356739..5d4c34a29 100644
--- a/src/tr/evascans/src/eu/kanade/tachiyomi/extension/tr/evascans/EvaScans.kt
+++ b/src/tr/evascans/src/eu/kanade/tachiyomi/extension/tr/evascans/EvaScans.kt
@@ -16,8 +16,6 @@ class EvaScans : Madara(
 
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     override fun pageListParse(document: Document): List<Page> {
         val pageList = super.pageListParse(document)
 
diff --git a/src/tr/hattorimanga/src/eu/kanade/tachiyomi/extension/tr/hattorimanga/HattoriManga.kt b/src/tr/hattorimanga/src/eu/kanade/tachiyomi/extension/tr/hattorimanga/HattoriManga.kt
index d59f0f2f4..b82fe12a3 100644
--- a/src/tr/hattorimanga/src/eu/kanade/tachiyomi/extension/tr/hattorimanga/HattoriManga.kt
+++ b/src/tr/hattorimanga/src/eu/kanade/tachiyomi/extension/tr/hattorimanga/HattoriManga.kt
@@ -13,7 +13,7 @@ class HattoriManga : Madara(
     SimpleDateFormat("d MMM yyy", Locale("tr")),
 ) {
     override fun pageListParse(document: Document): List<Page> {
-        val blocked = document.select(".content-blocked").first()
+        val blocked = document.selectFirst(".content-blocked")
         if (blocked != null) {
             throw Exception(blocked.text()) // Bu bölümü okumak için Üye olmanız gerekiyor.
         }
diff --git a/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt b/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt
index 4b50ae3ad..f791060bb 100644
--- a/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt
+++ b/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt
@@ -20,6 +20,4 @@ class Jiangzaitoon : Madara(
             .readTimeout(3, TimeUnit.MINUTES) // aka shit source
             .build()
     }
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/tr/mangagezgini/src/eu/kanade/tachiyomi/extension/tr/mangagezgini/MangaGezgini.kt b/src/tr/mangagezgini/src/eu/kanade/tachiyomi/extension/tr/mangagezgini/MangaGezgini.kt
index bbfc86d4b..f5b9a74eb 100644
--- a/src/tr/mangagezgini/src/eu/kanade/tachiyomi/extension/tr/mangagezgini/MangaGezgini.kt
+++ b/src/tr/mangagezgini/src/eu/kanade/tachiyomi/extension/tr/mangagezgini/MangaGezgini.kt
@@ -15,15 +15,15 @@ class MangaGezgini : Madara(
     override fun chapterFromElement(element: Element): SChapter {
         val chapter = SChapter.create()
         with(element) {
-            select(chapterUrlSelector).first()?.let { urlElement ->
+            selectFirst(chapterUrlSelector)!!.let { urlElement ->
                 chapter.url = urlElement.attr("abs:href").let {
                     it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else ""
                 }
                 chapter.name = element.select("li.wp-manga-chapter.has-thumb a").text()
             }
-            chapter.date_upload = select("img:not(.thumb)").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) }
-                ?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) }
-                ?: parseChapterDate(select(chapterDateSelector()).firstOrNull()?.text())
+            chapter.date_upload = selectFirst("img:not(.thumb)")?.attr("alt")?.let { parseRelativeDate(it) }
+                ?: selectFirst("span a")?.attr("title")?.let { parseRelativeDate(it) }
+                ?: parseChapterDate(selectFirst(chapterDateSelector())?.text())
         }
         return chapter
     }
diff --git a/src/tr/mangasehri/src/eu/kanade/tachiyomi/extension/tr/mangasehri/MangaSehri.kt b/src/tr/mangasehri/src/eu/kanade/tachiyomi/extension/tr/mangasehri/MangaSehri.kt
index e5d8ffde7..0729dfdea 100644
--- a/src/tr/mangasehri/src/eu/kanade/tachiyomi/extension/tr/mangasehri/MangaSehri.kt
+++ b/src/tr/mangasehri/src/eu/kanade/tachiyomi/extension/tr/mangasehri/MangaSehri.kt
@@ -11,6 +11,4 @@ class MangaSehri : Madara(
     SimpleDateFormat("dd/MM/yyy", Locale("tr")),
 ) {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/tr/siyahmelek/src/eu/kanade/tachiyomi/extension/tr/siyahmelek/Siyahmelek.kt b/src/tr/siyahmelek/src/eu/kanade/tachiyomi/extension/tr/siyahmelek/Siyahmelek.kt
index 4cc1cb2e7..1024244ed 100644
--- a/src/tr/siyahmelek/src/eu/kanade/tachiyomi/extension/tr/siyahmelek/Siyahmelek.kt
+++ b/src/tr/siyahmelek/src/eu/kanade/tachiyomi/extension/tr/siyahmelek/Siyahmelek.kt
@@ -15,8 +15,6 @@ class Siyahmelek : Madara("Gri Melek", "https://grimelek.net", "tr", SimpleDateF
 
     override val useNewChapterEndpoint = true
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     // Skip fake image
     // OK: <div class="page-break no-gaps">
     // NG: <div style="display:none" class="page-break no-gaps">
diff --git a/src/tr/tonizutoon/src/eu/kanade/tachiyomi/extension/tr/tonizutoon/TonizuToon.kt b/src/tr/tonizutoon/src/eu/kanade/tachiyomi/extension/tr/tonizutoon/TonizuToon.kt
index f3936f5d4..c0ab0a98d 100644
--- a/src/tr/tonizutoon/src/eu/kanade/tachiyomi/extension/tr/tonizutoon/TonizuToon.kt
+++ b/src/tr/tonizutoon/src/eu/kanade/tachiyomi/extension/tr/tonizutoon/TonizuToon.kt
@@ -17,6 +17,4 @@ class TonizuToon : Madara(
     override val mangaDetailsSelectorAuthor = ".summary-heading:contains(Yazar) ~ .summary-content"
 
     override val mangaDetailsSelectorStatus = ".summary-heading:contains(Durumu) ~ .summary-content"
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }
diff --git a/src/tr/webtoonhatti/src/eu/kanade/tachiyomi/extension/tr/webtoonhatti/WebtoonHatti.kt b/src/tr/webtoonhatti/src/eu/kanade/tachiyomi/extension/tr/webtoonhatti/WebtoonHatti.kt
index fffbc6726..897497c88 100644
--- a/src/tr/webtoonhatti/src/eu/kanade/tachiyomi/extension/tr/webtoonhatti/WebtoonHatti.kt
+++ b/src/tr/webtoonhatti/src/eu/kanade/tachiyomi/extension/tr/webtoonhatti/WebtoonHatti.kt
@@ -12,8 +12,6 @@ class WebtoonHatti : Madara(
 ) {
     override val useNewChapterEndpoint = false
 
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
-
     // Skip fake image
     // OK: <div class="page-break no-gaps">
     // NG: <div style="display:none" class="page-break no-gaps">
diff --git a/src/tr/webtoontr/src/eu/kanade/tachiyomi/extension/tr/webtoontr/WebtoonTR.kt b/src/tr/webtoontr/src/eu/kanade/tachiyomi/extension/tr/webtoontr/WebtoonTR.kt
index 507a5d2f6..524518647 100644
--- a/src/tr/webtoontr/src/eu/kanade/tachiyomi/extension/tr/webtoontr/WebtoonTR.kt
+++ b/src/tr/webtoontr/src/eu/kanade/tachiyomi/extension/tr/webtoontr/WebtoonTR.kt
@@ -11,6 +11,4 @@ class WebtoonTR : Madara(
     SimpleDateFormat("dd/MM/yyy", Locale("tr")),
 ) {
     override val useNewChapterEndpoint = false
-
-    override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/"
 }