diff --git a/assets/scss/partials/article.scss b/assets/scss/partials/article.scss
index 2c3a7af..e2c05a4 100644
--- a/assets/scss/partials/article.scss
+++ b/assets/scss/partials/article.scss
@@ -54,6 +54,7 @@
 }
 
 .article-title {
+    font-family: var(--article-font-family);
     font-weight: 600;
     margin: 0;
     color: var(--card-text-color-main);
diff --git a/assets/scss/partials/highlight/common.scss b/assets/scss/partials/highlight/common.scss
index c9b70bb..c680fa4 100644
--- a/assets/scss/partials/highlight/common.scss
+++ b/assets/scss/partials/highlight/common.scss
@@ -55,6 +55,7 @@
     margin-right: 0.4em;
     padding: 0 0.4em 0 0.4em;
     color: #7f7f7f;
+    display: block;
 }
 
 /* LineNumbers */
diff --git a/assets/scss/partials/layout/article.scss b/assets/scss/partials/layout/article.scss
index 73757e4..695d656 100644
--- a/assets/scss/partials/layout/article.scss
+++ b/assets/scss/partials/layout/article.scss
@@ -33,6 +33,10 @@
             margin: var(--card-padding) 0;
             color: var(--card-text-color-main);
 
+            .footnotes {
+                font-family: var(--base-font-family);
+            }
+
             img {
                 max-width: 100%;
                 height: auto;
diff --git a/assets/scss/partials/menu.scss b/assets/scss/partials/menu.scss
index 4f29c9f..281dc3a 100644
--- a/assets/scss/partials/menu.scss
+++ b/assets/scss/partials/menu.scss
@@ -176,8 +176,8 @@
         }
 
         svg {
+            stroke: currentColor;
             stroke-width: 1.33;
-
             width: 20px;
             height: 20px;
         }
diff --git a/assets/scss/variables.scss b/assets/scss/variables.scss
index 6709f0c..97810a1 100644
--- a/assets/scss/variables.scss
+++ b/assets/scss/variables.scss
@@ -44,7 +44,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
     --zh-font-family: "PingFang SC", "Hiragino Sans GB", "Droid Sans Fallback", "Microsoft YaHei";
 
     --base-font-family: "Lato", var(--sys-font-family), var(--zh-font-family), sans-serif;
-    --code-font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    --code-font-family: Menlo, Monaco, Consolas, "Courier New", var(--zh-font-family), monospace;
 }
 
 /*
diff --git a/config.yaml b/config.yaml
index fafd340..ece0ecb 100644
--- a/config.yaml
+++ b/config.yaml
@@ -51,6 +51,12 @@ params:
             issueTerm: pathname
             label:
 
+        beaudar:
+            repo:
+            issueTerm: pathname
+            label:
+            theme:        
+
         remark42:
             host:
             site:
@@ -64,7 +70,7 @@ params:
             clientSecret:
             autoCreateIssue: false
 
-        # Waline client configuration see: https://waline.js.org/en/reference/client.html
+        # Waline client configuration see: https://waline.js.org/en/reference/client/props.html
         waline:
             serverURL:
             lang:
@@ -75,9 +81,9 @@ params:
             requiredMeta:
                 - nick
                 - mail
-            placeholder:
             locale:
                 admin: Admin
+                placeholder:
 
         twikoo:
             envId:
diff --git a/exampleSite/README.md b/exampleSite/README.md
index 1b6d403..dbaf5e5 100644
--- a/exampleSite/README.md
+++ b/exampleSite/README.md
@@ -1 +1,3 @@
-Example site modified from https://github.com/gohugoio/hugoBasicExample
\ No newline at end of file
+This is an example site used for solely for testing purposes. **It is not meant to be used as a template for your site**. 
+
+To create a new site, please use the starter template: [CaiJimmy/hugo-theme-stack-starter](https://github.com/CaiJimmy/hugo-theme-stack-starter/)
\ No newline at end of file
diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index b723dea..d8c02fe 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -1,10 +1,18 @@
 baseurl: https://example.com
 languageCode: en-us
 theme: hugo-theme-stack
-paginate: 5
+paginate: 3
 title: Example Site
 copyright: Example Person
 
+# Theme i18n support
+# Available values: ar, bn, ca, de, el, en, es, fr, hu, id, it, ja, ko, nl, pt-br, th, uk, zh-cn, zh-hk, zh-tw
+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
+
 languages:
     en:
         languageName: English
@@ -26,19 +34,13 @@ languages:
         params:
             description: وصف تجريبي
 
-# Change it to your Disqus shortname before using
-disqusShortname: hugo-theme-stack
-
-# GA Tracking ID
-googleAnalytics:
-
-# Theme i18n support
-# Available values: ar, bn, ca, de, el, en, es, fr, hu, id, it, ja, ko, nl, pt-br, th, uk, zh-cn, zh-hk, zh-tw
-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
+services:
+    # Change it to your Disqus shortname before using
+    disqus:
+        shortname: "hugo-theme-stack"
+    # GA Tracking ID
+    googleAnalytics:
+        id:
 
 permalinks:
     post: /p/:slug/
@@ -49,7 +51,7 @@ params:
         - post
     featuredImageField: image
     rssFullContent: true
-    favicon:  # e.g.: favicon placed in `static/favicon.ico` of your site folder, then set this field to `/favicon.ico` (`/` is necessary)
+    favicon: # e.g.: favicon placed in `static/favicon.ico` of your site folder, then set this field to `/favicon.ico` (`/` is necessary)
 
     footer:
         since: 2020
@@ -91,6 +93,12 @@ params:
             issueTerm: pathname
             label:
 
+        beaudar:
+            repo:
+            issueTerm: pathname
+            label:
+            theme:        
+
         remark42:
             host:
             site:
diff --git a/i18n/be.yaml b/i18n/be.yaml
new file mode 100644
index 0000000..605cd08
--- /dev/null
+++ b/i18n/be.yaml
@@ -0,0 +1,72 @@
+toggleMenu:
+    other: Паказаць/схаваць меню
+
+darkMode:
+    other: Цёмны рэжым
+
+list:
+    page:
+        one: "{{ .Count }} старонка"
+        few: "{{ .Count }} старонкі"
+        many: "{{ .Count }} старонак"
+        other: "{{ .Count }} старонкі"
+
+    section:
+        other: Раздзел
+
+    subsection:
+        one: Падраздзел
+        few: Падраздзелы
+        many: Падраздзелы
+        other: Падраздзелы
+
+article:
+    back:
+        other: Назад
+
+    relatedContent:
+        other: Таксама рэкамендуем
+
+    lastUpdatedOn:
+        other: Абноўлена
+
+    tableOfContents: 
+        other: Змест
+
+    readingTime: 
+        other: "Час чытання: {{ .Count }} хв."
+
+notFound:
+    title:
+        other: Не знойдзена
+
+    subtitle:
+        other: Запытваемая старонка не існуе
+
+widget:
+    archives:
+        title:
+            other: Архівы
+        more:
+            other: Яшчэ
+
+    tagCloud:
+        title:
+            other: Тэгі
+
+search:
+    title:
+        other: Пошук
+
+    placeholder:
+        other: Увядзіце нешта...
+
+    resultTitle:
+        other: "Знайдзена #PAGES_COUNT старонак (за #TIME_SECONDS с.)"
+
+footer:
+    builtWith:
+        other: Створана пры дапамозе {{ .Generator }}
+
+    designedBy:
+        other: Тэма {{ .Theme }}, дызайн {{ .DesignedBy }}
diff --git a/i18n/es.yaml b/i18n/es.yaml
index 76995da..6b4b3af 100644
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@@ -1,5 +1,5 @@
 toggleMenu:
-    other: Toggle Menu
+    other: Ocultar menú
 
 darkMode:
     other: Modo oscuro
@@ -27,11 +27,11 @@ article:
         other: Contenidos relacionados
 
     lastUpdatedOn:
-        other: Última vez actualizado
+        other: Última actualización
 
     readingTime:
-        one: "{{ .Count }} minuto a leer"
-        other: "{{ .Count }} minutos a leer"
+        one: "Tiempo de lectura {{ .Count }} minuto"
+        other: "Tiempo de lectura {{ .Count }} minutos"
 
 notFound:
     title:
@@ -60,7 +60,7 @@ search:
         other: Búsqueda
 
     placeholder:
-        other: Teclea algo...
+        other: Escribe algo...
 
     resultTitle:
         other: "#PAGES_COUNT páginas en (#TIME_SECONDS segundos)"
diff --git a/i18n/hi.yaml b/i18n/hi.yaml
new file mode 100644
index 0000000..27316fe
--- /dev/null
+++ b/i18n/hi.yaml
@@ -0,0 +1,73 @@
+toggleMenu:
+  other: मेनू टॉगल करें
+
+darkMode:
+  other: डार्क मोड
+
+list:
+  page:
+    one: "{{ .Count }} पेज"
+    other: "{{ .Count }} पेज"
+
+  section:
+    other: अनुभाग
+
+  subsection:
+    one: उपधारा
+    other: उपखंड
+
+article:
+  back:
+    other: पीछे
+
+  tableOfContents:
+    other: विषयसूची
+
+  relatedContent:
+    other: संबंधित सामग्री
+
+  lastUpdatedOn:
+    other: अंतिम बार अपडेट किया गया
+
+  readingTime:
+    one: "{{ .Count }} मिनट पढ़ें"
+    other: "{{ .Count }} मिनट पढ़ें"
+
+notFound:
+  title:
+    other: 404 नहीं मिला।
+
+  subtitle:
+    other: यह पृष्ठ मौजूद नहीं है।
+
+widget:
+  archives:
+    title:
+      other: अभिलेखागार
+
+    more:
+      other: अधिक
+
+  tagCloud:
+    title:
+      other: टैग
+  categoriesCloud:
+    title:
+      other: श्रेणियाँ
+
+search:
+  title:
+    other: खोज
+
+  placeholder:
+    other: कुछ लिखें...
+
+  resultTitle:
+    other: "#PAGES_COUNT पेज (#TIME_SECONDS सेकंड)"
+
+footer:
+  builtWith:
+    other: निर्मित {{ .Generator }} के साथ
+
+  designedBy:
+    other: थीम {{ .Theme }} द्वारा डिज़ाइन किया गया {{ .DesignedBy }}
diff --git a/i18n/nl.yaml b/i18n/nl.yaml
index a814232..b5bf264 100644
--- a/i18n/nl.yaml
+++ b/i18n/nl.yaml
@@ -21,6 +21,8 @@ article:
         other: Gerelateerde inhoud
     lastUpdatedOn:
         other: Laatst bijgewerkt op
+    readingTime:
+        other: "{{ .Count }} leestijd"
 
 notFound:
     title:
diff --git a/i18n/sk.yaml b/i18n/sk.yaml
new file mode 100644
index 0000000..59c680e
--- /dev/null
+++ b/i18n/sk.yaml
@@ -0,0 +1,71 @@
+toggleMenu:
+    other: Skryť menu
+
+darkMode:
+    other: Tmavý režim
+
+list:
+    page:
+        one: "{{ .Count }} stránka"
+        other: "{{ .Count }} stránok"
+
+    section:
+        other: Kategórie
+
+    subsection:
+        one: Podkategória
+        other: Podkategórie
+
+article:
+    back:
+        other: Späť
+
+    tableOfContents:
+        other: Obsah
+
+    relatedContent:
+        other: Súvisiace
+
+    lastUpdatedOn:
+        other: Naposledy aktualizované
+
+    readingTime:
+        one: "{{ .Count }} minúta"
+        other: "{{ .Count }} minút"
+
+notFound:
+    title:
+        other: Nenájdené
+
+    subtitle:
+        other: Tato stránka neexistuje
+
+widget:
+    archives:
+        title:
+            other: Archívy
+        more:
+            other: Viac
+    tagCloud:
+        title:
+            other: Štítky
+    categoriesCloud:
+        title:
+            other: Kategórie
+
+search:
+    title:
+        other: Hladať
+
+    placeholder:
+        other: Zadajte niečo...
+
+    resultTitle:
+        other: "#PAGES_COUNT stránok (#TIME_SECONDS sekúnd)"
+
+footer:
+    builtWith:
+        other: Vytvorené pomocou {{ .Generator }}
+
+    designedBy:
+        other: Šablóna {{ .Theme }} od {{ .DesignedBy }}
diff --git a/layouts/partials/comments/provider/beaudar.html b/layouts/partials/comments/provider/beaudar.html
new file mode 100644
index 0000000..761801f
--- /dev/null
+++ b/layouts/partials/comments/provider/beaudar.html
@@ -0,0 +1,46 @@
+<script
+  src="https://beaudar.lipk.org/client.js"
+  repo="{{ .Site.Params.comments.beaudar.repo }}"
+  issue-term="{{ .Site.Params.comments.beaudar.issueTerm }}"
+  {{ with .Site.Params.comments.beaudar.label }}
+  label="{{ . }}"
+  {{ end }}
+  theme="{{ .Site.Params.comments.beaudar.theme }}"
+  crossorigin="anonymous"
+  async
+></script>
+
+<style>
+  .beaudar {
+    max-width: unset;
+  }
+</style>
+
+<script>
+  let beaudarLoaded = false;
+
+  function setBeaudarTheme(theme) {
+    let beaudar = document.querySelector(".beaudar iframe");
+    if (beaudar) {
+      beaudar.contentWindow.postMessage(
+        {
+          type: "set-theme",
+          theme: `github-${theme}`,
+        },
+        "https://beaudar.lipk.org"
+      );
+    }
+  }
+
+  addEventListener("message", (event) => {
+    if (event.origin !== "https://beaudar.lipk.org") return;
+    /// Called when Beaudar is ready
+    beaudarLoaded = true;
+    setBeaudarTheme(document.documentElement.dataset.scheme);
+  });
+
+  window.addEventListener("onColorSchemeChange", (e) => {
+    if (!beaudarLoaded) return;
+    setBeaudarTheme(e.detail);
+  });
+</script>
diff --git a/layouts/partials/comments/provider/twikoo.html b/layouts/partials/comments/provider/twikoo.html
index 182500b..53830dd 100644
--- a/layouts/partials/comments/provider/twikoo.html
+++ b/layouts/partials/comments/provider/twikoo.html
@@ -1,4 +1,4 @@
-<script src="//cdn.jsdelivr.net/npm/twikoo@1.6.11/dist/twikoo.all.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/twikoo@1.6.21/dist/twikoo.all.min.js"></script>
 <div id="tcomment"></div>
 <style>
     .twikoo {
@@ -13,7 +13,9 @@
     }
     .twikoo .el-input-group__prepend,
     .twikoo .tk-action-icon,
+    .twikoo .tk-submit-action-icon,
     .twikoo .tk-time,
+    .twikoo .tk-comments-no,
     .twikoo .tk-comments-count {
         color: var(--twikoo-body-text-color);
     }
@@ -28,6 +30,9 @@
     .twikoo .el-button{
         color: var(--twikoo-body-text-color)!important;
     }
+    .twikoo .el-input__count {
+        color: var(--twikoo-body-text-color) !important;
+    }
     .OwO .OwO-body {
         background-color: var(--body-background) !important;
         color: var(--body-text-color) !important;
diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html
index ade2f7b..4b9d26e 100644
--- a/layouts/partials/footer/footer.html
+++ b/layouts/partials/footer/footer.html
@@ -1,4 +1,4 @@
-{{- $ThemeVersion := "3.19.0" -}}
+{{- $ThemeVersion := "3.23.0" -}}
 <footer class="site-footer">
     <section class="copyright">
         &copy; 
diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html
index be63710..c809636 100644
--- a/layouts/partials/head/head.html
+++ b/layouts/partials/head/head.html
@@ -5,7 +5,7 @@
 <meta name='description' content='{{ $description }}'>
 {{ with .Params.Keywords }}<meta name="keywords" content="{{ delimit . ", " }}">{{ end }}
 
-{{- $title := partialCached "data/title" . .RelPermalink -}}
+{{- $title := partial "data/title" . -}}
 <title>{{ $title }}</title>
 
 <link rel='canonical' href='{{ .Permalink }}'>
diff --git a/layouts/partials/sidebar/left.html b/layouts/partials/sidebar/left.html
index 32e5a12..3aed883 100644
--- a/layouts/partials/sidebar/left.html
+++ b/layouts/partials/sidebar/left.html
@@ -74,20 +74,23 @@
             </a>
         </li>
         {{ end }}
-
-        <div class="menu-bottom-section">
+    </ol>
+    <div class="menu-bottom-section">
+        <ol class="menu">
             {{- $currentLanguageCode := .Language.Lang -}}
-            {{ with .Site.Home.AllTranslations }}
-                <li id="i18n-switch">  
-                    {{ partial "helper/icon" "language" }}
-                    <select name="language" onchange="window.location.href = this.selectedOptions[0].value">
-                        {{ range . }}
-                            <option value="{{ .Permalink }}" {{ if eq .Language.Lang $currentLanguageCode }}selected{{ end }}>{{ .Language.LanguageName }}</option>
-                        {{ end }}
-                    </select>
-                </li>
+            {{ if ( compare.Gt .Site.Home.AllTranslations.Len 1 ) }}
+                {{ with .Site.Home.AllTranslations }}
+                    <li id="i18n-switch">  
+                        {{ partial "helper/icon" "language" }}
+                        <select name="language" title="language" onchange="window.location.href = this.selectedOptions[0].value">
+                            {{ range . }}
+                                <option value="{{ .Permalink }}" {{ if eq .Language.Lang $currentLanguageCode }}selected{{ end }}>{{ .Language.LanguageName }}</option>
+                            {{ end }}
+                        </select>
+                    </li>
+                {{ end }}
             {{ end }}
-            
+
             {{ if (default false .Site.Params.colorScheme.toggle) }}
                 <li id="dark-mode-toggle">
                     {{ partial "helper/icon" "toggle-left" }}
@@ -95,6 +98,6 @@
                     <span>{{ T "darkMode" }}</span>
                 </li>
             {{ end }}
-        </div>
-    </ol>
+        </ol>
+    </div>
 </aside>
diff --git a/layouts/partials/sidebar/right.html b/layouts/partials/sidebar/right.html
index d2a6ae8..6333f10 100644
--- a/layouts/partials/sidebar/right.html
+++ b/layouts/partials/sidebar/right.html
@@ -4,7 +4,10 @@
     <aside class="sidebar right-sidebar sticky">
         {{ range $widget := . }}
             {{ if templates.Exists (printf "partials/widget/%s.html" .type) }}
-                {{ partial (printf "widget/%s" .type) (dict "Context" $context "Params" .params) }}
+                <!-- Ensure that the `params` is not nil -->
+                {{- $params := default dict .params -}}
+
+                {{ partial (printf "widget/%s" .type) (dict "Context" $context "Params" $params) }}
             {{ else }}
                 {{ warnf "Widget %s not found" .type }}
             {{ end }}