diff --git a/multisrc/overrides/wpmangastream/vaposcan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/vaposcan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpmangastream/vaposcan/res/mipmap-hdpi/ic_launcher.png
rename to multisrc/overrides/madara/vaposcan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpmangastream/vaposcan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/vaposcan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpmangastream/vaposcan/res/mipmap-mdpi/ic_launcher.png
rename to multisrc/overrides/madara/vaposcan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpmangastream/vaposcan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/vaposcan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpmangastream/vaposcan/res/mipmap-xhdpi/ic_launcher.png
rename to multisrc/overrides/madara/vaposcan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpmangastream/vaposcan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/vaposcan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpmangastream/vaposcan/res/mipmap-xxhdpi/ic_launcher.png
rename to multisrc/overrides/madara/vaposcan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpmangastream/vaposcan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/vaposcan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpmangastream/vaposcan/res/mipmap-xxxhdpi/ic_launcher.png
rename to multisrc/overrides/madara/vaposcan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpmangastream/vaposcan/res/web_hi_res_512.png b/multisrc/overrides/madara/vaposcan/res/web_hi_res_512.png
similarity index 100%
rename from multisrc/overrides/wpmangastream/vaposcan/res/web_hi_res_512.png
rename to multisrc/overrides/madara/vaposcan/res/web_hi_res_512.png
diff --git a/multisrc/overrides/wpmangastream/vaposcan/src/VapoScan.kt b/multisrc/overrides/madara/vaposcan/src/VapoScan.kt
similarity index 65%
rename from multisrc/overrides/wpmangastream/vaposcan/src/VapoScan.kt
rename to multisrc/overrides/madara/vaposcan/src/VapoScan.kt
index 37e1b154a..f387cfe16 100644
--- a/multisrc/overrides/wpmangastream/vaposcan/src/VapoScan.kt
+++ b/multisrc/overrides/madara/vaposcan/src/VapoScan.kt
@@ -1,25 +1,25 @@
 package eu.kanade.tachiyomi.extension.pt.vaposcan
 
 import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
-import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream
+import eu.kanade.tachiyomi.multisrc.madara.Madara
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 
-class VapoScan : WPMangaStream(
+class VapoScan : Madara(
     "Vapo Scan",
     "https://vaposcans.com",
     "pt-BR",
-    SimpleDateFormat("MMMMM dd, yyyy", Locale("pt", "BR"))
+    SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR"))
 ) {
 
-    // Theme changed from Madara to WpMangaStream.
+    // Source changed from WpMangaStream to Madara.
     override val versionId = 2
 
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
         .build()
 
-    override val altName: String = "Nome alternativo: "
+    override val useNewChapterEndpoint = true
 }
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 6387f365c..9b92f2d7d 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
@@ -426,6 +426,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Unemployed Scans", "https://unemployedscans.com", "en", overrideVersionCode = 1),
         SingleLang("Uyuyan Balik", "https://uyuyanbalik.com", "tr", overrideVersionCode = 1),
         SingleLang("Vanguard Bun", "https://vanguardbun.com", "en", overrideVersionCode = 1),
+        SingleLang("Vapo Scan", "https://vaposcans.com", "pt-BR"),
         SingleLang("Visbellum", "https://visbellum.com", "pt-BR", overrideVersionCode = 2),
         SingleLang("WD Scans (Wicked Dragon Scans)", "https://wdscans.com", "en", className = "WDScans"),
         SingleLang("Wakamics", "https://wakamics.net", "en"),
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt
index 19746d17b..f0ef7e786 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt
@@ -51,7 +51,6 @@ class WPMangaStreamGenerator : ThemeSourceGenerator {
         SingleLang("Tempest Manga", "https://manga.tempestfansub.com", "tr"),
         SingleLang("The Apollo Team", "https://theapollo.team", "en"),
         SingleLang("TukangKomik", "https://tukangkomik.com", "id"),
-        SingleLang("Vapo Scan", "https://vaposcans.com", "pt-BR", overrideVersionCode = 3),
         SingleLang("West Manga", "https://westmanga.info", "id", overrideVersionCode = 1),
         SingleLang("xCaliBR Scans", "https://xcalibrscans.com", "en", overrideVersionCode = 3),
         SingleLang("Shadow Mangas", "https://shadowmangas.com", "es"),