diff --git a/layouts/partials/head/styles-highlight.html b/layouts/partials/head/styles-highlight.html
index 403c6af..752a1d9 100644
--- a/layouts/partials/head/styles-highlight.html
+++ b/layouts/partials/head/styles-highlight.html
@@ -1,10 +1,10 @@
 {{- if .Site.Params.highlightjs -}}
 {{- if or (not (isset .Params "highlight")) (.Params.highlight) -}}
 <!-- highlightjs -->
-<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/styles/{{ .Site.Params.highlightjsstyle | default "default" }}.min.css" media="(prefers-color-scheme: light)">
+<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/styles/{{ .Site.Params.highlightjsstyle | default "default" }}.min.css" media="(prefers-color-scheme: light)">
 
 {{- if isset .Site.Params "highlightjsdarkstyle" -}}
-<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/styles/{{ .Site.Params.highlightjsdarkstyle }}.min.css" media="(prefers-color-scheme: dark)">
+<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/styles/{{ .Site.Params.highlightjsdarkstyle }}.min.css" media="(prefers-color-scheme: dark)">
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html
index db936a6..5ac7a95 100644
--- a/layouts/partials/highlight-js.html
+++ b/layouts/partials/highlight-js.html
@@ -1,10 +1,10 @@
 {{- if (.Site.Params.highlightjs) -}}
 {{ if (or (not (isset .Params "highlight")) (and (isset .Params "highlight") .Params.highlight)) }}
     {{- $.Scratch.Set "hl_languages" (union (.Site.Params.highlightjslanguages) (.Params.highlightjslanguages)) -}}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/highlight.min.js" integrity="sha512-DrpaExP2d7RJqNhXB41Q/zzzQrtb6J0zfnXD5XeVEWE8d9Hj54irCLj6dRS3eNepPja7DvKcV+9PnHC7A/g83A==" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/highlight.min.js" integrity="sha512-gU7kztaQEl7SHJyraPfZLQCNnrKdaQi5ndOyt4L4UPL/FHDd/uB9Je6KDARIqwnNNE27hnqoWLBq+Kpe4iHfeQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     {{- with $.Scratch.Get "hl_languages" -}}
         {{- range . -}}
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.1/languages/{{.}}.min.js"></script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/languages/{{.}}.min.js"></script>
         {{ end }}
     {{ end }}
     <script type="text/javascript">
diff --git a/layouts/partials/page-single/comment/giscus.html b/layouts/partials/page-single/comment/giscus.html
index 2af5eef..7a87db9 100644
--- a/layouts/partials/page-single/comment/giscus.html
+++ b/layouts/partials/page-single/comment/giscus.html
@@ -1,6 +1,6 @@
 {{- with .Site.Params.giscus }}
-  {{- if or (not .repo) (not .category) (not .categoryId) }}
-    {{- errorf "[giscus] both of repo, category and categoryId are required." }}
+  {{- if or (not .repo) (not .repoId) (not .category) (not .categoryId) }}
+    {{- errorf "[giscus] repo, repoId, category and categoryId are required." }}
   {{- end }}
   {{- $lang := default $.Site.Language.Lang }}
   <script