diff --git a/src/all/manhwaclubnet/build.gradle b/src/all/manhwaclubnet/build.gradle
new file mode 100644
index 000000000..136395496
--- /dev/null
+++ b/src/all/manhwaclubnet/build.gradle
@@ -0,0 +1,10 @@
+ext {
+    extName = 'ManhwaClub.net'
+    extClass = '.ManhwaClubNetFactory'
+    themePkg = 'madara'
+    baseUrl = 'https://manhwaclub.net'
+    overrideVersionCode = 0
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/all/manhwaclubnet/res/mipmap-hdpi/ic_launcher.png b/src/all/manhwaclubnet/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..5b7574f00
Binary files /dev/null and b/src/all/manhwaclubnet/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/all/manhwaclubnet/res/mipmap-mdpi/ic_launcher.png b/src/all/manhwaclubnet/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..8c301ac93
Binary files /dev/null and b/src/all/manhwaclubnet/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/all/manhwaclubnet/res/mipmap-xhdpi/ic_launcher.png b/src/all/manhwaclubnet/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..e9fb254ce
Binary files /dev/null and b/src/all/manhwaclubnet/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/all/manhwaclubnet/res/mipmap-xxhdpi/ic_launcher.png b/src/all/manhwaclubnet/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..2843cc3a8
Binary files /dev/null and b/src/all/manhwaclubnet/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/all/manhwaclubnet/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/manhwaclubnet/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..9659f1291
Binary files /dev/null and b/src/all/manhwaclubnet/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/all/manhwaclubnet/src/eu/kanade/tachiyomi/extension/all/manhwaclubnet/ManhwaClubNet.kt b/src/all/manhwaclubnet/src/eu/kanade/tachiyomi/extension/all/manhwaclubnet/ManhwaClubNet.kt
new file mode 100644
index 000000000..faf43adae
--- /dev/null
+++ b/src/all/manhwaclubnet/src/eu/kanade/tachiyomi/extension/all/manhwaclubnet/ManhwaClubNet.kt
@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.extension.all.manhwaclubnet
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.source.model.SChapter
+import okhttp3.Response
+
+class ManhwaClubNet(lang: String) : Madara(
+    "ManhwaClub.net",
+    "https://manhwaclub.net",
+    lang,
+) {
+    override val useLoadMoreRequest = LoadMoreStrategy.Never
+    override val useNewChapterEndpoint = false
+
+    override fun chapterListParse(response: Response): List<SChapter> {
+        val chapters = super.chapterListParse(response)
+
+        return when (lang) {
+            "en" -> chapters.filterNot { it.name.endsWith(" raw") }
+            "ko" -> chapters.filter { it.name.endsWith(" raw") }
+            else -> emptyList()
+        }
+    }
+}
diff --git a/src/all/manhwaclubnet/src/eu/kanade/tachiyomi/extension/all/manhwaclubnet/ManhwaClubNetFactory.kt b/src/all/manhwaclubnet/src/eu/kanade/tachiyomi/extension/all/manhwaclubnet/ManhwaClubNetFactory.kt
new file mode 100644
index 000000000..26d7d4a91
--- /dev/null
+++ b/src/all/manhwaclubnet/src/eu/kanade/tachiyomi/extension/all/manhwaclubnet/ManhwaClubNetFactory.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.all.manhwaclubnet
+
+import eu.kanade.tachiyomi.source.SourceFactory
+
+class ManhwaClubNetFactory : SourceFactory {
+    // Font for icon: Cooper BT Std Black Headline
+    override fun createSources() = listOf(
+        ManhwaClubNet("en"),
+        ManhwaClubNet("ko"),
+    )
+}
diff --git a/src/en/manhwaclub/build.gradle b/src/en/manhwaclub/build.gradle
deleted file mode 100644
index b8bb8a96b..000000000
--- a/src/en/manhwaclub/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-ext {
-    extName = 'ManhwaClub'
-    extClass = '.ManhwaClub'
-    themePkg = 'hentaihand'
-    baseUrl = 'https://manhwa.club'
-    overrideVersionCode = 3
-    isNsfw = true
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/en/manhwaclub/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 3a58383ce..000000000
Binary files a/src/en/manhwaclub/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/en/manhwaclub/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 1aa197386..000000000
Binary files a/src/en/manhwaclub/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/en/manhwaclub/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 3eb9873ec..000000000
Binary files a/src/en/manhwaclub/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/en/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 09f5fe5fb..000000000
Binary files a/src/en/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/en/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 319382902..000000000
Binary files a/src/en/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/en/manhwaclub/src/eu/kanade/tachiyomi/extension/en/manhwaclub/ManhwaClub.kt b/src/en/manhwaclub/src/eu/kanade/tachiyomi/extension/en/manhwaclub/ManhwaClub.kt
deleted file mode 100644
index d85893455..000000000
--- a/src/en/manhwaclub/src/eu/kanade/tachiyomi/extension/en/manhwaclub/ManhwaClub.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package eu.kanade.tachiyomi.extension.en.manhwaclub
-
-import eu.kanade.tachiyomi.multisrc.hentaihand.HentaiHand
-import okhttp3.OkHttpClient
-
-class ManhwaClub : HentaiHand("ManhwaClub", "https://manhwa.club", "en", true) {
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
-        .addInterceptor { authIntercept(it) }
-        .build()
-}