diff --git a/src/id/yubikiri/build.gradle b/src/id/yubikiri/build.gradle
index 563b844af..48984d612 100644
--- a/src/id/yubikiri/build.gradle
+++ b/src/id/yubikiri/build.gradle
@@ -1,9 +1,9 @@
 ext {
-    extName = 'Yubikiri'
-    extClass = '.Yubikiri'
+    extName = 'Kaguya'
+    extClass = '.Kaguya'
     themePkg = 'madara'
-    baseUrl = 'https://yubikiri.my.id'
-    overrideVersionCode = 0
+    baseUrl = 'https://kaguya.id'
+    overrideVersionCode = 1
     isNsfw = false
 }
 
diff --git a/src/id/yubikiri/res/mipmap-hdpi/ic_launcher.png b/src/id/yubikiri/res/mipmap-hdpi/ic_launcher.png
index b5d7285c9..5f556c72b 100644
Binary files a/src/id/yubikiri/res/mipmap-hdpi/ic_launcher.png and b/src/id/yubikiri/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/id/yubikiri/res/mipmap-mdpi/ic_launcher.png b/src/id/yubikiri/res/mipmap-mdpi/ic_launcher.png
index ac999aba9..e912d0f70 100644
Binary files a/src/id/yubikiri/res/mipmap-mdpi/ic_launcher.png and b/src/id/yubikiri/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/id/yubikiri/res/mipmap-xhdpi/ic_launcher.png b/src/id/yubikiri/res/mipmap-xhdpi/ic_launcher.png
index f3c0495f8..d9a9d09f0 100644
Binary files a/src/id/yubikiri/res/mipmap-xhdpi/ic_launcher.png and b/src/id/yubikiri/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/id/yubikiri/res/mipmap-xxhdpi/ic_launcher.png b/src/id/yubikiri/res/mipmap-xxhdpi/ic_launcher.png
index 64e6abea0..4e84ff3a3 100644
Binary files a/src/id/yubikiri/res/mipmap-xxhdpi/ic_launcher.png and b/src/id/yubikiri/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/id/yubikiri/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/yubikiri/res/mipmap-xxxhdpi/ic_launcher.png
index 6f5a8afc5..3c82fc3ff 100644
Binary files a/src/id/yubikiri/res/mipmap-xxxhdpi/ic_launcher.png and b/src/id/yubikiri/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/id/yubikiri/src/eu/kanade/tachiyomi/extension/id/yubikiri/Yubikiri.kt b/src/id/yubikiri/src/eu/kanade/tachiyomi/extension/id/yubikiri/Kaguya.kt
similarity index 55%
rename from src/id/yubikiri/src/eu/kanade/tachiyomi/extension/id/yubikiri/Yubikiri.kt
rename to src/id/yubikiri/src/eu/kanade/tachiyomi/extension/id/yubikiri/Kaguya.kt
index 41ef45ecd..0170e005f 100644
--- a/src/id/yubikiri/src/eu/kanade/tachiyomi/extension/id/yubikiri/Yubikiri.kt
+++ b/src/id/yubikiri/src/eu/kanade/tachiyomi/extension/id/yubikiri/Kaguya.kt
@@ -1,22 +1,33 @@
 package eu.kanade.tachiyomi.extension.id.yubikiri
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import okhttp3.OkHttpClient
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.Locale
+import java.util.concurrent.TimeUnit
 
-class Yubikiri : Madara(
-    "Yubikiri",
-    "https://yubikiri.my.id",
+class Kaguya : Madara(
+    "Kaguya",
+    "https://kaguya.id",
     "id",
     dateFormat = SimpleDateFormat("d MMMM", Locale("en")),
 ) {
-    override val mangaDetailsSelectorAuthor = ".manga-authors > a"
-    override val mangaDetailsSelectorDescription = ".manga-summary p"
+
+    override val client: OkHttpClient = super.client.newBuilder()
+        .readTimeout(1, TimeUnit.MINUTES)
+        .build()
+
+    override val id = 1557304490417397104
+
+    override val mangaDetailsSelectorTitle = "h1.post-title"
+    override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Status) + div"
     override val mangaDetailsSelectorThumbnail = "head meta[property='og:image']" // Same as browse
 
     override val useNewChapterEndpoint = true
 
+    override val useLoadMoreRequest = LoadMoreStrategy.Never
+
     override fun imageFromElement(element: Element): String? {
         return super.imageFromElement(element)
             ?.takeIf { it.isNotEmpty() }