diff --git a/overrides/main.html b/overrides/main.html
deleted file mode 100644
index a82028c2..00000000
--- a/overrides/main.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-
-{% block disqus %}
-<script src="https://giscus.app/client.js" data-repo="PKUFlyingPig/cs-self-learning" data-repo-id="R_kgDOGP67ng"
-    data-category="Announcements" data-category-id="DIC_kwDOGP67ns4COM9Q" data-mapping="title"
-    data-reactions-enabled="1" data-emit-metadata="0" data-input-position="top" data-theme="light_protanopia"
-    data-lang="zh-CN" data-loading="lazy" crossorigin="anonymous" async>
-</script>
-
-<script>
-    var palette = __get("__palette")
-    if (palette && typeof palette.color === "object") {
-        if (palette.color.scheme === "slate") {
-            const giscus = document.querySelector("script[src*=giscus]")
-            giscus.setAttribute("data-theme", "dark_protanopia")
-        }
-    }
-
-    document.addEventListener("DOMContentLoaded", function () {
-        const ref = document.querySelector("[data-md-component=palette]")
-        ref.addEventListener("change", function () {
-            var palette = __get("__palette")
-            if (palette && typeof palette.color === "object") {
-                const theme = palette.color.scheme === "slate" ? "dark_protanopia" : "light_protanopia"
-                const frame = document.querySelector(".giscus-frame")
-                frame.contentWindow.postMessage({
-                    giscus: { setConfig: { theme } }
-                }, "https://giscus.app")
-            }
-        })
-    })
-</script>
-{% endblock %}
diff --git a/overrides/partials/comments.html b/overrides/partials/comments.html
new file mode 100644
index 00000000..1a1593f7
--- /dev/null
+++ b/overrides/partials/comments.html
@@ -0,0 +1,52 @@
+<!-- Insert generated snippet here -->
+<script src="https://giscus.app/client.js"
+        data-repo="PKUFlyingPig/cs-self-learning"
+        data-repo-id="R_kgDOGP67ng"
+        data-category="Announcements"
+        data-category-id="DIC_kwDOGP67ns4COM9Q"
+        data-mapping="title"
+        data-reactions-enabled="1"
+        data-emit-metadata="0"
+        data-input-position="top"
+        data-theme="light_protanopia"
+        data-lang="zh-CN"
+        data-loading="lazy"
+        crossorigin="anonymous"
+        async>
+</script>
+
+<!-- Synchronize Giscus theme with palette -->
+<script>
+var giscus = document.querySelector("script[src*=giscus]")
+
+// Set palette on initial load
+var palette = __md_get("__palette")
+if (palette && typeof palette.color === "object") {
+    var theme = palette.color.scheme === "slate"
+    ? "dark_protanopia"
+    : "light_protanopia"
+
+    // Instruct Giscus to set theme
+    giscus.setAttribute("data-theme", theme) 
+}
+
+// Register event handlers after documented loaded
+document.addEventListener("DOMContentLoaded", function() {
+    var ref = document.querySelector("[data-md-component=palette]")
+    ref.addEventListener("change", function() {
+    var palette = __md_get("__palette")
+    if (palette && typeof palette.color === "object") {
+        var theme = palette.color.scheme === "slate"
+        ? "dark_protanopia"
+        : "light_protanopia"
+
+        // Instruct Giscus to change theme
+        var frame = document.querySelector(".giscus-frame")
+        frame.contentWindow.postMessage(
+        { giscus: { setConfig: { theme } } },
+        "https://giscus.app"
+        )
+    }
+    })
+})
+</script>
\ No newline at end of file