diff --git a/src/drivers/webextension/images/icons/Twikoo.png b/src/drivers/webextension/images/icons/Twikoo.png
new file mode 100644
index 000000000..2c693a13e
Binary files /dev/null and b/src/drivers/webextension/images/icons/Twikoo.png differ
diff --git a/src/technologies/t.json b/src/technologies/t.json
index 6cefb0ccd..71dd6541b 100644
--- a/src/technologies/t.json
+++ b/src/technologies/t.json
@@ -185,6 +185,19 @@
     "scriptSrc": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
     "website": "http://twiki.org"
   },
+  "Twikoo": {
+    "cats": [
+      15
+    ],  
+    "description": "Twikoo is a simple, safe, free comment system.",
+    "icon": "Twikoo.png",
+    "js": {
+      "twikoo.version": "^([\\d\\.]+)$\\;version:\\1"
+    },
+    "scriptSrc": "/twikoo/dist/twikoo\\.all\\.min\\.js",
+    "oss": true,
+    "website": "https://twikoo.js.org"
+  },
   "TYPO3 CMS": {
     "cats": [
       1