diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/tenkaiscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-hdpi/ic_launcher.png
rename to multisrc/overrides/madara/tenkaiscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/tenkaiscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-mdpi/ic_launcher.png
rename to multisrc/overrides/madara/tenkaiscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png
rename to multisrc/overrides/madara/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png
rename to multisrc/overrides/madara/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to multisrc/overrides/madara/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tenkaiscan/src/TenkaiScan.kt b/multisrc/overrides/madara/tenkaiscan/src/TenkaiScan.kt
new file mode 100644
index 000000000..8e672e8df
--- /dev/null
+++ b/multisrc/overrides/madara/tenkaiscan/src/TenkaiScan.kt
@@ -0,0 +1,15 @@
+package eu.kanade.tachiyomi.extension.es.tenkaiscan
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+class TenkaiScan : Madara(
+    "TenkaiScan",
+    "https://tenkaiscan.net",
+    "es",
+    dateFormat = SimpleDateFormat("dd 'de' MMMM 'de' yyyy", Locale("es")),
+) {
+    override val versionId = 2
+    override val useNewChapterEndpoint = true
+    override val mangaDetailsSelectorStatus = "div.post-content_item:contains(Status) > div.summary-content"
+}
diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/res/web_hi_res_512.png b/multisrc/overrides/mangathemesia/tenkaiscan/res/web_hi_res_512.png
deleted file mode 100644
index 63da27372..000000000
Binary files a/multisrc/overrides/mangathemesia/tenkaiscan/res/web_hi_res_512.png and /dev/null differ
diff --git a/multisrc/overrides/mangathemesia/tenkaiscan/src/TenkaiScan.kt b/multisrc/overrides/mangathemesia/tenkaiscan/src/TenkaiScan.kt
deleted file mode 100644
index 8c4703212..000000000
--- a/multisrc/overrides/mangathemesia/tenkaiscan/src/TenkaiScan.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package eu.kanade.tachiyomi.extension.es.tenkaiscan
-
-import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-class TenkaiScan : MangaThemesia(
-    "TenkaiScan",
-    "https://tenkaiscan.net",
-    "es",
-    dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("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 5121314e0..79f9f262e 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
@@ -453,6 +453,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Tatakae Scan", "https://tatakaescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Taurus Fansub", "https://taurusmanga.com", "es", overrideVersionCode = 1),
         SingleLang("TeenManhua", "https://teenmanhua.com", "en", overrideVersionCode = 1),
+        SingleLang("TenkaiScan", "https://tenkaiscan.net", "es", isNsfw = true),
         SingleLang("The Beginning After The End", "https://www.thebeginningaftertheend.fr", "fr", overrideVersionCode = 1),
         SingleLang("The Blank Scanlation", "https://theblank.net", "en", className = "TheBlank", isNsfw = true),
         SingleLang("The Guild", "https://theguildscans.com", "en"),
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt
index e1e0172c8..5fba0852e 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt
@@ -152,7 +152,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator {
         SingleLang("Sushiscan.fr", "https://anime-sama.me", "fr", className = "SushiScanFR", overrideVersionCode = 1),
         SingleLang("Tarot Scans", "https://www.tarotscans.com", "tr"),
         SingleLang("Tecno Scan", "https://tecnoscann.com", "es", isNsfw = true, overrideVersionCode = 6),
-        SingleLang("TenkaiScan", "https://tenkaiscan.net", "es", isNsfw = true),
         SingleLang("Tenshi.id", "https://tenshi.id", "id", className = "TenshiId", pkgName = "masterkomik", overrideVersionCode = 4),
         SingleLang("The Apollo Team", "https://theapollo.team", "en"),
         SingleLang("Tres Daos Scan", "https://tresdaos.com", "es"),