diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 8986471..433538c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,8 +2,5 @@
     <h1>{{ .Title }}</h1>
 	<time datetime="{{ .Date }}" itemprop="datePublished">{{ .Date.Format "January 2, 2006" }}</time>
 	{{ .Content }}
-	<br>
-	<hr style="height:2px;border-width:0;color:gray;background-color:gray">
-	<h3>comments:</h3>
-	{{ partial "comments.html" . }}
+	{{ partial "comments/entry_point.html" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
deleted file mode 100644
index 787f5b4..0000000
--- a/layouts/partials/comments.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ if (isset .Site.Params.Comments "enabled") }}
-  {{ .Scratch.Set "enable_comments" .Site.Params.Comments.Enabled }}
-{{ else }}
-  {{ .Scratch.Set "enable_comments" false }}
-{{ end }}
-
-
-{{ $enable_comments := .Scratch.Get "enable_comments" }}
-{{ if $enable_comments }}
-  <script type="text/javascript" src="https://latest.cactus.chat/cactus.js"></script>
-  <link rel="stylesheet" href="https://latest.cactus.chat/style.css" type="text/css">
-  <div id="comment-section"></div>
-  <script>
-  initComments({
-    node: document.getElementById("comment-section"),
-    defaultHomeserverUrl: "https://matrix.cactus.chat:8448",
-    serverName: "cactus.chat",
-    siteName: "{{ .Site.Params.Comments.CactusSiteName }}",
-    commentSectionId: "{{ .RelPermalink }}"
-  })
-  </script>
-{{ end }}
diff --git a/layouts/partials/comments/engine/cactus.html b/layouts/partials/comments/engine/cactus.html
new file mode 100644
index 0000000..3068acf
--- /dev/null
+++ b/layouts/partials/comments/engine/cactus.html
@@ -0,0 +1,12 @@
+<script type="text/javascript" src="https://latest.cactus.chat/cactus.js"></script>
+<link rel="stylesheet" href="https://latest.cactus.chat/style.css" type="text/css">
+<div id="comment-section"></div>
+<script>
+initComments({
+  node: document.getElementById("comment-section"),
+  defaultHomeserverUrl: "https://matrix.cactus.chat:8448",
+  serverName: "cactus.chat",
+  siteName: "{{ .Site.Params.Comments.CactusSiteName }}",
+  commentSectionId: "{{ .RelPermalink }}"
+})
+</script>
\ No newline at end of file
diff --git a/layouts/partials/comments/engine/giscus.html b/layouts/partials/comments/engine/giscus.html
new file mode 100644
index 0000000..91b68a6
--- /dev/null
+++ b/layouts/partials/comments/engine/giscus.html
@@ -0,0 +1,15 @@
+<script src="https://giscus.app/client.js"
+        data-repo="{{ .Site.Params.Comments.GitHubRepo }}"
+        data-repo-id="MDEwOlJlcG9zaXRvcnkxOTA2NDkwNzk="
+        data-category="Announcements"
+        data-category-id="DIC_kwDOC10S984CTH4M"
+        data-mapping="pathname"
+        data-strict="0"
+        data-reactions-enabled="1"
+        data-emit-metadata="0"
+        data-input-position="bottom"
+        data-theme="light"
+        data-lang="en"
+        crossorigin="anonymous"
+        async>
+</script>
\ No newline at end of file
diff --git a/layouts/partials/comments/entry_point.html b/layouts/partials/comments/entry_point.html
new file mode 100644
index 0000000..9493eed
--- /dev/null
+++ b/layouts/partials/comments/entry_point.html
@@ -0,0 +1,14 @@
+{{ if (isset .Site.Params.Comments "enabled") }}
+  {{ .Scratch.Set "enable_comments" .Site.Params.Comments.Enabled }}
+{{ else }}
+  {{ .Scratch.Set "enable_comments" false }}
+{{ end }}
+
+
+{{ $enable_comments := .Scratch.Get "enable_comments" }}
+{{ if $enable_comments }}
+  <br>
+  <hr style="height:2px;border-width:0;color:gray;background-color:gray">
+  <h4>comments:</h4>
+  {{ partial (printf "comments/engine/%s" .Site.Params.comments.engine) . }}
+{{ end }}