diff --git a/multisrc/overrides/madara/bananamecanica/src/BananaCritica.kt b/multisrc/overrides/madara/bananamecanica/src/BananaCritica.kt
new file mode 100644
index 000000000..e052f0892
--- /dev/null
+++ b/multisrc/overrides/madara/bananamecanica/src/BananaCritica.kt
@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.extension.pt.bananamecanica
+
+import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import okhttp3.OkHttpClient
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class BananaCritica : Madara(
+    "Banana Crítica",
+    "https://cillylovers.com",
+    "pt-BR",
+    SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR"))
+) {
+
+    override val client: OkHttpClient = super.client.newBuilder()
+        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .build()
+
+    override val altName: String = "Nome alternativo: "
+
+    override fun popularMangaSelector() = "div.page-item-detail.manga"
+}
diff --git a/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt b/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt
deleted file mode 100644
index 6c35b2128..000000000
--- a/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package eu.kanade.tachiyomi.extension.pt.bananamecanica
-
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
-import eu.kanade.tachiyomi.multisrc.madara.Madara
-import okhttp3.OkHttpClient
-import java.text.SimpleDateFormat
-import java.util.Locale
-import java.util.concurrent.TimeUnit
-
-class BananaMecanica : Madara(
-    "Banana Mecânica",
-    "https://leitorbm.com",
-    "pt-BR",
-    SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR"))
-) {
-
-    override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
-        .build()
-
-    // [...document.querySelectorAll('input[name="genre[]"]')]
-    //   .map(x => `Genre("${document.querySelector('label[for=' + x.id + ']').innerHTML.trim()}", "${x.value}")`)
-    //   .join(',\n')
-    override fun getGenreList(): List<Genre> = listOf(
-        Genre("Ação", "acao"),
-        Genre("Action", "action"),
-        Genre("Adult", "adult"),
-        Genre("Adventure", "adventure"),
-        Genre("Anime", "anime"),
-        Genre("Cartoon", "cartoon"),
-        Genre("Comédia", "comedia"),
-        Genre("Comedy", "comedy"),
-        Genre("Comic", "comic"),
-        Genre("Cooking", "cooking"),
-        Genre("Cotidiano", "cotidiano"),
-        Genre("Detective", "detective"),
-        Genre("Doujinshi", "doujinshi"),
-        Genre("Drama", "drama"),
-        Genre("Ecchi", "ecchi"),
-        Genre("Fantasia", "fantasia"),
-        Genre("Fantasy", "fantasy"),
-        Genre("Gender Bender", "gender-bender"),
-        Genre("Harem", "harem"),
-        Genre("Historical", "historical"),
-        Genre("Horror", "horror"),
-        Genre("Josei", "josei"),
-        Genre("Live action", "live-action"),
-        Genre("M-preg/Omegaverse", "m-preg-omegaverse"),
-        Genre("Manga", "manga"),
-        Genre("Manhua", "manhua"),
-        Genre("Manhwa", "manhwa"),
-        Genre("Martial Arts", "martial-arts"),
-        Genre("Mature", "mature"),
-        Genre("Mecha", "mecha"),
-        Genre("Mistério", "misterio"),
-        Genre("Mystery", "mystery"),
-        Genre("Omegaverse", "omegaverse"),
-        Genre("One shot", "one-shot"),
-        Genre("Psicológico", "psicologico"),
-        Genre("Psychological", "psychological"),
-        Genre("Romance", "romance"),
-        Genre("School Life", "school-life"),
-        Genre("Sci-fi", "sci-fi"),
-        Genre("Seinen", "seinen"),
-        Genre("Shotacon", "shotacon"),
-        Genre("Shoujo", "shoujo"),
-        Genre("Shoujo Ai", "shoujo-ai"),
-        Genre("Shounen", "shounen"),
-        Genre("Shounen Ai", "shounen-ai"),
-        Genre("Slice of Life", "slice-of-life"),
-        Genre("Smut", "smut"),
-        Genre("Sobrenatural", "sobrenatural"),
-        Genre("Soft Yaoi", "soft-yaoi"),
-        Genre("Soft Yuri", "soft-yuri"),
-        Genre("Sports", "sports"),
-        Genre("Supernatural", "supernatural"),
-        Genre("Tragedy", "tragedy"),
-        Genre("Vida Ecolar", "vida-ecolar"),
-        Genre("Vida Escolar", "vida-escolar"),
-        Genre("Webtoon", "webtoon"),
-        Genre("Yaoi", "yaoi"),
-        Genre("Yuri", "yuri")
-    )
-}
diff --git a/multisrc/overrides/madara/xxxyaoi/src/XXXYaoi.kt b/multisrc/overrides/madara/xxxyaoi/src/XXXYaoi.kt
new file mode 100644
index 000000000..09ba8bec7
--- /dev/null
+++ b/multisrc/overrides/madara/xxxyaoi/src/XXXYaoi.kt
@@ -0,0 +1,26 @@
+package eu.kanade.tachiyomi.extension.pt.xxxyaoi
+
+import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import okhttp3.OkHttpClient
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class XXXYaoi : Madara(
+    "XXX Yaoi",
+    "https://xxxyaoi.com",
+    "pt-BR",
+    SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR"))
+) {
+
+    override val client: OkHttpClient = super.client.newBuilder()
+        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .build()
+
+    override val altName: String = "Nome alternativo: "
+
+    override val useNewChapterEndpoint = true
+
+    override fun popularMangaSelector() = "div.page-item-detail.manga"
+}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
index 0d4c1efae..ce6a28da4 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
@@ -45,7 +45,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("BL Manhwa Club", "https://blmanhwa.club", "pt-BR", isNsfw = true, className = "BlManhwaClub", overrideVersionCode = 2),
         SingleLang("Block Manga", "https://blockmanga.com", "en"),
         SingleLang("Bakaman", "https://bakaman.net", "th", overrideVersionCode = 1),
-        SingleLang("Banana Mecânica", "https://leitorbm.com", "pt-BR", isNsfw = true, pkgName = "bananamecanica", className = "BananaMecanica", overrideVersionCode = 2),
+        SingleLang("Banana Crítica", "https://cillylovers.com", "pt-BR", isNsfw = true, pkgName = "bananamecanica", className = "BananaCritica", overrideVersionCode = 3),
         SingleLang("BestManga", "https://bestmanga.club", "ru", overrideVersionCode = 1),
         SingleLang("BestManhua", "https://bestmanhua.com", "en", overrideVersionCode = 2),
         SingleLang("BlogManga", "https://blogmanga.net", "en"),
@@ -407,6 +407,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("WoopRead", "https://woopread.com", "en", overrideVersionCode = 1),
         SingleLang("WuxiaWorld", "https://wuxiaworld.site", "en", overrideVersionCode = 1),
         SingleLang("XManga", "https://xmanga.io", "en", isNsfw = true),
+        SingleLang("XXX Yaoi", "https://xxxyaoi.com", "pt-BR", isNsfw = true),
         SingleLang("XuN Scans", "https://xunscans.xyz", "en", overrideVersionCode = 2),
         SingleLang("Yaoi Fan Clube", "https://yaoifanclube.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Yaoi Hentai", "https://yaoihentai.me", "en", isNsfw = true),