diff --git a/src/id/yuramanga/build.gradle b/src/id/yuramanga/build.gradle
index f25a15f66..2b38a4f77 100644
--- a/src/id/yuramanga/build.gradle
+++ b/src/id/yuramanga/build.gradle
@@ -1,8 +1,8 @@
 ext {
     extName = 'YuraManga'
     extClass = '.YuraManga'
-    themePkg = 'makaru'
-    baseUrl = 'https://www.yuramanga.my.id'
+    themePkg = 'madara'
+    baseUrl = 'https://yuramanga.my.id'
     overrideVersionCode = 0
 }
 
diff --git a/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt b/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt
index 0f8a1b265..cc587a668 100644
--- a/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt
+++ b/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt
@@ -1,5 +1,11 @@
 package eu.kanade.tachiyomi.extension.id.yuramanga
 
-import eu.kanade.tachiyomi.multisrc.makaru.Makaru
+import eu.kanade.tachiyomi.multisrc.madara.Madara
 
-class YuraManga : Makaru("YuraManga", "https://www.yuramanga.my.id", "id")
+class YuraManga : Madara("YuraManga", "https://yuramanga.my.id", "id") {
+    // Moved from Makaru to Madara
+    override val versionId = 2
+
+    // If .list-chapter is empty the link is 404
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))$mangaEntrySelector:has(.chapter-item)"
+}