diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 37e9f97..dcf6c63 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -14,6 +14,10 @@ googleAnalytics:
 # Available values: en, fr, id, ja, ko, pt-br, zh-cn, es, de, nl, it
 DefaultContentLanguage: en
 
+# Set hasCJKLanguage to true if DefaultContentLanguage is in [zh-cn ja ko]
+# This will make .Summary and .WordCount behave correctly for CJK languages.
+hasCJKLanguage: false
+
 permalinks:
     post: /p/:slug/
     page: /:slug/
@@ -111,6 +115,17 @@ params:
             reactionsEnabled: 1
             emitMetadata: 0
 
+        gitalk:
+            owner: 
+            admin:  
+            repo: 
+            clientID: 
+            clientSecret: 
+        
+        cusdis:
+            host: 
+            id: 
+
     widgets:
         enabled:
             - search
@@ -176,6 +191,10 @@ related:
           weight: 200
 
 markup:
+    goldmark:
+        renderer:
+            ## Set to true if you have HTML content inside Markdown
+            unsafe: false
     tableOfContents:
         endLevel: 4
         ordered: true
diff --git a/exampleSite/content/post/rich-content/index.md b/exampleSite/content/post/rich-content/index.md
index 407c539..af8a390 100644
--- a/exampleSite/content/post/rich-content/index.md
+++ b/exampleSite/content/post/rich-content/index.md
@@ -32,3 +32,7 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
 ## Vimeo Simple Shortcode
 
 {{< vimeo_simple 48912912 >}}
+
+## bilibilibi Shortcode
+
+{{< bilibili av498363026 >}}
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 25a708a..00a8e11 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -17,23 +17,37 @@ list:
         other: Unterabschnitte
 
 article:
+    back:
+        other: Zurück
+
+    tableOfContents:
+        other: Inhaltsverzeichnis
+
     relatedContents:
         other: Verwandte Inhalte
+
     lastUpdatedOn:
         other: Zuletzt aktualisiert am
 
+    readingTime:
+        one: "{{ .Count }} Minute Lesezeit"
+        other: "{{ .Count }} Minuten Lesezeit"
+
 notFound:
     title:
         other: Seite nicht gefunden
+
     subtitle:
-        other: Diese Seite existiert nicht.
+        other: Diese Seite existiert nicht
 
 widget:
     archives:
         title:
             other: Archiv
+
         more:
             other: Weitere
+
     tagCloud:
         title:
             other: Schlagwörter
@@ -41,13 +55,16 @@ widget:
 search:
     title:
         other: Suche
+
     placeholder:
         other: Etwas tippen...
+
     resultTitle:
-        other: "#PAGES_COUNT pages (#TIME_SECONDS seconds)"
+        other: "#PAGES_COUNT Seiten (#TIME_SECONDS Sekunden)"
 
 footer:
     builtWith:
         other: Erstellt mit {{ .Generator }}
+
     designedBy:
         other: Theme {{ .Theme }} gestaltet von {{ .DesignedBy }}
diff --git a/i18n/en.yaml b/i18n/en.yaml
index e279278..0197d89 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -30,15 +30,15 @@ article:
         other: Last updated on
 
     readingTime:
-        one: "{{ .Count }} min read"
-        ### Seems that there's no need to add 's' even if it's plural in English
-        other: "{{ .Count }} min read"
+        one: "{{ .Count }} minute read"
+        other: "{{ .Count }} minute read"
 
 notFound:
     title:
         other: Not Found
+
     subtitle:
-        other: This page does not exist.
+        other: This page does not exist
 
 widget:
     archives:
diff --git a/i18n/es.yaml b/i18n/es.yaml
index d82698b..9e1d6e1 100644
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@@ -17,14 +17,26 @@ list:
         other: Subsecciones
 
 article:
+    back:
+        other: Volver
+
+    tableOfContents:
+        other: Tabla de contenido
+
     relatedContents:
         other: Contenidos relacionados
+
     lastUpdatedOn:
         other: Última vez actualizado
 
+    readingTime:
+        one: "{{ .Count }} minuto a leer"
+        other: "{{ .Count }} minutos a leer"
+
 notFound:
     title:
         other: No Encontrado
+
     subtitle:
         other: Esta página no existe
 
@@ -32,8 +44,10 @@ widget:
     archives:
         title:
             other: Archivo
+
         more:
             other: Más
+
     tagCloud:
         title:
             other: Etiquetas
@@ -41,13 +55,16 @@ widget:
 search:
     title:
         other: Búsqueda
+
     placeholder:
         other: Teclea algo...
+
     resultTitle:
         other: "#PAGES_COUNT páginas en (#TIME_SECONDS segundos)"
 
 footer:
     builtWith:
         other: Creado con {{ .Generator }}
+
     designedBy:
         other: Tema {{ .Theme }} diseñado por {{ .DesignedBy }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bca4469..8b21c52 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -17,7 +17,7 @@
 
     {{ partial "article/components/related-contents" . }}
      
-    {{ if or (not (isset .Params "comments")) (eq .Params.comments "true")}} 
+    {{ if not (eq .Params.comments false) }}
         {{ partial "comments/include" . }}
     {{ end }}
 
@@ -54,4 +54,4 @@
             </section>
         </aside>
     {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/comments/provider/cusdis.html b/layouts/partials/comments/provider/cusdis.html
new file mode 100644
index 0000000..71863f3
--- /dev/null
+++ b/layouts/partials/comments/provider/cusdis.html
@@ -0,0 +1,24 @@
+<div id="cusdis_thread"
+    {{ if .Site.Params.comments.cusdis.host }}
+    data-host="{{ .Site.Params.comments.cusdis.host }}"
+    {{ else }}
+    data-host="https://cusdis.com"
+    {{ end }}
+    data-app-id="{{ .Site.Params.comments.cusdis.id }}"
+    data-page-id="{{ .File.UniqueID }}"
+    data-page-url="{{ .Permalink }}"
+    data-page-title="{{ .Title }}"></div>
+<script async defer src="https://cusdis.com/js/cusdis.es.js"></script>
+
+<script>
+    function setCusdisTheme(theme) {
+        let cusdis = document.querySelector('#cusdis_thread iframe');
+        if (cusdis) {
+            window.CUSDIS.setTheme(theme)
+        }
+    }
+
+    window.addEventListener('onColorSchemeChange', (e) => {
+        setCusdisTheme(e.detail)
+    })
+</script>
\ No newline at end of file
diff --git a/layouts/partials/comments/provider/gitalk.html b/layouts/partials/comments/provider/gitalk.html
new file mode 100644
index 0000000..95ca133
--- /dev/null
+++ b/layouts/partials/comments/provider/gitalk.html
@@ -0,0 +1,30 @@
+{{- with .Site.Params.comments.gitalk -}}
+<div id="gitalk-container"></div>
+<link
+    rel="stylesheet"
+    href="https://cdn.jsdelivr.net/npm/gitalk@1.7.2/dist/gitalk.css"
+/>
+<script src="https://cdn.jsdelivr.net/npm/gitalk@1.7.2/dist/gitalk.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.18.0/js/md5.min.js"></script>
+<script>
+    const gitalk = new Gitalk({
+        clientID: "{{- .clientID -}}",
+        clientSecret: "{{- .clientSecret -}}",
+        repo: "{{- .repo -}}",
+        owner: "{{- .owner -}}",
+        admin: ["{{- .admin -}}"],
+        distractionFreeMode: false, // Facebook-like distraction free mode
+        id: md5(location.pathname), // Max Location.pathname Legth:75  https://github.com/gitalk/gitalk/issues/102
+    });
+    (function () {
+        if (
+            ["localhost", "127.0.0.1"].indexOf(window.location.hostname) != -1
+        ) {
+            document.getElementById("gitalk-container").innerHTML =
+                "Gitalk comments not available by default when the website is previewed locally.";
+            return;
+        }
+        gitalk.render("gitalk-container");
+    })();
+</script>
+{{ end }}
diff --git a/layouts/shortcodes/bilibili.html b/layouts/shortcodes/bilibili.html
index 602406c..cb72e43 100644
--- a/layouts/shortcodes/bilibili.html
+++ b/layouts/shortcodes/bilibili.html
@@ -13,7 +13,7 @@
 {{ end }}
 
 <div class="video-wrapper">
-    <iframe src="//player.bilibili.com/player.html?{{ $basicQuery | safeURL }}&{{ $videoQuery | safeURL }}"
+    <iframe src="https://player.bilibili.com/player.html?{{ $basicQuery | safeURL }}&{{ $videoQuery | safeURL }}"
             scrolling="no"
             frameborder="no"
             framespacing="0"
diff --git a/layouts/shortcodes/tencent.html b/layouts/shortcodes/tencent.html
index baf5f3c..463dec5 100644
--- a/layouts/shortcodes/tencent.html
+++ b/layouts/shortcodes/tencent.html
@@ -1,6 +1,6 @@
 {{ $vid := .Get 0 }}
 <div class="video-wrapper">
-    <iframe src="http://v.qq.com/txp/iframe/player.html?vid={{ $vid }}&auto=0" 
+    <iframe src="https://v.qq.com/txp/iframe/player.html?vid={{ $vid }}&auto=0" 
             scrolling="no" 
             frameborder="no"
             framespacing="0" 
diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html
index 733761a..5324754 100644
--- a/layouts/shortcodes/video.html
+++ b/layouts/shortcodes/video.html
@@ -1,13 +1,14 @@
+{{- $src := .Get "src" | default (.Get 0) -}}
 <div class="video-wrapper">
     <video
     controls
+    src="{{- $src -}}"
     {{ with .Get "poster" }}poster="{{- . -}}"{{ end }}
-    {{ with .Get "src" }}src="{{- . -}}"{{ end }}
     {{ with .Get "autoplay" }}autoplay{{ end }}
     >
         <p>
             Your browser doesn't support HTML5 video. Here is a
-            <a href="{{ with .Get "src" }}{{- . -}}{{ end }}">link to the video</a> instead.
+            <a href="{{- $src -}}">link to the video</a> instead.
         </p>
     </video>
 </div>
diff --git a/theme.toml b/theme.toml
index e4c928e..2b9b841 100644
--- a/theme.toml
+++ b/theme.toml
@@ -6,7 +6,7 @@ license = "GPL-3.0-only"
 licenselink = "https://github.com/CaiJimmy/hugo-theme-stack/blob/master/LICENSE"
 description = "Card-style Hugo theme designed for bloggers"
 homepage = "https://github.com/CaiJimmy/hugo-theme-stack"
-demosite = "https://theme-stack.jimmycai.com"
+demosite = "https://demo.stack.jimmycai.com"
 
 tags = ["blog", "responsive", "clean", "light", "dark", "personal"]