diff --git a/src/id/comic21/build.gradle b/src/id/comic21/build.gradle
new file mode 100644
index 000000000..c13ecbf05
--- /dev/null
+++ b/src/id/comic21/build.gradle
@@ -0,0 +1,10 @@
+ext {
+    extName = 'Comic 21'
+    extClass = '.Comic21'
+    themePkg = 'mangathemesia'
+    baseUrl = 'https://comic21.me'
+    overrideVersionCode = 0
+    isNsfw = false
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/id/comic21/res/mipmap-hdpi/ic_launcher.png b/src/id/comic21/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..d609f6493
Binary files /dev/null and b/src/id/comic21/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/id/comic21/res/mipmap-mdpi/ic_launcher.png b/src/id/comic21/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..601040ce1
Binary files /dev/null and b/src/id/comic21/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/id/comic21/res/mipmap-xhdpi/ic_launcher.png b/src/id/comic21/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..18f784462
Binary files /dev/null and b/src/id/comic21/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/id/comic21/res/mipmap-xxhdpi/ic_launcher.png b/src/id/comic21/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..ddafdd0c5
Binary files /dev/null and b/src/id/comic21/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/id/comic21/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/comic21/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..e2ffe505b
Binary files /dev/null and b/src/id/comic21/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/id/comic21/src/eu/kanade/tachiyomi/extension/id/comic21/Comic21.kt b/src/id/comic21/src/eu/kanade/tachiyomi/extension/id/comic21/Comic21.kt
new file mode 100644
index 000000000..7084043cc
--- /dev/null
+++ b/src/id/comic21/src/eu/kanade/tachiyomi/extension/id/comic21/Comic21.kt
@@ -0,0 +1,29 @@
+package eu.kanade.tachiyomi.extension.id.comic21
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+import eu.kanade.tachiyomi.source.model.SManga
+import org.jsoup.nodes.Document
+
+class Comic21 : MangaThemesia(
+    "Comic 21",
+    "https://comic21.me",
+    "id",
+) {
+    override val hasProjectPage = true
+
+    override fun mangaDetailsParse(document: Document): SManga {
+        return super.mangaDetailsParse(document).apply {
+            // Add 'color' badge as a genre
+            if (document.selectFirst(".thumb .colored") != null) {
+                val genres = genre
+                    ?.split(", ")
+                    ?.toMutableList()
+                    ?: mutableListOf()
+
+                genre = genres
+                    .apply { add("Color") }
+                    .joinToString()
+            }
+        }
+    }
+}