diff --git a/multisrc/overrides/madara/fastmanhwa/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/fastmanhwa/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..0fc4b089d
Binary files /dev/null and b/multisrc/overrides/madara/fastmanhwa/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/fastmanhwa/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/fastmanhwa/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..d2d7ec41c
Binary files /dev/null and b/multisrc/overrides/madara/fastmanhwa/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/fastmanhwa/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/fastmanhwa/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..7544313a6
Binary files /dev/null and b/multisrc/overrides/madara/fastmanhwa/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/fastmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/fastmanhwa/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..474071eae
Binary files /dev/null and b/multisrc/overrides/madara/fastmanhwa/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/fastmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/fastmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..fc11ceab1
Binary files /dev/null and b/multisrc/overrides/madara/fastmanhwa/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/fastmanhwa/res/web_hi_res_512.png b/multisrc/overrides/madara/fastmanhwa/res/web_hi_res_512.png
new file mode 100644
index 000000000..e351ecf58
Binary files /dev/null and b/multisrc/overrides/madara/fastmanhwa/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt
new file mode 100644
index 000000000..d74122ea0
--- /dev/null
+++ b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.fastmanhwa
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class FastManhwa : Madara("FastManhwa", "https://fastmanhwa.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) {
+
+}
diff --git a/multisrc/overrides/madara/gogoscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/gogoscans/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..7572ca1e3
Binary files /dev/null and b/multisrc/overrides/madara/gogoscans/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/gogoscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/gogoscans/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..f2ce1d81c
Binary files /dev/null and b/multisrc/overrides/madara/gogoscans/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/gogoscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/gogoscans/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..933061ccd
Binary files /dev/null and b/multisrc/overrides/madara/gogoscans/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/gogoscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/gogoscans/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..733077ed3
Binary files /dev/null and b/multisrc/overrides/madara/gogoscans/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/gogoscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/gogoscans/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..492c5b55e
Binary files /dev/null and b/multisrc/overrides/madara/gogoscans/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/gogoscans/res/web_hi_res_512.png b/multisrc/overrides/madara/gogoscans/res/web_hi_res_512.png
new file mode 100644
index 000000000..f98617351
Binary files /dev/null and b/multisrc/overrides/madara/gogoscans/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/hentairead/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..56b880bf3
Binary files /dev/null and b/multisrc/overrides/madara/hentairead/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/hentairead/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..3e2a004eb
Binary files /dev/null and b/multisrc/overrides/madara/hentairead/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/hentairead/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..03af2dcb7
Binary files /dev/null and b/multisrc/overrides/madara/hentairead/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/hentairead/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6726b38a5
Binary files /dev/null and b/multisrc/overrides/madara/hentairead/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/hentairead/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..e6fd70069
Binary files /dev/null and b/multisrc/overrides/madara/hentairead/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentairead/res/web_hi_res_512.png b/multisrc/overrides/madara/hentairead/res/web_hi_res_512.png
new file mode 100644
index 000000000..209036402
Binary files /dev/null and b/multisrc/overrides/madara/hentairead/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/hentairead/src/Hentairead.kt b/multisrc/overrides/madara/hentairead/src/Hentairead.kt
new file mode 100644
index 000000000..ae09622bb
--- /dev/null
+++ b/multisrc/overrides/madara/hentairead/src/Hentairead.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.hentairead
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class Hentairead : Madara("HentaiRead", "https://hentairead.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) {
+
+}
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..841707c24
Binary files /dev/null and b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..ee418e08d
Binary files /dev/null and b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..131559245
Binary files /dev/null and b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..e481363fe
Binary files /dev/null and b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b2a1967d8
Binary files /dev/null and b/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/web_hi_res_512.png b/multisrc/overrides/madara/hentaiwebtoon/res/web_hi_res_512.png
new file mode 100644
index 000000000..f4f560d71
Binary files /dev/null and b/multisrc/overrides/madara/hentaiwebtoon/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt b/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt
new file mode 100644
index 000000000..318a0ec35
--- /dev/null
+++ b/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt
@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.hentaiwebtoon
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+
+@Nsfw
+class HentaiWebtoon : Madara("HentaiWebtoon", "https://hentaiwebtoon.com", "en")
diff --git a/multisrc/overrides/madara/kokomanga/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/kokomanga/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..360cf6217
Binary files /dev/null and b/multisrc/overrides/madara/kokomanga/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/kokomanga/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/kokomanga/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c6de2f325
Binary files /dev/null and b/multisrc/overrides/madara/kokomanga/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/kokomanga/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/kokomanga/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..71fa8c99f
Binary files /dev/null and b/multisrc/overrides/madara/kokomanga/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/kokomanga/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/kokomanga/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..8dae044a0
Binary files /dev/null and b/multisrc/overrides/madara/kokomanga/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/kokomanga/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/kokomanga/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d9f427a6a
Binary files /dev/null and b/multisrc/overrides/madara/kokomanga/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/kokomanga/res/web_hi_res_512.png b/multisrc/overrides/madara/kokomanga/res/web_hi_res_512.png
new file mode 100644
index 000000000..d8e9ae5de
Binary files /dev/null and b/multisrc/overrides/madara/kokomanga/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt b/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt
new file mode 100644
index 000000000..c5f760523
--- /dev/null
+++ b/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt
@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.en.kokomanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class Kokomanga : Madara("Kokomanga", "https://kokomanga.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) {
+
+}
diff --git a/multisrc/overrides/madara/manga47/src/Manga47.kt b/multisrc/overrides/madara/manga47/src/Manga47.kt
new file mode 100644
index 000000000..9af7ddef9
--- /dev/null
+++ b/multisrc/overrides/madara/manga47/src/Manga47.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.manga47
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.source.model.SChapter
+import okhttp3.Response
+
+class Manga47 : Madara("Manga47", "https://manga47.net", "en") {
+
+  override fun chapterListParse(response: Response): List<SChapter> = super.chapterListParse(response).reversed()
+
+}
diff --git a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt b/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt
index b48bf9abf..b234c64ce 100644
--- a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt
+++ b/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt
@@ -8,7 +8,7 @@ class Mangafastcom : Madara(
     "Manga-fast.com",
     "https://manga-fast.com",
     "en",
-    dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)
+    dateFormat = SimpleDateFormat("d MMMM'،' yyyy", Locale.US)
 ) {
 
 }
diff --git a/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt b/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt
new file mode 100644
index 000000000..7ae3e598d
--- /dev/null
+++ b/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt
@@ -0,0 +1,13 @@
+package eu.kanade.tachiyomi.extension.en.mangalibrary
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Request
+
+class MangaLibrary : Madara("Manga Library", "https://mangalibrary.net", "en") {
+
+    override fun chapterListSelector() = "li.wp-manga-chapter  "
+
+    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga-library/$page?m_orderby=views", headers)
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga-library/$page?m_orderby=latest", headers)
+}
diff --git a/multisrc/overrides/madara/mangamanhua/src/MangaManhua.kt b/multisrc/overrides/madara/mangamanhua/src/MangaManhua.kt
index 55ac4644d..6765b1f03 100644
--- a/multisrc/overrides/madara/mangamanhua/src/MangaManhua.kt
+++ b/multisrc/overrides/madara/mangamanhua/src/MangaManhua.kt
@@ -4,4 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class MangaManhua : Madara("MangaManhua", "https://mangamanhua.online", "en", SimpleDateFormat("dd MMMM, yyyy", Locale.US))
+class MangaManhua : Madara("MangaManhua", "https://mangamanhua.online", "en", SimpleDateFormat("d MMMM'،' yyyy", Locale.US))
diff --git a/multisrc/overrides/madara/mangax18/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangax18/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..9aefa5492
Binary files /dev/null and b/multisrc/overrides/madara/mangax18/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/mangax18/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangax18/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..8539059dc
Binary files /dev/null and b/multisrc/overrides/madara/mangax18/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/mangax18/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangax18/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..04be9dc6d
Binary files /dev/null and b/multisrc/overrides/madara/mangax18/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/mangax18/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangax18/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b5c98d792
Binary files /dev/null and b/multisrc/overrides/madara/mangax18/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/mangax18/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangax18/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6144e33e6
Binary files /dev/null and b/multisrc/overrides/madara/mangax18/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/mangax18/res/web_hi_res_512.png b/multisrc/overrides/madara/mangax18/res/web_hi_res_512.png
new file mode 100644
index 000000000..12f55b7b4
Binary files /dev/null and b/multisrc/overrides/madara/mangax18/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/manhwa18app/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..1a24b43db
Binary files /dev/null and b/multisrc/overrides/madara/manhwa18app/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/manhwa18app/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..1b3a8f74e
Binary files /dev/null and b/multisrc/overrides/madara/manhwa18app/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwa18app/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..525416f0c
Binary files /dev/null and b/multisrc/overrides/madara/manhwa18app/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..36f56848f
Binary files /dev/null and b/multisrc/overrides/madara/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..229612f9b
Binary files /dev/null and b/multisrc/overrides/madara/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/res/web_hi_res_512.png b/multisrc/overrides/madara/manhwa18app/res/web_hi_res_512.png
new file mode 100644
index 000000000..fbe237a10
Binary files /dev/null and b/multisrc/overrides/madara/manhwa18app/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt b/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt
new file mode 100644
index 000000000..0404393fc
--- /dev/null
+++ b/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.manhwa18app
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class Manhwa18app : Madara("Manhwa18.app", "https://manhwa18.app", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) {
+
+}
diff --git a/multisrc/overrides/madara/manhwabiz/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/manhwabiz/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..5651adabf
Binary files /dev/null and b/multisrc/overrides/madara/manhwabiz/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwabiz/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/manhwabiz/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..003eae2aa
Binary files /dev/null and b/multisrc/overrides/madara/manhwabiz/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwabiz/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwabiz/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..568c7d48b
Binary files /dev/null and b/multisrc/overrides/madara/manhwabiz/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwabiz/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwabiz/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..7515beac0
Binary files /dev/null and b/multisrc/overrides/madara/manhwabiz/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwabiz/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwabiz/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..88f973103
Binary files /dev/null and b/multisrc/overrides/madara/manhwabiz/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwabiz/res/web_hi_res_512.png b/multisrc/overrides/madara/manhwabiz/res/web_hi_res_512.png
new file mode 100644
index 000000000..a661ec2eb
Binary files /dev/null and b/multisrc/overrides/madara/manhwabiz/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt b/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt
new file mode 100644
index 000000000..97ee889ef
--- /dev/null
+++ b/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt
@@ -0,0 +1,15 @@
+package eu.kanade.tachiyomi.extension.en.manhwabiz
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Request
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class Manhwabiz : Madara("Manhwa.biz", "https://manhwa.biz", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) {
+    private fun pagePath(page: Int) = if (page > 1) "page/$page/" else ""
+    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/all-manhwa/${pagePath(page)}?m_orderby=views", headers)
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/all-manhwa/${pagePath(page)}?m_orderby=latest", headers)
+}
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/manhwuafans/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..12d5c8519
Binary files /dev/null and b/multisrc/overrides/madara/manhwuafans/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/manhwuafans/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..28cd2961a
Binary files /dev/null and b/multisrc/overrides/madara/manhwuafans/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwuafans/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..67eb49634
Binary files /dev/null and b/multisrc/overrides/madara/manhwuafans/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..8ebac665e
Binary files /dev/null and b/multisrc/overrides/madara/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..289f265c6
Binary files /dev/null and b/multisrc/overrides/madara/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/manhwuafans/res/web_hi_res_512.png b/multisrc/overrides/madara/manhwuafans/res/web_hi_res_512.png
new file mode 100644
index 000000000..1a1228433
Binary files /dev/null and b/multisrc/overrides/madara/manhwuafans/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt b/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt
new file mode 100644
index 000000000..758b1c767
--- /dev/null
+++ b/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.manhwuafans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class Manhwuafans : Madara("Manhwua.fans", "https://manhwua.fans", "en", dateFormat = SimpleDateFormat("yyyy'年'M'月'd", Locale.US)) {
+
+}
diff --git a/multisrc/overrides/madara/skyraws/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/skyraws/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..428f0e595
Binary files /dev/null and b/multisrc/overrides/madara/skyraws/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/skyraws/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/skyraws/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..1966626b7
Binary files /dev/null and b/multisrc/overrides/madara/skyraws/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/skyraws/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/skyraws/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..2dbf72cdd
Binary files /dev/null and b/multisrc/overrides/madara/skyraws/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/skyraws/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/skyraws/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d5624472c
Binary files /dev/null and b/multisrc/overrides/madara/skyraws/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/skyraws/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/skyraws/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b119d67cf
Binary files /dev/null and b/multisrc/overrides/madara/skyraws/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/skyraws/res/web_hi_res_512.png b/multisrc/overrides/madara/skyraws/res/web_hi_res_512.png
new file mode 100644
index 000000000..9dca54bc3
Binary files /dev/null and b/multisrc/overrides/madara/skyraws/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/tappytoonnet/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..fecb0adac
Binary files /dev/null and b/multisrc/overrides/madara/tappytoonnet/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/tappytoonnet/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..cb332133a
Binary files /dev/null and b/multisrc/overrides/madara/tappytoonnet/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..293aed14c
Binary files /dev/null and b/multisrc/overrides/madara/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..223691495
Binary files /dev/null and b/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..4e5bcaae2
Binary files /dev/null and b/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/res/web_hi_res_512.png b/multisrc/overrides/madara/tappytoonnet/res/web_hi_res_512.png
new file mode 100644
index 000000000..5af649cc0
Binary files /dev/null and b/multisrc/overrides/madara/tappytoonnet/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/tappytoonnet/src/Tappytoonnet.kt b/multisrc/overrides/madara/tappytoonnet/src/Tappytoonnet.kt
new file mode 100644
index 000000000..e9b66f598
--- /dev/null
+++ b/multisrc/overrides/madara/tappytoonnet/src/Tappytoonnet.kt
@@ -0,0 +1,13 @@
+package eu.kanade.tachiyomi.extension.en.tappytoonnet
+
+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 Tappytoonnet : Madara("TappyToon.Net", "https://tappytoon.net", "en", SimpleDateFormat("MMMM d, yyyy", Locale.US)) {
+    private fun pagePath(page: Int) = if (page > 1) "page/$page/" else ""
+    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/all-mangas/${pagePath(page)}?m_orderby=views", headers)
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/all-mangas/${pagePath(page)}?m_orderby=latest", headers)
+}
diff --git a/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt b/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt
new file mode 100644
index 000000000..743a3e2e4
--- /dev/null
+++ b/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt
@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.toonilynet
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+
+@Nsfw
+class Toonilynet : Madara("Toonily.net", "https://toonily.net", "en")
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/toonmany/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..5c143058e
Binary files /dev/null and b/multisrc/overrides/madara/toonmany/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/toonmany/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..365f45fce
Binary files /dev/null and b/multisrc/overrides/madara/toonmany/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/toonmany/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..34b071227
Binary files /dev/null and b/multisrc/overrides/madara/toonmany/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/toonmany/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..2cba52706
Binary files /dev/null and b/multisrc/overrides/madara/toonmany/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/toonmany/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..69bddcb46
Binary files /dev/null and b/multisrc/overrides/madara/toonmany/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/toonmany/res/web_hi_res_512.png b/multisrc/overrides/madara/toonmany/res/web_hi_res_512.png
new file mode 100644
index 000000000..966fc22ee
Binary files /dev/null and b/multisrc/overrides/madara/toonmany/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/toonmany/src/ToonMany.kt b/multisrc/overrides/madara/toonmany/src/ToonMany.kt
new file mode 100644
index 000000000..d4bdbc153
--- /dev/null
+++ b/multisrc/overrides/madara/toonmany/src/ToonMany.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.toonmany
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class ToonMany : Madara("ToonMany", "https://toonmany.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) {
+
+}
diff --git a/multisrc/overrides/madara/webtoon18/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon18/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..88c79dc3d
Binary files /dev/null and b/multisrc/overrides/madara/webtoon18/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/webtoon18/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon18/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..de26ffee5
Binary files /dev/null and b/multisrc/overrides/madara/webtoon18/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/webtoon18/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon18/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..aef275014
Binary files /dev/null and b/multisrc/overrides/madara/webtoon18/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/webtoon18/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon18/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a5e5d42b8
Binary files /dev/null and b/multisrc/overrides/madara/webtoon18/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/webtoon18/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon18/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..4a782fed6
Binary files /dev/null and b/multisrc/overrides/madara/webtoon18/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/webtoon18/res/web_hi_res_512.png b/multisrc/overrides/madara/webtoon18/res/web_hi_res_512.png
new file mode 100644
index 000000000..6c5f236f7
Binary files /dev/null and b/multisrc/overrides/madara/webtoon18/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/webtoon18/src/Webtoon18.kt b/multisrc/overrides/madara/webtoon18/src/Webtoon18.kt
new file mode 100644
index 000000000..c65ddf91a
--- /dev/null
+++ b/multisrc/overrides/madara/webtoon18/src/Webtoon18.kt
@@ -0,0 +1,15 @@
+package eu.kanade.tachiyomi.extension.en.webtoon18
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Request
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@Nsfw
+class Webtoon18 : Madara("Webtoon18", "https://webtoon18.net", "en", dateFormat = SimpleDateFormat("d 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)
+}
diff --git a/multisrc/overrides/madara/wekomic/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/wekomic/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 3bca24ab8..000000000
Binary files a/multisrc/overrides/madara/wekomic/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/multisrc/overrides/madara/wekomic/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/wekomic/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 66a049153..000000000
Binary files a/multisrc/overrides/madara/wekomic/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/multisrc/overrides/madara/wekomic/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/wekomic/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index a393c364c..000000000
Binary files a/multisrc/overrides/madara/wekomic/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/multisrc/overrides/madara/wekomic/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/wekomic/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 42cc5da7a..000000000
Binary files a/multisrc/overrides/madara/wekomic/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/multisrc/overrides/madara/wekomic/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/wekomic/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index b900d789a..000000000
Binary files a/multisrc/overrides/madara/wekomic/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/multisrc/overrides/madara/wekomic/res/web_hi_res_512.png b/multisrc/overrides/madara/wekomic/res/web_hi_res_512.png
deleted file mode 100644
index e93b39473..000000000
Binary files a/multisrc/overrides/madara/wekomic/res/web_hi_res_512.png and /dev/null differ
diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..0db8deb51
Binary files /dev/null and b/multisrc/overrides/madara/xmanhwa/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..a737a1a91
Binary files /dev/null and b/multisrc/overrides/madara/xmanhwa/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..16319c713
Binary files /dev/null and b/multisrc/overrides/madara/xmanhwa/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b6141ec96
Binary files /dev/null and b/multisrc/overrides/madara/xmanhwa/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..1d54ee77f
Binary files /dev/null and b/multisrc/overrides/madara/xmanhwa/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/madara/xmanhwa/res/web_hi_res_512.png b/multisrc/overrides/madara/xmanhwa/res/web_hi_res_512.png
new file mode 100644
index 000000000..ec2998cbf
Binary files /dev/null and b/multisrc/overrides/madara/xmanhwa/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/madara/xmanhwa/src/XManhwa.kt b/multisrc/overrides/madara/xmanhwa/src/XManhwa.kt
new file mode 100644
index 000000000..35ac1c0e3
--- /dev/null
+++ b/multisrc/overrides/madara/xmanhwa/src/XManhwa.kt
@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.xmanhwa
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.annotations.Nsfw
+
+@Nsfw
+class XManhwa : Madara("Xmanhwa", "https://xmanhwa.com", "en")
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 86502b7e4..1c571dadb 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
@@ -75,6 +75,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Dream Union Scan", "https://www.dreamunionscan.com", "pt-BR"),
         SingleLang("Esomanga", "http://esomanga.com", "tr"),
         SingleLang("Exo Scans", "https://exoscans.club", "en"),
+        SingleLang("FastManhwa", "https://fastmanhwa.com", "en", isNsfw = true),
         SingleLang("FDM Scan", "https://fdmscan.com", "pt-BR", overrideVersionCode = 2),
         SingleLang("Free Manga", "https://freemanga.me", "en", isNsfw = true, overrideVersionCode = 2),
         SingleLang("FreeWebtoonCoins", "https://freewebtooncoins.com", "en", overrideVersionCode = 1),
@@ -85,6 +86,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("GalaxyDegenScans", "https://gdegenscans.xyz/", "en", overrideVersionCode = 1),
         SingleLang("Geass Hentai", "https://geasshentai.xyz", "pt-BR", isNsfw = true),
         SingleLang("Glory Scans", "https://gloryscan.com", "pt-BR", isNsfw = true, overrideVersionCode = 1),
+        SingleLang("Gogoscans", "https://www.gogoscans.com", "en"),
         SingleLang("Graze Scans", "https://grazescans.com/", "en", overrideVersionCode = 1),
         SingleLang("GuncelManga", "https://guncelmanga.com", "tr", overrideVersionCode = 1),
         SingleLang("Hades no Fansub", "https://mangareaderpro.com/es", "es"),
@@ -92,6 +94,8 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Hayalistic", "https://hayalistic.com", "tr"),
         SingleLang("Hentai20", "https://hentai20.com", "en", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Hentaidexy", "https://hentaidexy.com", "en", isNsfw = true, overrideVersionCode = 1),
+        SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true),
+        SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true),
         SingleLang("Hero Manhua", "https://heromanhua.com", "en"),
         SingleLang("Heroz Scanlation", "https://herozscans.com", "en", overrideVersionCode = 1),
         SingleLang("Himera Fansub", "https://himera-fansub.com", "tr"),
@@ -112,6 +116,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("KisekiManga", "https://kisekimanga.com", "en", overrideVersionCode = 1),
         SingleLang("Kissmanga.in", "https://kissmanga.in", "en", className= "KissmangaIn", overrideVersionCode = 1),
         SingleLang("KlikManga", "https://klikmanga.com", "id", overrideVersionCode = 1),
+        SingleLang("Kokomanga", "https://kokomanga.com", "en"),
         SingleLang("Kombatch", "https://kombatch.com", "id"),
         SingleLang("Kun Manga", "https://kunmanga.com", "en", overrideVersionCode = 1),
         SingleLang("Latest Manga", "https://latestmanga.net", "en"),
@@ -137,7 +142,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Manga Kiss", "https://mangakiss.org", "en", overrideVersionCode = 1),
         SingleLang("Manga Land Arabic", "https://mangalandarabic.com", "ar", overrideVersionCode = 1),
         SingleLang("Manga Leveling", "https://mangaleveling.com", "en"),
-        SingleLang("Manga Library", "https://mangalibrary.net", "en"),
+        SingleLang("Manga Library", "https://mangalibrary.net", "en", overrideVersionCode = 1),
         SingleLang("Manga Lord", "https://mangalord.com", "en", overrideVersionCode = 1),
         SingleLang("Manga Mitsu", "https://mangamitsu.com", "en", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Manga Mix", "https://mangamix.me", "ar"),
@@ -158,7 +163,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Manga1st.online", "https://manga1st.online", "en", className = "MangaFirstOnline", overrideVersionCode = 1),
         SingleLang("Manga347", "https://manga347.com", "en", overrideVersionCode = 3),
         SingleLang("Manga3S", "https://manga3s.com", "en", overrideVersionCode = 1),
-        SingleLang("Manga47", "https://manga47.net", "en"),
+        SingleLang("Manga47", "https://manga47.net", "en", overrideVersionCode = 1),
         SingleLang("Manga4All", "https://manga4all.net", "en", overrideVersionCode = 3),
         SingleLang("Manga68", "https://manga68.com", "en", overrideVersionCode = 1),
         SingleLang("MangaBaz", "https://mangabaz.com", "tr"),
@@ -171,7 +176,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("MangaDods", "https://www.mangadods.com", "en", overrideVersionCode = 2),
         SingleLang("MangaEffect", "https://mangaeffect.com", "en", overrideVersionCode = 1),
         SingleLang("Mangaforfree.com", "https://mangaforfree.com", "en", isNsfw = true, className = "Mangaforfreecom"),
-        SingleLang("Manga-fast.com", "https://manga-fast.com", "en", className = "Mangafastcom", overrideVersionCode = 2),
+        SingleLang("Manga-fast.com", "https://manga-fast.com", "en", className = "Mangafastcom", overrideVersionCode = 3),
         SingleLang("MangaFort", "https://mangafort.com", "en"),
         SingleLang("MangaFoxFull", "https://mangafoxfull.com", "en"),
         SingleLang("MangaGreat", "https://mangagreat.com", "en", overrideVersionCode = 1),
@@ -180,7 +185,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("MangaKomi", "https://mangakomi.com", "en", overrideVersionCode = 4),
         SingleLang("MangaLime", "https://mangalime.com", "en"),
         SingleLang("MangaLionz", "https://mangalionz.com", "ar"),
-        SingleLang("MangaManhua", "https://mangamanhua.online", "en"),
+        SingleLang("MangaManhua", "https://mangamanhua.online", "en", overrideVersionCode = 1),
         SingleLang("MangaMe", "https://mangame.org", "en", overrideVersionCode = 1),
         SingleLang("MangaMG", "https://mangamg.com", "en"),
         SingleLang("MangaPL", "https://mangapl.com", "en", isNsfw = true, overrideVersionCode = 1),
@@ -204,6 +209,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("MangaWise", "https://mangawise.com", "en"),
         SingleLang("MangaWT", "https://mangawt.com", "tr", overrideVersionCode = 1),
         SingleLang("MangaX1", "https://mangax1.com", "en"),
+        SingleLang("MangaX18", "https://mangax18.com", "en", isNsfw = true),
         SingleLang("MangaXP", "https://mangaxp.com", "en", overrideVersionCode = 1),
         SingleLang("MangaYaku", "https://mangayaku.com", "id", overrideVersionCode = 1),
         SingleLang("MangaYami", "https://www.mangayami.club", "en", overrideVersionCode = 2),
@@ -231,8 +237,10 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Manhwa Raw", "https://manhwaraw.com", "ko", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Manhwaraw.net", "https://manhwaraw.net", "en", className = "Manhwarawnet"),
         SingleLang("Manhwa.club", "https://manhwa.club", "en", className="ManwhaClub", overrideVersionCode = 2), // wrong class name for backward compatibility
+        SingleLang("Manhwa18.app", "https://manhwa18.app", "en", isNsfw = true, className = "Manhwa18app"),
         SingleLang("Manhwa18.org", "https://manhwa18.org", "en", isNsfw = true, className = "Manhwa18Org", overrideVersionCode = 1),
         SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true, overrideVersionCode = 2),
+        SingleLang("Manhwa.biz", "https://manhwa.biz", "en", isNsfw = true, className = "Manhwabiz"),
         SingleLang("ManhwaBookShelf", "https://manhwabookshelf.com", "en"),
         SingleLang("Manhwafull", "https://manhwafull.com", "en"),
         SingleLang("ManhwaNelo", "https://manhwanelo.com", "en"),
@@ -241,6 +249,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Manhwahentai.me", "https://manhwahentai.me", "en", className = "ManhwahentaiMe", isNsfw = true, overrideVersionCode = 1),
         SingleLang("ManhwaWorld", "https://manhwaworld.com", "en"),
         SingleLang("ManhwaXZ", "https://manhwaxz.com", "en"),
+        SingleLang("Manhwua.fans", "https://manhwua.fans", "en", isNsfw = true, className = "Manhwuafans"),
         SingleLang("ManyToon", "https://manytoon.com", "en", isNsfw = true, overrideVersionCode = 3),
         SingleLang("ManyToon.me", "https://manytoon.me", "en", isNsfw = true, className = "ManyToonMe", overrideVersionCode = 2),
         SingleLang("ManyToonClub", "https://manytoon.club", "ko", isNsfw = true, overrideVersionCode = 1),
@@ -306,20 +315,23 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Sinensis", "https://sinensisscan.com", "pt-BR"),
         SingleLang("Siyahmelek", "https://siyahmelek.net", "tr", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Skymanga", "https://skymanga.co", "en", overrideVersionCode = 1),
+        SingleLang("SkyRaws", "https://skyraws.com", "en"),
         SingleLang("Sleeping Knight Scans", "https://skscans.com", "en", overrideVersionCode = 2),
         SingleLang("Sleepy Translations", "https://sleepytranslations.com/", "en", overrideVersionCode = 1),
         SingleLang("Solo Leveling", "https://readsololeveling.online", "en"),
         SingleLang("StageComics", "https://stagecomics.com", "pt-BR", overrideVersionCode = 2),
         SingleLang("Sugar Babies", "https://sugarbscan.com", "en", overrideVersionCode = 1),
         SingleLang("Sweet Time Scan", "https://sweetscan.net", "pt-BR", overrideVersionCode = 1),
+        SingleLang("TappyToon.Net", "https://tappytoon.net", "en", className = "Tappytoonnet"),
         SingleLang("TeenManhua", "https://teenmanhua.com", "en"),
         SingleLang("TheFluffyHangoutGroup", "https://www.fluffyhangout.club", "en", overrideVersionCode = 2),
         SingleLang("Three Queens Scanlator", "https://tqscan.com.br", "pt-BR", overrideVersionCode = 2),
         SingleLang("Time Naight", "https://timenaight.com", "tr"),
         SingleLang("Todaymic", "https://todaymic.com", "en"),
         SingleLang("ToonGod", "https://www.toongod.com", "en", isNsfw = true, overrideVersionCode = 2),
-        SingleLang("Toonily", "https://toonily.com", "en", isNsfw = true, overrideVersionCode = 2),
+        SingleLang("Toonily", "https://toonily.com", "en", isNsfw = true, className = "Toonilynet", overrideVersionCode = 3),
         SingleLang("Toonily.net", "https://toonily.net", "en", isNsfw = true, className = "ToonilyNet", overrideVersionCode = 1),
+        SingleLang("ToonMany", "https://toonmany.com", "en", isNsfw = true),
         SingleLang("Top Manhua", "https://topmanhua.com", "en", overrideVersionCode = 1),
         SingleLang("TritiniaScans", "https://tritinia.com", "en", overrideVersionCode = 1),
         SingleLang("TruyenTranhAudio.com", "https://truyentranhaudio.com", "vi", className = "TruyenTranhAudioCom"),
@@ -343,12 +355,12 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("WebtoonScan", "https://webtoonscan.com", "en", isNsfw = true),
         SingleLang("WebtoonUK", "https://webtoon.uk", "en", overrideVersionCode = 2),
         SingleLang("WebtoonXYZ", "https://www.webtoon.xyz", "en", isNsfw = true, overrideVersionCode = 3),
-        SingleLang("Wekomic", "https://wekomic.com", "en"),
         SingleLang("Winter Scan", "https://winterscan.com.br", "pt-BR", overrideVersionCode = 2),
         SingleLang("Wonderland", "https://landwebtoons.site", "pt-BR", overrideVersionCode = 2),
         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("XManhwa", "https://xmanhwa.com", "en", isNsfw = true),
         SingleLang("XuN Scans", "https://xunscans.xyz", "en", overrideVersionCode = 2),
         SingleLang("Yaoi Fan Clube", "https://yaoifanclube.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Yaoi.mobi", "https://yaoi.mobi", "en", isNsfw = true, className = "YaoiManga", pkgName = "yaoimanga", overrideVersionCode = 4),