diff --git a/src/all/wpmangareader/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default_res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from src/all/wpmangareader/res/mipmap-hdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/default_res/mipmap-hdpi/ic_launcher.png
diff --git a/src/all/wpmangareader/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default_res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from src/all/wpmangareader/res/mipmap-mdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/default_res/mipmap-mdpi/ic_launcher.png
diff --git a/src/all/wpmangareader/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default_res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from src/all/wpmangareader/res/mipmap-xhdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/default_res/mipmap-xhdpi/ic_launcher.png
diff --git a/src/all/wpmangareader/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default_res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from src/all/wpmangareader/res/mipmap-xxhdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/default_res/mipmap-xxhdpi/ic_launcher.png
diff --git a/src/all/wpmangareader/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default_res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from src/all/wpmangareader/res/mipmap-xxxhdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/default_res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/wpmangareader/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/default_res/web_hi_res_512.png
similarity index 100%
rename from src/all/wpmangareader/res/web_hi_res_512.png
rename to multisrc/overrides/wpmangareader/default_res/web_hi_res_512.png
diff --git a/multisrc/overrides/wpmangareader/komikmama/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..08dd33cbc
Binary files /dev/null and b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/komikmama/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..7bceda964
Binary files /dev/null and b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..6af6e3ff4
Binary files /dev/null and b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..7020bd4ee
Binary files /dev/null and b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..557acb5db
Binary files /dev/null and b/multisrc/overrides/wpmangareader/komikmama/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/komikmama/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/komikmama/res/web_hi_res_512.png
new file mode 100644
index 000000000..50247fd8f
Binary files /dev/null and b/multisrc/overrides/wpmangareader/komikmama/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt b/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt
new file mode 100644
index 000000000..2320f889e
--- /dev/null
+++ b/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt
@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.extension.id.komikmama
+
+import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class KomikMama : WPMangaReader("KomikMama", "https://komikmama.net", "id",
+    dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("id")))
diff --git a/multisrc/overrides/wpmangareader/mangakita/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..167969ff9
Binary files /dev/null and b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/mangakita/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..bed249fc4
Binary files /dev/null and b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..53a90adf5
Binary files /dev/null and b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d2e30a579
Binary files /dev/null and b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..f88e8d091
Binary files /dev/null and b/multisrc/overrides/wpmangareader/mangakita/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/mangakita/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/mangakita/res/web_hi_res_512.png
new file mode 100644
index 000000000..1c24b5a8a
Binary files /dev/null and b/multisrc/overrides/wpmangareader/mangakita/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..07469e9ac
Binary files /dev/null and b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..7bdfe6832
Binary files /dev/null and b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..db88d5786
Binary files /dev/null and b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..f03e74e35
Binary files /dev/null and b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0a9695e47
Binary files /dev/null and b/multisrc/overrides/wpmangareader/ngomik/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/ngomik/res/web_hi_res_512.png
new file mode 100644
index 000000000..409e80f69
Binary files /dev/null and b/multisrc/overrides/wpmangareader/ngomik/res/web_hi_res_512.png differ
diff --git a/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt b/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt
new file mode 100644
index 000000000..6a0a0cc6b
--- /dev/null
+++ b/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.ngomik
+
+import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader
+
+class Ngomik : WPMangaReader("Ngomik", "https://ngomik.net", "id", "/all-komik")
diff --git a/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt b/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt
new file mode 100644
index 000000000..5fc0f4984
--- /dev/null
+++ b/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt
@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.extension.tr.turktoon
+
+import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class TurkToon : WPMangaReader("TurkToon", "https://turktoon.com", "tr",
+    dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("tr")))
diff --git a/src/all/wpmangareader/src/eu/kanade/tachiyomi/extension/all/wpmangareader/WPMangaReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt
similarity index 99%
rename from src/all/wpmangareader/src/eu/kanade/tachiyomi/extension/all/wpmangareader/WPMangaReader.kt
rename to multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt
index ce9392add..40d0093b5 100644
--- a/src/all/wpmangareader/src/eu/kanade/tachiyomi/extension/all/wpmangareader/WPMangaReader.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.extension.all.wpmangareader
+package eu.kanade.tachiyomi.multisrc.wpmangareader
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.Filter
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
new file mode 100644
index 000000000..f38a3f3f2
--- /dev/null
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.multisrc.wpmangareader
+
+import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang
+import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator
+
+class WPMangaReaderGenerator : ThemeSourceGenerator {
+
+    override val themePkg = "wpmangareader"
+
+    override val themeClass = "WPMangaReader"
+
+    override val baseVersionCode: Int = 1
+
+    override val sources = listOf(
+            SingleLang("KomikMama", "https://komikmama.net", "id"),
+            SingleLang("MangaKita", "https://mangakita.net", "id"),
+            SingleLang("Ngomik", "https://ngomik.net", "id"),
+            SingleLang("TurkToon", "https://turktoon.com", "tr"),
+    )
+
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            WPMangaReaderGenerator().createAll()
+        }
+    }
+}
diff --git a/src/all/wpmangareader/AndroidManifest.xml b/src/all/wpmangareader/AndroidManifest.xml
deleted file mode 100644
index 30deb7f79..000000000
--- a/src/all/wpmangareader/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="eu.kanade.tachiyomi.extension" />
diff --git a/src/all/wpmangareader/build.gradle b/src/all/wpmangareader/build.gradle
deleted file mode 100644
index 8c62fb4fb..000000000
--- a/src/all/wpmangareader/build.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
-    extName = 'WP MangaReader (multiple sources)'
-    pkgNameSuffix = 'all.wpmangareader'
-    extClass = '.WPMangaReaderFactory'
-    extVersionCode = 5
-    libVersion = '1.2'
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/all/wpmangareader/src/eu/kanade/tachiyomi/extension/all/wpmangareader/WPMangaReaderFactory.kt b/src/all/wpmangareader/src/eu/kanade/tachiyomi/extension/all/wpmangareader/WPMangaReaderFactory.kt
deleted file mode 100644
index 73951f8de..000000000
--- a/src/all/wpmangareader/src/eu/kanade/tachiyomi/extension/all/wpmangareader/WPMangaReaderFactory.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.extension.all.wpmangareader
-
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.SourceFactory
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-class WPMangaReaderFactory : SourceFactory {
-    override fun createSources(): List<Source> = listOf(
-        KomikMama(),
-        MangaKita(),
-        Ngomik(),
-        TurkToon(),
-    )
-}
-
-class TurkToon : WPMangaReader("TurkToon", "https://turktoon.com", "tr", "/manga", SimpleDateFormat("MMM d, yyyy", Locale("tr")))
-
-class KomikMama : WPMangaReader("KomikMama", "https://komikmama.net", "id", "/manga", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("id")))
-
-class MangaKita : WPMangaReader("MangaKita", "https://mangakita.net", "id")
-
-class Ngomik : WPMangaReader("Ngomik", "https://ngomik.net", "id", "/all-komik")