diff --git a/docs/.vitepress/theme/components/Analyzer.vue b/docs/.vitepress/theme/components/Analyzer.vue
index e9804e99..41003100 100644
--- a/docs/.vitepress/theme/components/Analyzer.vue
+++ b/docs/.vitepress/theme/components/Analyzer.vue
@@ -214,6 +214,9 @@ function startAnalysis(file, ext) {
         .then(function (content) {
           logAnalysis(content)
         })
+        .catch((reason) => {
+          finishAnalysis("EncryptedZipFile", reason)
+        })
     } catch (error) {
       finishAnalysis("UnzipErr", error)
     }
@@ -491,10 +494,10 @@ function logAnalysis(log) {
         matches = spilted[key].match(/'([^']+)'/g)
         missingMod.push(
           matches[0].replace(/'/g, "") +
-            " " + // Mod 名称，例如 'oculus'
-            matches[2]
-              .replace(/'/g, "")
-              .replace(/\$\{minecraft_version\}/g, "MinecraftVersion"), // Mod 版本，例如 '[1.4,)'，之后可以把最低 / 最高版本提取出来解析一遍
+          " " + // Mod 名称，例如 'oculus'
+          matches[2]
+            .replace(/'/g, "")
+            .replace(/\$\{minecraft_version\}/g, "MinecraftVersion"), // Mod 版本，例如 '[1.4,)'，之后可以把最低 / 最高版本提取出来解析一遍
         )
       }
     }
@@ -724,6 +727,16 @@ function finishAnalysis(status, msg) {
         ErrMsg: msg,
       })
       break
+
+    case "EncryptedZipFile":
+      labelMsg.value = "不支持加密 zip 文件"
+      btnMsg.value = "重新上传"
+      umami.track("Analysis Error", {
+        Status: "Cannot_Load_Encrypted_Log_File",
+        ErrMsg: msg,
+      })
+      break
+
     case "ErrOpenRstPage":
       umami.track("Analysis Error", {
         Status: "Cannot_Redirect_To_Resolution",
@@ -771,12 +784,8 @@ function redirectBtnClick() {
 
 <template>
   <ClientOnly>
-    <div
-      class="analyzer-main"
-      :style="{ 'background-color': analyzerBackgroundColor }"
-      @dragenter.prevent="handleDragEnter"
-      @dragover.prevent="handleDragOver"
-      @drop.prevent="handleDrop"
+    <div class="analyzer-main" :style="{ 'background-color': analyzerBackgroundColor }"
+      @dragenter.prevent="handleDragEnter" @dragover.prevent="handleDragOver" @drop.prevent="handleDrop"
       @dragleave.prevent="handleDragLeave">
       <h4 style="text-align: center">
         请点击按钮上传导出的 .zip/.txt/.log 文件, 并尽量不要更改导出文件的名称。
@@ -786,19 +795,11 @@ function redirectBtnClick() {
         <h4 class="file-uploader-label" for="file-uploader" singleLine="false">
           {{ labelMsg }}
         </h4>
-        <button
-          :disabled="isBtnDisabled"
-          class="file-uploader-btn"
-          data-umami-event="Analysis Button Click"
+        <button :disabled="isBtnDisabled" class="file-uploader-btn" data-umami-event="Analysis Button Click"
           @click="fileUploader.click()">
           {{ btnMsg }}
         </button>
-        <input
-          ref="fileUploader"
-          type="file"
-          name="file_uploader"
-          id="file-uploader"
-          @change="checkfiles"
+        <input ref="fileUploader" type="file" name="file_uploader" id="file-uploader" @change="checkfiles"
           style="display: none" />
       </div>
       <Transition name="analysis-result">
diff --git a/docs/.vitepress/theme/components/Comment.vue b/docs/.vitepress/theme/components/Comment.vue
deleted file mode 100644
index d648798e..00000000
--- a/docs/.vitepress/theme/components/Comment.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <ClientOnly>
-    <div class="comments">
-      <component
-        v-if="showComment"
-        src="https://giscus.app/client.js"
-        :is="'script'"
-        :key="title"
-        :data-repo="giscusConfig.repo"
-        :data-repo-id="giscusConfig.repoId"
-        :data-category="giscusConfig.category"
-        :data-category-id="giscusConfig.categoryId"
-        :data-mapping="giscusConfig.mapping"
-        :data-strict="giscusConfig.strict"
-        :data-reactions-enabled="giscusConfig.reactionsEnabled"
-        :data-emit-metadata="giscusConfig.emitMetadata"
-        :data-input-position="giscusConfig.inputPosition"
-        :data-lang="giscusConfig.lang"
-        :data-theme="giscusConfig.theme"
-        :data-loading="giscusConfig.loading" />
-    </div>
-  </ClientOnly>
-</template>
-<script lang="ts" setup>
-import { useData, useRoute } from "vitepress"
-import { reactive, ref, watch } from "vue"
-
-const route = useRoute()
-
-const { title } = useData()
-
-// params generate in https://giscus.app/zh-CN
-const giscusConfig = reactive({
-  repo: "GlobeMC/crashmc.com",
-  repoId: "R_kgDOKBR8xw",
-  category: "Giscus",
-  categoryId: "DIC_kwDOKBR8x84CYOmB",
-  mapping: "title",
-  strict: "0",
-  reactionsEnabled: "1",
-  emitMetadata: "0",
-  inputPosition: "top",
-  theme: "preferred_color_scheme",
-  lang: "zh-CN",
-  loading: "lazy",
-})
-
-const showComment = ref(true)
-watch(
-  () => route.path,
-  () => {
-    showComment.value = false
-    setTimeout(() => {
-      showComment.value = true
-    }, 200)
-  },
-  {
-    immediate: true,
-  },
-)
-</script>
-<style>
-/* // TODO 使用giscus自定义主题结合vitepress主题切换 */
-.comments {
-  margin-top: 20px;
-  padding: 20px;
-  border-radius: 10px;
-}
-</style>
diff --git a/docs/.vitepress/theme/index.ts b/docs/.vitepress/theme/index.ts
index 56c89a88..71ea0c08 100644
--- a/docs/.vitepress/theme/index.ts
+++ b/docs/.vitepress/theme/index.ts
@@ -1,9 +1,10 @@
 import Theme from "vitepress/theme"
 import { h } from "vue"
-import Comment from "./components/Comment.vue"
 import Contributors from "./components/Contributors.vue"
 import LauncherBadge from "./components/LauncherBadge.vue"
 import ReloadPrompt from "./components/ReloadPrompt.vue"
+import giscusTalk from "vitepress-plugin-comment-with-giscus"
+import { useData, useRoute } from "vitepress"
 import "./style.css"
 
 export default {
@@ -11,7 +12,6 @@ export default {
   Layout: () => {
     return h(Theme.Layout, null, {
       // https://vitepress.dev/guide/extending-default-theme#layout-slots
-      "doc-after": () => h(Comment),
       "doc-footer-before": () => h(Contributors),
       "layout-bottom": () => h(ReloadPrompt),
     })
@@ -19,4 +19,31 @@ export default {
   enhanceApp(ctx) {
     ctx.app.component("LauncherBadge", LauncherBadge)
   },
+  setup() {
+    // Get frontmatter and route
+    const { frontmatter } = useData()
+    const route = useRoute()
+
+    // Obtain configuration from: https://giscus.app/
+    giscusTalk(
+      {
+        repo: "GlobeMC/crashmc.com",
+        repoId: "R_kgDOKBR8xw",
+        category: "Giscus",
+        categoryId: "DIC_kwDOKBR8x84CYOmB",
+        mapping: "title",
+        strict: "0",
+        reactionsEnabled: "1",
+        emitMetadata: "0",
+        inputPosition: "top",
+        theme: "preferred_color_scheme",
+        lang: "zh-CN",
+        loading: "lazy",
+      },
+      {
+        frontmatter,
+        route,
+      },
+    )
+  },
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d414805..e5d159bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2523,6 +2523,10 @@ packages:
       object-keys: 1.1.1
     dev: true
 
+  /delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
   /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}