diff --git a/src/en/lunatoons/build.gradle b/src/en/lunatoons/build.gradle
new file mode 100644
index 000000000..c9ecacafd
--- /dev/null
+++ b/src/en/lunatoons/build.gradle
@@ -0,0 +1,10 @@
+ext {
+    extName = 'Luna Toons'
+    extClass = '.LunaToons'
+    themePkg = 'keyoapp'
+    baseUrl = 'https://lunatoons.org'
+    overrideVersionCode = 0
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/lunatoons/res/mipmap-hdpi/ic_launcher.png b/src/en/lunatoons/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..199e47644
Binary files /dev/null and b/src/en/lunatoons/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/en/lunatoons/res/mipmap-mdpi/ic_launcher.png b/src/en/lunatoons/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..a68cebbe8
Binary files /dev/null and b/src/en/lunatoons/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/en/lunatoons/res/mipmap-xhdpi/ic_launcher.png b/src/en/lunatoons/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..8c833ac72
Binary files /dev/null and b/src/en/lunatoons/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/en/lunatoons/res/mipmap-xxhdpi/ic_launcher.png b/src/en/lunatoons/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..fe59722e4
Binary files /dev/null and b/src/en/lunatoons/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/en/lunatoons/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/lunatoons/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..46ebad1ac
Binary files /dev/null and b/src/en/lunatoons/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/en/lunatoons/src/eu/kanade/tachiyomi/extension/en/lunatoons/LunaToons.kt b/src/en/lunatoons/src/eu/kanade/tachiyomi/extension/en/lunatoons/LunaToons.kt
new file mode 100644
index 000000000..a9723c628
--- /dev/null
+++ b/src/en/lunatoons/src/eu/kanade/tachiyomi/extension/en/lunatoons/LunaToons.kt
@@ -0,0 +1,20 @@
+package eu.kanade.tachiyomi.extension.en.lunatoons
+
+import eu.kanade.tachiyomi.multisrc.keyoapp.Keyoapp
+import eu.kanade.tachiyomi.source.model.SManga
+import org.jsoup.nodes.Document
+
+class LunaToons : Keyoapp(
+    "Luna Toons",
+    "https://lunatoons.org",
+    "en",
+) {
+    override fun mangaDetailsParse(document: Document): SManga = super.mangaDetailsParse(document).apply {
+        document.select("div:has(h1) a[href*='?genre=']")
+            .joinToString { it.attr("title") }
+            .takeIf { it.isNotEmpty() }
+            ?.let {
+                genre = genre?.plus(", $it") ?: it
+            }
+    }
+}