diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9b58790..2cd87af 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,6 +10,7 @@
         </div>
         <div class="mt-16"></div>
         {{ partial "components/last-updated.html" . }}
+        {{ partial "components/comment.html" . }}
       </main>
     </article>
   </div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 25a5a29..11c3bc4 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -10,6 +10,7 @@
         <div class="content">
           {{ .Content }}
         </div>
+        {{ partial "components/comment.html" . }}
       </main>
     </article>
   </div>
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index dee6cb9..c7059f5 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -28,6 +28,7 @@
         {{ partial "components/last-updated.html" . }}
         {{ .Scratch.Set "reversePagination" true }}
         {{ partial "components/pager.html" . }}
+        {{ partial "components/comment.html" . }}
       </main>
     </article>
   </div>
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index 8d1be7a..d4e9bbc 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -12,6 +12,7 @@
         <div class="mt-16"></div>
         {{ partial "components/last-updated.html" . }}
         {{ partial "components/pager.html" . }}
+        {{ partial "components/comment.html" . }}
       </main>
     </article>
   </div>
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index da9b205..81656b5 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -11,6 +11,7 @@
         </div>
         {{ partial "components/last-updated.html" . }}
         {{ partial "components/pager.html" . }}
+        {{ partial "components/comment.html" . }}
       </main>
     </article>
   </div>
diff --git a/layouts/partials/components/comment.html b/layouts/partials/components/comment.html
new file mode 100644
index 0000000..cb95e7e
--- /dev/null
+++ b/layouts/partials/components/comment.html
@@ -0,0 +1,8 @@
+{{- $commentEnable := site.Params.comment.enable | default false -}}
+{{- $commentPageEnable := .Params.comment | default true -}}
+
+{{- if and $commentEnable $commentPageEnable -}}
+  {{- if eq site.Params.comment.type "giscus" -}}
+    {{ partial "components/giscus.html" . }}
+  {{- end -}}
+{{- end -}}
diff --git a/layouts/partials/components/giscus.html b/layouts/partials/components/giscus.html
new file mode 100644
index 0000000..1ea3dc8
--- /dev/null
+++ b/layouts/partials/components/giscus.html
@@ -0,0 +1,62 @@
+{{- with site.Params.comment.giscus -}}
+
+{{- $lang = site.Language.Lang | default `en` -}}
+<script>
+  /*
+   * "preferred color scheme" theme in giscus works using "prefers-color-scheme" in media query.
+   * but, hugo's theme switch function works by using "color-theme" in local storage.
+   * This solution was created with reference to:
+   * https://github.com/giscus/giscus/issues/336#issuecomment-1214366281
+  */
+  function getGiscusTheme() {
+    return localStorage.getItem("color-theme");
+  }
+
+  function setGiscusTheme() {
+    function sendMessage(message) {
+      const iframe = document.querySelector('iframe.giscus-frame');
+      if (!iframe) return;
+      iframe.contentWindow.postMessage({ giscus: message }, 'https://giscus.app');
+    }
+    sendMessage({
+      setConfig: {
+        theme: getGiscusTheme(),
+      },
+    });
+  }
+
+  document.addEventListener('DOMContentLoaded', function () {
+    const giscusAttributes = {
+      "src": "https://giscus.app/client.js",
+      "data-repo": "{{ .repo }}",
+      "data-repo-id": "{{ .repoId }}",
+      "data-category": "{{ .category }}",
+      "data-category-id": "{{ .categoryId }}",
+      "data-mapping": "{{ .mapping | default `pathname` }}",
+      "data-strict": "{{ (string .strict) | default 0 }}",
+      "data-reactions-enabled": "{{ (string .reactionsEnabled) |  default 1 }}",
+      "data-emit-metadata": "{{ (string .emitMetadata) | default 0 }}",
+      "data-input-position": "{{ .inputPosition | default `top` }}",
+      "data-theme": getGiscusTheme(),
+      "data-lang": "{{ .lang | default $lang }}",
+      "crossorigin": "anonymous",
+      {{ if .lazyLoading -}}
+      "data-loading": "lazy",
+      {{ end -}}
+      "async": "",
+    };
+
+    // Dynamically create script tag
+    const giscusScript = document.createElement("script");
+    Object.entries(giscusAttributes).forEach(([key, value]) => giscusScript.setAttribute(key, value));
+    document.getElementById('giscus').appendChild(giscusScript);
+
+    // Update giscus theme when theme switcher is clicked
+    const toggle = document.querySelector('.theme-toggle');
+    if (toggle) {
+      toggle.addEventListener('click', setGiscusTheme);
+    }
+  });
+</script>
+<div id="giscus"></div>
+{{- end -}}