diff --git a/src/all/mangatensei/build.gradle b/src/all/mangatensei/build.gradle
index 60fa3241a..76ec8cf24 100644
--- a/src/all/mangatensei/build.gradle
+++ b/src/all/mangatensei/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 ext {
-    appName = 'Tachiyomi: Mangatensei'
+    appName = 'Tachiyomi: Mangatensei (and others)'
     pkgNameSuffix = 'all.mangatensei'
     extClass = '.MangatenseiFactory'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '1.2'
 }
 
diff --git a/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/Mangatensei.kt b/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/Mangatensei.kt
index 16b2c5b89..773797e45 100644
--- a/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/Mangatensei.kt
+++ b/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/Mangatensei.kt
@@ -394,3 +394,9 @@ open class Mangatensei(override val lang: String, private val Mtlang: String) :
     private class Tag(name: String) : Filter.CheckBox(name)
 
 }
+
+abstract class OtherSite(private val sourceName: String, private val sourceBaseUrl: String, private val tachiLang: String, private val sourceLang: String): Mangatensei(tachiLang, sourceLang) {
+    override val name = sourceName
+
+    override val baseUrl = sourceBaseUrl
+}
diff --git a/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/MangatenseiFactory.kt b/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/MangatenseiFactory.kt
index 3ba6c93c8..e9b6d283c 100644
--- a/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/MangatenseiFactory.kt
+++ b/src/all/mangatensei/src/eu/kanade/tachiyomi/extension/all/mangatensei/MangatenseiFactory.kt
@@ -27,10 +27,63 @@ class MangatenseiFactory : SourceFactory {
         MangatenseiSpanish(),
         MangatenseiThai(),
         MangatenseiTurkish(),
-        MangatenseiVietnamese()
-    )
+        MangatenseiVietnamese(),
+
+        MangawindowArabic(),
+        MangawindowBrazilian(),
+        MangawindowCzech(),
+        MangawindowDanish(),
+        MangawindowDutch(),
+        MangawindowEnglish(),
+        MangawindowFilipino(),
+        MangawindowFrench(),
+        MangawindowGerman(),
+        MangawindowGreek(),
+        MangawindowHebrew(),
+        MangawindowHungarian(),
+        MangawindowIndonesian(),
+        MangawindowItalian(),
+        MangawindowMalay(),
+        MangawindowPolish(),
+        MangawindowPortuguese(),
+        MangawindowRomanian(),
+        MangawindowRussian(),
+        MangawindowSpanish(),
+        MangawindowThai(),
+        MangawindowTurkish(),
+        MangawindowVietnamese(),
+
+        BatotoArabic(),
+        BatotoBrazilian(),
+        BatotoCzech(),
+        BatotoDanish(),
+        BatotoDutch(),
+        BatotoEnglish(),
+        BatotoFilipino(),
+        BatotoFrench(),
+        BatotoGerman(),
+        BatotoGreek(),
+        BatotoHebrew(),
+        BatotoHungarian(),
+        BatotoIndonesian(),
+        BatotoItalian(),
+        BatotoMalay(),
+        BatotoPolish(),
+        BatotoPortuguese(),
+        BatotoRomanian(),
+        BatotoRussian(),
+        BatotoSpanish(),
+        BatotoThai(),
+        BatotoTurkish(),
+        BatotoVietnamese()
+        )
 }
 
+/**
+ * Mangatensei is the base class
+ * Use the OtherSite class for other sources
+ */
+
 class MangatenseiArabic : Mangatensei("ar", "arabic")
 class MangatenseiBrazilian : Mangatensei("pt-BR", "brazilian")
 class MangatenseiCzech : Mangatensei("cs", "czech")
@@ -54,3 +107,53 @@ class MangatenseiSpanish : Mangatensei("es", "spanish")
 class MangatenseiThai : Mangatensei("th", "thai")
 class MangatenseiTurkish : Mangatensei("tr", "turkish")
 class MangatenseiVietnamese : Mangatensei("vi", "vietnamese")
+
+class MangawindowArabic : OtherSite("Mangawindow", "https://mangawindow.net", "ar", "arabic")
+class MangawindowBrazilian : OtherSite("Mangawindow", "https://mangawindow.net", "pt-BR", "brazilian")
+class MangawindowCzech : OtherSite("Mangawindow", "https://mangawindow.net", "cs", "czech")
+class MangawindowDanish : OtherSite("Mangawindow", "https://mangawindow.net", "da", "danish")
+class MangawindowDutch : OtherSite("Mangawindow", "https://mangawindow.net", "nl", "dutch")
+class MangawindowEnglish : OtherSite("Mangawindow", "https://mangawindow.net", "en", "english")
+class MangawindowFilipino : OtherSite("Mangawindow", "https://mangawindow.net", "fil", "filipino")
+class MangawindowFrench : OtherSite("Mangawindow", "https://mangawindow.net", "fr", "french")
+class MangawindowGerman : OtherSite("Mangawindow", "https://mangawindow.net", "de", "german")
+class MangawindowGreek : OtherSite("Mangawindow", "https://mangawindow.net", "el", "greek")
+class MangawindowHebrew : OtherSite("Mangawindow", "https://mangawindow.net", "iw", "hebrew")
+class MangawindowHungarian : OtherSite("Mangawindow", "https://mangawindow.net", "hu", "hungarian")
+class MangawindowIndonesian : OtherSite("Mangawindow", "https://mangawindow.net", "id", "indonesian")
+class MangawindowItalian : OtherSite("Mangawindow", "https://mangawindow.net", "it", "italian")
+class MangawindowMalay : OtherSite("Mangawindow", "https://mangawindow.net", "ms", "malay")
+class MangawindowPolish : OtherSite("Mangawindow", "https://mangawindow.net", "pl", "polish")
+class MangawindowPortuguese : OtherSite("Mangawindow", "https://mangawindow.net", "pt", "portuguese")
+class MangawindowRomanian : OtherSite("Mangawindow", "https://mangawindow.net", "ro", "romanian")
+class MangawindowRussian : OtherSite("Mangawindow", "https://mangawindow.net", "ru", "russian")
+class MangawindowSpanish : OtherSite("Mangawindow", "https://mangawindow.net", "es", "spanish")
+class MangawindowThai : OtherSite("Mangawindow", "https://mangawindow.net", "th", "thai")
+class MangawindowTurkish : OtherSite("Mangawindow", "https://mangawindow.net", "tr", "turkish")
+class MangawindowVietnamese : OtherSite("Mangawindow", "https://mangawindow.net", "vi", "vietnamese")
+
+class BatotoArabic : OtherSite("Bato.to", "https://bato.to", "ar", "arabic")
+class BatotoBrazilian : OtherSite("Bato.to", "https://bato.to", "pt-BR", "brazilian")
+class BatotoCzech : OtherSite("Bato.to", "https://bato.to", "cs", "czech")
+class BatotoDanish : OtherSite("Bato.to", "https://bato.to", "da", "danish")
+class BatotoDutch : OtherSite("Bato.to", "https://bato.to", "nl", "dutch")
+class BatotoEnglish : OtherSite("Bato.to", "https://bato.to", "en", "english")
+class BatotoFilipino : OtherSite("Bato.to", "https://bato.to", "fil", "filipino")
+class BatotoFrench : OtherSite("Bato.to", "https://bato.to", "fr", "french")
+class BatotoGerman : OtherSite("Bato.to", "https://bato.to", "de", "german")
+class BatotoGreek : OtherSite("Bato.to", "https://bato.to", "el", "greek")
+class BatotoHebrew : OtherSite("Bato.to", "https://bato.to", "iw", "hebrew")
+class BatotoHungarian : OtherSite("Bato.to", "https://bato.to", "hu", "hungarian")
+class BatotoIndonesian : OtherSite("Bato.to", "https://bato.to", "id", "indonesian")
+class BatotoItalian : OtherSite("Bato.to", "https://bato.to", "it", "italian")
+class BatotoMalay : OtherSite("Bato.to", "https://bato.to", "ms", "malay")
+class BatotoPolish : OtherSite("Bato.to", "https://bato.to", "pl", "polish")
+class BatotoPortuguese : OtherSite("Bato.to", "https://bato.to", "pt", "portuguese")
+class BatotoRomanian : OtherSite("Bato.to", "https://bato.to", "ro", "romanian")
+class BatotoRussian : OtherSite("Bato.to", "https://bato.to", "ru", "russian")
+class BatotoSpanish : OtherSite("Bato.to", "https://bato.to", "es", "spanish")
+class BatotoThai : OtherSite("Bato.to", "https://bato.to", "th", "thai")
+class BatotoTurkish : OtherSite("Bato.to", "https://bato.to", "tr", "turkish")
+class BatotoVietnamese : OtherSite("Bato.to", "https://bato.to", "vi", "vietnamese")
+
+