diff --git a/exampleSite/config/_default/params.yaml b/exampleSite/config/_default/params.yaml
index 36f9027b..9047bdc7 100644
--- a/exampleSite/config/_default/params.yaml
+++ b/exampleSite/config/_default/params.yaml
@@ -28,3 +28,21 @@ socialNavbar: true # show social icons on navbar
 socialHomePage: true # show social icons on the home page
 
 colorTheme: blue # choose a theme from `data/themes` folder
+
+giscusScript: >
+  <script src="https://giscus.app/client.js"
+      data-repo="rohandebsarkar/academic-folio"
+      data-repo-id="R_kgDOI0baIw"
+      data-category="Comments (giscus)"
+      data-category-id="DIC_kwDOI0baI84CWhyL"
+      data-mapping="og:title"
+      data-strict="0"
+      data-reactions-enabled="1"
+      data-emit-metadata="0"
+      data-input-position="top"
+      data-theme="preferred_color_scheme"
+      data-lang="en"
+      data-loading="lazy"
+      crossorigin="anonymous"
+      async
+  ></script>
diff --git a/layouts/partials/scripts/giscus.html b/layouts/partials/scripts/giscus.html
new file mode 100644
index 00000000..8eb9cf30
--- /dev/null
+++ b/layouts/partials/scripts/giscus.html
@@ -0,0 +1,19 @@
+{{ safeHTML .Site.Params.giscusScript }}
+
+<script>
+    function setGiscusTheme(theme) {
+        function sendMessage(message) {
+            const iframe = document.querySelector('iframe.giscus-frame');
+            if (!iframe) return;
+            iframe.contentWindow.postMessage({ giscus: message }, 'https://giscus.app');
+        }
+
+        sendMessage({
+            setConfig: {
+                theme: theme
+            }
+        });
+    }
+</script>
+
+<noscript>Please enable JavaScript to view the <a href="http://giscus.app/?ref_noscript">comments powered by giscus.</a></noscript>
diff --git a/layouts/partials/scripts/theme.html b/layouts/partials/scripts/theme.html
index 7987cc63..a11b0215 100644
--- a/layouts/partials/scripts/theme.html
+++ b/layouts/partials/scripts/theme.html
@@ -1,7 +1,8 @@
 <script>
     function toggleTheme() {
         document.documentElement.classList.toggle('dark');
-        localStorage.theme = localStorage.theme === 'dark' ? 'light' : 'dark'
+        localStorage.theme = localStorage.theme === 'dark' ? 'light' : 'dark';
+        if(typeof setGiscusTheme == "function") setGiscusTheme(localStorage.theme);
     };
 
     if ((!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches) || localStorage.theme === 'dark') {
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 560acbda..7c3f9bf4 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -48,4 +48,10 @@ <h3 class="text-sm italic text-secondary">
     <article class="markdown">
         {{ .Content }}
     </article>
+
+    {{ if (and .Site.Params.giscusScript (not .Params.disableGiscusComments)) }}
+        <div id="comments">
+            {{ partial "scripts/giscus" . }}
+        </div>
+    {{ end }}
 {{ end }}