diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_markup/render-heading.html
similarity index 100%
rename from layouts/_default/_markup/render-heading.html
rename to layouts/_markup/render-heading.html
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_markup/render-image.html
similarity index 100%
rename from layouts/_default/_markup/render-image.html
rename to layouts/_markup/render-image.html
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_markup/render-link.html
similarity index 100%
rename from layouts/_default/_markup/render-link.html
rename to layouts/_markup/render-link.html
diff --git a/layouts/partials/article-list/compact.html b/layouts/_partials/article-list/compact.html
similarity index 100%
rename from layouts/partials/article-list/compact.html
rename to layouts/_partials/article-list/compact.html
diff --git a/layouts/partials/article-list/default.html b/layouts/_partials/article-list/default.html
similarity index 100%
rename from layouts/partials/article-list/default.html
rename to layouts/_partials/article-list/default.html
diff --git a/layouts/partials/article-list/tile.html b/layouts/_partials/article-list/tile.html
similarity index 100%
rename from layouts/partials/article-list/tile.html
rename to layouts/_partials/article-list/tile.html
diff --git a/layouts/partials/article/article.html b/layouts/_partials/article/article.html
similarity index 100%
rename from layouts/partials/article/article.html
rename to layouts/_partials/article/article.html
diff --git a/layouts/partials/article/components/content.html b/layouts/_partials/article/components/content.html
similarity index 100%
rename from layouts/partials/article/components/content.html
rename to layouts/_partials/article/components/content.html
diff --git a/layouts/partials/article/components/details.html b/layouts/_partials/article/components/details.html
similarity index 100%
rename from layouts/partials/article/components/details.html
rename to layouts/_partials/article/components/details.html
diff --git a/layouts/partials/article/components/footer.html b/layouts/_partials/article/components/footer.html
similarity index 100%
rename from layouts/partials/article/components/footer.html
rename to layouts/_partials/article/components/footer.html
diff --git a/layouts/partials/article/components/header.html b/layouts/_partials/article/components/header.html
similarity index 100%
rename from layouts/partials/article/components/header.html
rename to layouts/_partials/article/components/header.html
diff --git a/layouts/partials/article/components/links.html b/layouts/_partials/article/components/links.html
similarity index 100%
rename from layouts/partials/article/components/links.html
rename to layouts/_partials/article/components/links.html
diff --git a/layouts/partials/article/components/math.html b/layouts/_partials/article/components/math.html
similarity index 100%
rename from layouts/partials/article/components/math.html
rename to layouts/_partials/article/components/math.html
diff --git a/layouts/partials/article/components/photoswipe.html b/layouts/_partials/article/components/photoswipe.html
similarity index 100%
rename from layouts/partials/article/components/photoswipe.html
rename to layouts/_partials/article/components/photoswipe.html
diff --git a/layouts/partials/article/components/related-content.html b/layouts/_partials/article/components/related-content.html
similarity index 100%
rename from layouts/partials/article/components/related-content.html
rename to layouts/_partials/article/components/related-content.html
diff --git a/layouts/partials/article/components/tags.html b/layouts/_partials/article/components/tags.html
similarity index 100%
rename from layouts/partials/article/components/tags.html
rename to layouts/_partials/article/components/tags.html
diff --git a/layouts/partials/comments/include.html b/layouts/_partials/comments/include.html
similarity index 100%
rename from layouts/partials/comments/include.html
rename to layouts/_partials/comments/include.html
diff --git a/layouts/partials/comments/provider/beaudar.html b/layouts/_partials/comments/provider/beaudar.html
similarity index 100%
rename from layouts/partials/comments/provider/beaudar.html
rename to layouts/_partials/comments/provider/beaudar.html
diff --git a/layouts/partials/comments/provider/cactus.html b/layouts/_partials/comments/provider/cactus.html
similarity index 100%
rename from layouts/partials/comments/provider/cactus.html
rename to layouts/_partials/comments/provider/cactus.html
diff --git a/layouts/partials/comments/provider/cusdis.html b/layouts/_partials/comments/provider/cusdis.html
similarity index 100%
rename from layouts/partials/comments/provider/cusdis.html
rename to layouts/_partials/comments/provider/cusdis.html
diff --git a/layouts/partials/comments/provider/disqus.html b/layouts/_partials/comments/provider/disqus.html
similarity index 100%
rename from layouts/partials/comments/provider/disqus.html
rename to layouts/_partials/comments/provider/disqus.html
diff --git a/layouts/partials/comments/provider/disqusjs.html b/layouts/_partials/comments/provider/disqusjs.html
similarity index 100%
rename from layouts/partials/comments/provider/disqusjs.html
rename to layouts/_partials/comments/provider/disqusjs.html
diff --git a/layouts/partials/comments/provider/giscus.html b/layouts/_partials/comments/provider/giscus.html
similarity index 100%
rename from layouts/partials/comments/provider/giscus.html
rename to layouts/_partials/comments/provider/giscus.html
diff --git a/layouts/partials/comments/provider/gitalk.html b/layouts/_partials/comments/provider/gitalk.html
similarity index 100%
rename from layouts/partials/comments/provider/gitalk.html
rename to layouts/_partials/comments/provider/gitalk.html
diff --git a/layouts/partials/comments/provider/remark42.html b/layouts/_partials/comments/provider/remark42.html
similarity index 100%
rename from layouts/partials/comments/provider/remark42.html
rename to layouts/_partials/comments/provider/remark42.html
diff --git a/layouts/partials/comments/provider/twikoo.html b/layouts/_partials/comments/provider/twikoo.html
similarity index 100%
rename from layouts/partials/comments/provider/twikoo.html
rename to layouts/_partials/comments/provider/twikoo.html
diff --git a/layouts/partials/comments/provider/utterances.html b/layouts/_partials/comments/provider/utterances.html
similarity index 100%
rename from layouts/partials/comments/provider/utterances.html
rename to layouts/_partials/comments/provider/utterances.html
diff --git a/layouts/partials/comments/provider/vssue.html b/layouts/_partials/comments/provider/vssue.html
similarity index 100%
rename from layouts/partials/comments/provider/vssue.html
rename to layouts/_partials/comments/provider/vssue.html
diff --git a/layouts/partials/comments/provider/waline.html b/layouts/_partials/comments/provider/waline.html
similarity index 97%
rename from layouts/partials/comments/provider/waline.html
rename to layouts/_partials/comments/provider/waline.html
index 30a09eb..a8ba8c8 100644
--- a/layouts/partials/comments/provider/waline.html
+++ b/layouts/_partials/comments/provider/waline.html
@@ -1,34 +1,34 @@
-<script src='//unpkg.com/@waline/client@v2/dist/waline.js'></script>
-<link href='//unpkg.com/@waline/client@v2/dist/waline.css' rel='stylesheet'/>
-<div id="waline" class="waline-container"></div>
-<style>
-    .waline-container {
-        background-color: var(--card-background);
-        border-radius: var(--card-border-radius);
-        box-shadow: var(--shadow-l1);
-        padding: var(--card-padding);
-        --waline-font-size: var(--article-font-size);
-    }
-    .waline-container .wl-count {
-        color: var(--card-text-color-main);
-    }
-</style>
-
-{{- with .Site.Params.comments.waline -}}
-{{- $config := dict "el" "#waline" "dark" `html[data-scheme="dark"]` -}}
-{{- $replaceKeys := dict "serverurl" "serverURL" "requiredmeta" "requiredMeta" "wordlimit" "wordLimit" "pagesize" "pageSize" "imageuploader" "imageUploader" "texrenderer" "texRenderer" "turnstilekey" "turnstileKey" -}}
-
-{{- range $key, $val := . -}}
-    {{- if ne $val nil -}}  
-        {{- $replaceKey := index $replaceKeys $key -}}
-        {{- $k := default $key $replaceKey -}}
-
-        {{- $config = merge $config (dict $k $val) -}}
-    {{- end -}}
-{{- end -}}
-
-<script>
-    /// Waline client configuration see: https://waline.js.org/en/reference/client.html
-    Waline.init({{ $config | jsonify | safeJS }});
-</script>
-{{- end -}}
+<script src='//unpkg.com/@waline/client@v2/dist/waline.js'></script>
+<link href='//unpkg.com/@waline/client@v2/dist/waline.css' rel='stylesheet'/>
+<div id="waline" class="waline-container"></div>
+<style>
+    .waline-container {
+        background-color: var(--card-background);
+        border-radius: var(--card-border-radius);
+        box-shadow: var(--shadow-l1);
+        padding: var(--card-padding);
+        --waline-font-size: var(--article-font-size);
+    }
+    .waline-container .wl-count {
+        color: var(--card-text-color-main);
+    }
+</style>
+
+{{- with .Site.Params.comments.waline -}}
+{{- $config := dict "el" "#waline" "dark" `html[data-scheme="dark"]` -}}
+{{- $replaceKeys := dict "serverurl" "serverURL" "requiredmeta" "requiredMeta" "wordlimit" "wordLimit" "pagesize" "pageSize" "imageuploader" "imageUploader" "texrenderer" "texRenderer" "turnstilekey" "turnstileKey" -}}
+
+{{- range $key, $val := . -}}
+    {{- if ne $val nil -}}  
+        {{- $replaceKey := index $replaceKeys $key -}}
+        {{- $k := default $key $replaceKey -}}
+
+        {{- $config = merge $config (dict $k $val) -}}
+    {{- end -}}
+{{- end -}}
+
+<script>
+    /// Waline client configuration see: https://waline.js.org/en/reference/client.html
+    Waline.init({{ $config | jsonify | safeJS }});
+</script>
+{{- end -}}
diff --git a/layouts/partials/data/description.html b/layouts/_partials/data/description.html
similarity index 100%
rename from layouts/partials/data/description.html
rename to layouts/_partials/data/description.html
diff --git a/layouts/partials/data/title.html b/layouts/_partials/data/title.html
similarity index 100%
rename from layouts/partials/data/title.html
rename to layouts/_partials/data/title.html
diff --git a/layouts/partials/footer/components/custom-font.html b/layouts/_partials/footer/components/custom-font.html
similarity index 100%
rename from layouts/partials/footer/components/custom-font.html
rename to layouts/_partials/footer/components/custom-font.html
diff --git a/layouts/partials/footer/components/script.html b/layouts/_partials/footer/components/script.html
similarity index 100%
rename from layouts/partials/footer/components/script.html
rename to layouts/_partials/footer/components/script.html
diff --git a/layouts/partials/footer/custom.html b/layouts/_partials/footer/custom.html
similarity index 100%
rename from layouts/partials/footer/custom.html
rename to layouts/_partials/footer/custom.html
diff --git a/layouts/partials/footer/footer.html b/layouts/_partials/footer/footer.html
similarity index 100%
rename from layouts/partials/footer/footer.html
rename to layouts/_partials/footer/footer.html
diff --git a/layouts/partials/footer/include.html b/layouts/_partials/footer/include.html
similarity index 100%
rename from layouts/partials/footer/include.html
rename to layouts/_partials/footer/include.html
diff --git a/layouts/partials/head/colorScheme.html b/layouts/_partials/head/colorScheme.html
similarity index 100%
rename from layouts/partials/head/colorScheme.html
rename to layouts/_partials/head/colorScheme.html
diff --git a/layouts/partials/head/custom.html b/layouts/_partials/head/custom.html
similarity index 100%
rename from layouts/partials/head/custom.html
rename to layouts/_partials/head/custom.html
diff --git a/layouts/partials/head/head.html b/layouts/_partials/head/head.html
similarity index 100%
rename from layouts/partials/head/head.html
rename to layouts/_partials/head/head.html
diff --git a/layouts/partials/head/opengraph/include.html b/layouts/_partials/head/opengraph/include.html
similarity index 100%
rename from layouts/partials/head/opengraph/include.html
rename to layouts/_partials/head/opengraph/include.html
diff --git a/layouts/partials/head/opengraph/provider/base.html b/layouts/_partials/head/opengraph/provider/base.html
similarity index 100%
rename from layouts/partials/head/opengraph/provider/base.html
rename to layouts/_partials/head/opengraph/provider/base.html
diff --git a/layouts/partials/head/opengraph/provider/twitter.html b/layouts/_partials/head/opengraph/provider/twitter.html
similarity index 100%
rename from layouts/partials/head/opengraph/provider/twitter.html
rename to layouts/_partials/head/opengraph/provider/twitter.html
diff --git a/layouts/partials/head/script.html b/layouts/_partials/head/script.html
similarity index 100%
rename from layouts/partials/head/script.html
rename to layouts/_partials/head/script.html
diff --git a/layouts/partials/head/style.html b/layouts/_partials/head/style.html
similarity index 100%
rename from layouts/partials/head/style.html
rename to layouts/_partials/head/style.html
diff --git a/layouts/partials/helper/external.html b/layouts/_partials/helper/external.html
similarity index 100%
rename from layouts/partials/helper/external.html
rename to layouts/_partials/helper/external.html
diff --git a/layouts/partials/helper/icon.html b/layouts/_partials/helper/icon.html
similarity index 100%
rename from layouts/partials/helper/icon.html
rename to layouts/_partials/helper/icon.html
diff --git a/layouts/partials/helper/image.html b/layouts/_partials/helper/image.html
similarity index 100%
rename from layouts/partials/helper/image.html
rename to layouts/_partials/helper/image.html
diff --git a/layouts/partials/pagination.html b/layouts/_partials/pagination.html
similarity index 100%
rename from layouts/partials/pagination.html
rename to layouts/_partials/pagination.html
diff --git a/layouts/partials/sidebar/left.html b/layouts/_partials/sidebar/left.html
similarity index 100%
rename from layouts/partials/sidebar/left.html
rename to layouts/_partials/sidebar/left.html
diff --git a/layouts/partials/sidebar/right.html b/layouts/_partials/sidebar/right.html
similarity index 100%
rename from layouts/partials/sidebar/right.html
rename to layouts/_partials/sidebar/right.html
diff --git a/layouts/partials/widget/archives.html b/layouts/_partials/widget/archives.html
similarity index 100%
rename from layouts/partials/widget/archives.html
rename to layouts/_partials/widget/archives.html
diff --git a/layouts/partials/widget/categories.html b/layouts/_partials/widget/categories.html
similarity index 100%
rename from layouts/partials/widget/categories.html
rename to layouts/_partials/widget/categories.html
diff --git a/layouts/partials/widget/search.html b/layouts/_partials/widget/search.html
similarity index 100%
rename from layouts/partials/widget/search.html
rename to layouts/_partials/widget/search.html
diff --git a/layouts/partials/widget/tag-cloud.html b/layouts/_partials/widget/tag-cloud.html
similarity index 100%
rename from layouts/partials/widget/tag-cloud.html
rename to layouts/_partials/widget/tag-cloud.html
diff --git a/layouts/partials/widget/toc.html b/layouts/_partials/widget/toc.html
similarity index 100%
rename from layouts/partials/widget/toc.html
rename to layouts/_partials/widget/toc.html
diff --git a/layouts/shortcodes/bilibili.html b/layouts/_shortcodes/bilibili.html
similarity index 97%
rename from layouts/shortcodes/bilibili.html
rename to layouts/_shortcodes/bilibili.html
index cb72e43..d300f35 100644
--- a/layouts/shortcodes/bilibili.html
+++ b/layouts/_shortcodes/bilibili.html
@@ -1,23 +1,23 @@
-{{ $vid := (.Get 0) }}
-{{ $videopage := default 1 (.Get 1) }}
-{{ $basicQuery := querify "page" $videopage "high_quality" 1 "as_wide" 1 }}
-{{ $videoQuery := "" }}
-
-{{ if strings.HasPrefix (lower $vid) "av" }}
-    {{ $videoQuery = querify "aid" (strings.TrimPrefix "av" (lower $vid)) }}
-{{ else if strings.HasPrefix (lower $vid) "bv" }}
-    {{ $videoQuery = querify "bvid" $vid }}
-{{ else }}
-    <p>Bilibili 视频av号或BV号错误！请检查视频av号或BV号是否正确</p>
-    <p>当前视频av或BV号：{{ $vid }}，视频分P：{{ $videopage }}</p>
-{{ end }}
-
-<div class="video-wrapper">
-    <iframe src="https://player.bilibili.com/player.html?{{ $basicQuery | safeURL }}&{{ $videoQuery | safeURL }}"
-            scrolling="no"
-            frameborder="no"
-            framespacing="0"
-            allowfullscreen="true"
-    >
-    </iframe>
-</div>
+{{ $vid := (.Get 0) }}
+{{ $videopage := default 1 (.Get 1) }}
+{{ $basicQuery := querify "page" $videopage "high_quality" 1 "as_wide" 1 }}
+{{ $videoQuery := "" }}
+
+{{ if strings.HasPrefix (lower $vid) "av" }}
+    {{ $videoQuery = querify "aid" (strings.TrimPrefix "av" (lower $vid)) }}
+{{ else if strings.HasPrefix (lower $vid) "bv" }}
+    {{ $videoQuery = querify "bvid" $vid }}
+{{ else }}
+    <p>Bilibili 视频av号或BV号错误！请检查视频av号或BV号是否正确</p>
+    <p>当前视频av或BV号：{{ $vid }}，视频分P：{{ $videopage }}</p>
+{{ end }}
+
+<div class="video-wrapper">
+    <iframe src="https://player.bilibili.com/player.html?{{ $basicQuery | safeURL }}&{{ $videoQuery | safeURL }}"
+            scrolling="no"
+            frameborder="no"
+            framespacing="0"
+            allowfullscreen="true"
+    >
+    </iframe>
+</div>
diff --git a/layouts/shortcodes/gitlab.html b/layouts/_shortcodes/gitlab.html
similarity index 100%
rename from layouts/shortcodes/gitlab.html
rename to layouts/_shortcodes/gitlab.html
diff --git a/layouts/shortcodes/quote.html b/layouts/_shortcodes/quote.html
similarity index 100%
rename from layouts/shortcodes/quote.html
rename to layouts/_shortcodes/quote.html
diff --git a/layouts/shortcodes/tencent.html b/layouts/_shortcodes/tencent.html
similarity index 96%
rename from layouts/shortcodes/tencent.html
rename to layouts/_shortcodes/tencent.html
index 463dec5..cfee190 100644
--- a/layouts/shortcodes/tencent.html
+++ b/layouts/_shortcodes/tencent.html
@@ -1,10 +1,10 @@
-{{ $vid := .Get 0 }}
-<div class="video-wrapper">
-    <iframe src="https://v.qq.com/txp/iframe/player.html?vid={{ $vid }}&auto=0" 
-            scrolling="no" 
-            frameborder="no"
-            framespacing="0" 
-            allowfullscreen="true"
-    >
-    </iframe>
+{{ $vid := .Get 0 }}
+<div class="video-wrapper">
+    <iframe src="https://v.qq.com/txp/iframe/player.html?vid={{ $vid }}&auto=0" 
+            scrolling="no" 
+            frameborder="no"
+            framespacing="0" 
+            allowfullscreen="true"
+    >
+    </iframe>
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/video.html b/layouts/_shortcodes/video.html
similarity index 100%
rename from layouts/shortcodes/video.html
rename to layouts/_shortcodes/video.html
diff --git a/layouts/shortcodes/youtube.html b/layouts/_shortcodes/youtube.html
similarity index 100%
rename from layouts/shortcodes/youtube.html
rename to layouts/_shortcodes/youtube.html
diff --git a/layouts/_default/archives.html b/layouts/archives.html
similarity index 94%
rename from layouts/_default/archives.html
rename to layouts/archives.html
index 5d5243c..7347040 100644
--- a/layouts/_default/archives.html
+++ b/layouts/archives.html
@@ -4,7 +4,7 @@
         {{- $taxonomy := $.Site.GetPage "taxonomyTerm" "categories" -}}
         {{- $terms := $taxonomy.Pages -}}
         {{ if $terms }}
-        <h2 class="section-title">{{ $taxonomy.Title }}</h2>
+        <h2 class="section-title">{{ T "widget.categoriesCloud.title" }}</h2>
         <div class="subsection-list">
             <div class="article-list--tile">
                 {{ range $terms }}
diff --git a/layouts/_default/baseof.html b/layouts/baseof.html
similarity index 100%
rename from layouts/_default/baseof.html
rename to layouts/baseof.html
diff --git a/layouts/index.html b/layouts/home.html
similarity index 100%
rename from layouts/index.html
rename to layouts/home.html
diff --git a/layouts/_default/list.html b/layouts/list.html
similarity index 100%
rename from layouts/_default/list.html
rename to layouts/list.html
diff --git a/layouts/_default/rss.xml b/layouts/rss.xml
similarity index 100%
rename from layouts/_default/rss.xml
rename to layouts/rss.xml
diff --git a/layouts/_default/single.html b/layouts/single.html
similarity index 100%
rename from layouts/_default/single.html
rename to layouts/single.html