diff --git a/assets/css/main.scss b/assets/css/main.scss
index 450cd2a..1865bbd 100644
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@@ -1,6 +1,6 @@
 // CSS Style Guide          : https://codeguide.co/#css
 // All variables from site's config content.
-{{- $P := .Site.Params }}
+{{ $P := .Site.Params }}
 // Base
 $scheme                     : {{ $P.scheme }};
 $darkmode                   : {{ $P.darkmode }};
@@ -129,18 +129,18 @@ $disqusjs_enable            : false;
 $livere_enable              : {{ isset $P "livere" }};
 $utterances_enable          : {{ isset $P "utterances" }};
 $waline_enable              : {{ isset $P "waline" }};
-{{- with .Site.Params.comments }}
-{{- $tce := and (isset . "nav") (and .storage (gt (len .nav) 1)) }}
+{{ with .Site.Params.comments }}
+{{ $tce := and (isset . "nav") (and .storage (gt (len .nav) 1)) }}
 $two_comments_enable        : {{ $tce }};
-{{- if $tce }}
-{{- $sortNav  := sort .nav "weight" }}
+{{ if $tce }}
+{{ $sortNav  := sort .nav "weight" }}
 $two_comments_actived       : {{ .active }};
 $first_comment_color        : {{ (index $sortNav 0).color }};
 $first_comment_name         : {{ lower (index $sortNav 0).name }};
 $second_comment_color       : {{ (index $sortNav 1).color }};
 $second_comment_name        : {{ lower (index $sortNav 1).name }};
-{{- end }}
-{{- end }}
+{{ end }}
+{{ end }}
 
 // 
 // Variables Layer
diff --git a/data/resources.yaml b/data/resources.yaml
index 67303ad..5c8c52e 100644
--- a/data/resources.yaml
+++ b/data/resources.yaml
@@ -129,6 +129,4 @@ plugins:
         alias_name: '@waline/client'
         version: 2.13.0
         file: dist/comment.js
-        alias: waline
-
-
+        alias: waline
\ No newline at end of file
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index e4603f8..32bdab5 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1,7 +1,7 @@
-{{- $extURL := and .Page.Site.Params.exturl.enable (strings.HasPrefix .Destination "http") }}
+{{ $extURL := and .Page.Site.Params.exturl.enable (strings.HasPrefix .Destination "http") }}
 <a href="{{ .Destination | safeURL }}" title="{{ .Text }}" {{ if $extURL }}rel="noopener external nofollow noreferrer" target="_blank" class=" exturl"{{ end }}>
     {{ .Text | safeHTML }}
-    {{- if and $extURL .Page.Site.Params.exturl.icon }}
+    {{ if and $extURL .Page.Site.Params.exturl.icon }}
     <i class="fa fa-external-link-alt"></i>
-    {{- end }}
+    {{ end }}
 </a>
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a83b22c..b4851e7 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,13 +1,13 @@
-{{- range $k, $v := (partialCached "init.html" .) -}}
-{{- $.Scratch.Set $k $v -}}
-{{- end -}}
+{{ range $k, $v := (partialCached "init.html" .) }}
+{{ $.Scratch.Set $k $v }}
+{{ end }}
 {{ $isComment := .Params.comment.enable | default .Site.Params.comments.enable }}
 {{ .Scratch.Set "isComment" $isComment }}
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode }}" data-theme="{{ .Scratch.Get "theme" }}">
 
 <head>
-  {{- partial "head.html" . }}
+  {{ partial "head.html" . }}
   <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
   <noscript>
     <link rel="stylesheet" href="/css/noscript.css">
@@ -19,30 +19,30 @@
   <main class="main">
     <header class="header" itemscope itemtype="http://schema.org/WPHeader">
       <div class="header-inner">
-        {{- partial "header.html" . }}
+        {{ partial "header.html" . }}
       </div>
       <!-- Sidebar -->
-      {{- if ne .Site.Params.sidebar.display "remove" }}
-      {{- partial "sidebar.html" . }}
-      {{- end }}
+      {{ if ne .Site.Params.sidebar.display "remove" }}
+      {{ partial "sidebar.html" . }}
+      {{ end }}
     </header>
     <!-- Widgets -->
     {{ partial "widgets.html" . }}
     <div class="main-inner {{ block "main_inner_class" . }}{{ end }}">
       <!-- Submenu,Content,Comment -->
-      {{- block "main" . }}{{- end }}
-      {{- if and .IsPage $isComment }}
-        {{- partialCached "comments.html" . }}
-      {{- end }}
+      {{ block "main" . }}{{ end }}
+      {{ if and .IsPage $isComment }}
+        {{ partialCached "comments.html" . }}
+      {{ end }}
     </div>
   </main>
   <footer class="footer">
     <div class="footer-inner">
-      {{- partialCached "footer.html" . }}
+      {{ partialCached "footer.html" . }}
     </div>
   </footer>
 
-  {{- partial "scripts.html" . }}
+  {{ partial "scripts.html" . }}
 </body>
 
 </html>
\ No newline at end of file
diff --git a/layouts/_default/list.algoliaindexes.json b/layouts/_default/list.algoliaindexes.json
index 28a550b..f013cf8 100644
--- a/layouts/_default/list.algoliaindexes.json
+++ b/layouts/_default/list.algoliaindexes.json
@@ -1,6 +1,6 @@
 [
-  {{- range $index, $entry := where .Site.RegularPages "Kind" "page" }}
-  {{- if $index }}, {{ end }}
+  {{ range $index, $entry := where .Site.RegularPages "Kind" "page" }}
+  {{ if $index }}, {{ end }}
   {
     "objectID": "{{ .Date.Unix }}",
     "permalink": "{{ .Permalink | relURL }}",
@@ -9,5 +9,5 @@
     "date": {{ .Date.Format $.Site.Params.timeFormat | jsonify }},
     "updated": {{ .Lastmod.Format $.Site.Params.timeFormat | jsonify }}
   }
-  {{- end }}
+  {{ end }}
 ]
\ No newline at end of file
diff --git a/layouts/_default/list.localindexes.xml b/layouts/_default/list.localindexes.xml
index 90fdce2..9cd1326 100644
--- a/layouts/_default/list.localindexes.xml
+++ b/layouts/_default/list.localindexes.xml
@@ -5,12 +5,12 @@
     <title>{{ .Title }}</title>
     <url>{{ .RelPermalink | relLangURL }}</url>
     <categories>
-      {{- range .Params.categories }}<category>{{ . }}</category>{{- end }}
+      {{ range .Params.categories }}<category>{{ . }}</category>{{ end }}
     </categories>
     <tags>
-      {{- range .Params.tags }}
+      {{ range .Params.tags }}
       <tag>{{ . }}</tag>
-      {{- end }}
+      {{ end }}
     </tags>
     <content type="html"><![CDATA[{{ .Content | plainify }}]]></content>
   </entry>
diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index 1c9ea69..d1c722a 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -1,15 +1,15 @@
-{{- define "title" }}
-{{- .Params.Title | default (T .Section) | default .Section }} - {{ .Site.Title -}}
-{{- end -}}
+{{ define "title" }}
+{{ .Params.Title | default (T .Section) | default .Section }} - {{ .Site.Title }}
+{{ end }}
 {{ define "main_inner_class" }}index posts-expand{{ end }}
 
-{{- define "main" }}
+{{ define "main" }}
 
 {{ $paginator := .Paginate (where .Site.RegularPages "Section" "==" .Section) }}
-{{- range $paginator.Pages }}
+{{ range $paginator.Pages }}
   {{ partial "post.html"  (dict "ctx" . "IsHome" true) }}
-{{- end }}
+{{ end }}
 
-{{- partial "partials/pagination.html" . }} 
+{{ partial "partials/pagination.html" . }} 
  
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 78ebdec..9b93caf 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,7 @@
-{{- define "title" }}{{- .Title }} - {{ .Site.Title -}}{{- end }}
+{{ define "title" }}{{ .Title }} - {{ .Site.Title }}{{ end }}
 
-{{- define "main_inner_class" }}post posts-expand{{- end }}
+{{ define "main_inner_class" }}post posts-expand{{ end }}
 
-{{- define "main" }}
+{{ define "main" }}
   {{ partial "post.html" (dict "ctx" . "IsHome" false) }}
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 4ef68bc..6f9e1d0 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,6 +1,6 @@
-{{- define "title" -}}
-  {{- .Title }} - {{ T .Data.Singular | default .Data.Singular }} - {{ .Site.Title -}}
-{{- end -}}
+{{ define "title" }}
+  {{ .Title }} - {{ T .Data.Singular | default .Data.Singular }} - {{ .Site.Title }}
+{{ end }}
 {{ define "main_inner_class" }}{{ .Data.Plural }} posts-collapse{{ end }}
 {{ define "main" }}
 <div class="post-block">
@@ -18,5 +18,5 @@
     
   </div>
 </div>
-{{- partial "pagination.html" . }}
-{{- end }}
\ No newline at end of file
+{{ partial "pagination.html" . }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 87c3ea8..5dddd08 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,55 +1,55 @@
-{{- define "title" -}}
-{{- .Params.Title | default (T .Data.Plural) | default .Data.Plural | dict "Some" | T "AllSome" }} - {{ .Site.Title -}}
-{{- end -}}
-{{- define "main_inner_class" }}{{.Data.Plural}} posts-expand{{ end -}}
-{{- define "main" }}
+{{ define "title" }}
+{{ .Params.Title | default (T .Data.Plural) | default .Data.Plural | dict "Some" | T "AllSome" }} - {{ .Site.Title }}
+{{ end }}
+{{ define "main_inner_class" }}{{.Data.Plural}} posts-expand{{ end }}
+{{ define "main" }}
 <div class="post-block" lang="{{ .Site.LanguageCode }}">
   <div class="post-header">
     <h1>
-      {{- if eq .Data.Plural "categories" }}
-        {{- T "CateTitle" }}
-      {{- else if eq .Data.Plural "tags" }}
-        {{- T "TagTitle" }}
-      {{- end }}
+      {{ if eq .Data.Plural "categories" }}
+        {{ T "CateTitle" }}
+      {{ else if eq .Data.Plural "tags" }}
+        {{ T "TagTitle" }}
+      {{ end }}
     </h1>
   </div>
   <div class="post-body">
-    {{- if eq .Data.Plural "categories" }}
+    {{ if eq .Data.Plural "categories" }}
     {{ $cats := .Site.Taxonomies.categories }}
     <div class="category-all-page">
       <div class="category-all-title">
-        {{- T "CatesCounterTitle" (.Scratch.Get "catsCount") | safeHTML -}}
+        {{ T "CatesCounterTitle" (.Scratch.Get "catsCount") | safeHTML }}
       </div>
       <div class="category-all">
         <ul class="category-list">
-          {{- range $name, $items := $cats }}
+          {{ range $name, $items := $cats }}
           <li class="category-list-item">
             <a class="category-list-link" href="{{ "/categories/" | relLangURL }}{{ $name | urlize  }}" data-pjax-state="">{{ .Page.Title }}</a>
             <span class="category-list-count">{{ len $items }}</span>
           </li>
-          {{- end }}
+          {{ end }}
         </ul>
       </div>
     </div>
-    {{- end }}
-    {{- if eq .Data.Plural "tags" }}
+    {{ end }}
+    {{ if eq .Data.Plural "tags" }}
     {{ $tags := .Site.Taxonomies.tags }}
     <div class="tag-cloud">
       <div class="tag-cloud-title">
-        {{- T "TagsCounterTitle" (.Scratch.Get "tagsCount") | safeHTML -}}
+        {{ T "TagsCounterTitle" (.Scratch.Get "tagsCount") | safeHTML }}
       </div>
       <div class="tag-cloud-tags">
         {{ $randNums := (seq 10) }}
-        {{- range $name, $items := $tags }}
+        {{ range $name, $items := $tags }}
         <a class="tag-cloud-{{ index (shuffle $randNums) 0 }}" href="{{ "/tags/" | relLangURL }}{{ $name | urlize  }}">{{ .Page.Title }}
           <span class="tag-list-count">
             <sup>({{ len $items }})</sup>
           </span>
         </a>
-        {{- end }}
+        {{ end }}
       </div>
     </div>
-    {{- end }}
+    {{ end }}
 </div>
 </div>
-{{- end }}
+{{ end }}
diff --git a/layouts/archives/section.html b/layouts/archives/section.html
index 17aba2f..2c790eb 100644
--- a/layouts/archives/section.html
+++ b/layouts/archives/section.html
@@ -1,30 +1,30 @@
-{{- define "title" }}
-{{- .Params.Title | default (T .Section) | default .Section | dict "Some" | T "AllSome" }} - {{ .Site.Title -}}
-{{- end -}}
+{{ define "title" }}
+{{ .Params.Title | default (T .Section) | default .Section | dict "Some" | T "AllSome" }} - {{ .Site.Title }}
+{{ end }}
 {{ define "main_inner_class" }}archive posts-collapse{{ end }}
-{{- define "main" }}
+{{ define "main" }}
 <div class="post-block">
   <div class="post-content">
     <div class="collection-title">
-      {{- $cheers := "Um" }}
-      {{- $posts := .Scratch.Get "postsCount" }}      
-      {{- if gt $posts 210 }}
-      {{- $cheers = "Excellent" }}
-      {{- else if gt $posts 130 }}
-      {{- $cheers = "Great" }}
-      {{- else if gt $posts 80 }}
-      {{- $cheers = "Good" }}
-      {{- else if gt $posts 50 }}
-      {{- $cheers = "Nice" }}
-      {{- else if gt $posts 30 }}
-      {{- $cheers = "Ok" }}
-      {{- end }}
+      {{ $cheers := "Um" }}
+      {{ $posts := .Scratch.Get "postsCount" }}      
+      {{ if gt $posts 210 }}
+      {{ $cheers = "Excellent" }}
+      {{ else if gt $posts 130 }}
+      {{ $cheers = "Great" }}
+      {{ else if gt $posts 80 }}
+      {{ $cheers = "Good" }}
+      {{ else if gt $posts 50 }}
+      {{ $cheers = "Nice" }}
+      {{ else if gt $posts 30 }}
+      {{ $cheers = "Ok" }}
+      {{ end }}
       <span class="collection-header">
-        {{- T (printf "PostArchiveCheers%s" $cheers) }}
-        {{- T "SymbolComma" }}
-        {{- T "ArchiveCounterTitle" $posts | safeHTML }}
-        {{- T "SymbolComma" }}
-        {{- T "PostArchiveKeepOn" }}
+        {{ T (printf "PostArchiveCheers%s" $cheers) }}
+        {{ T "SymbolComma" }}
+        {{ T "ArchiveCounterTitle" $posts | safeHTML }}
+        {{ T "SymbolComma" }}
+        {{ T "PostArchiveKeepOn" }}
       </span>
     </div>
 
@@ -32,5 +32,5 @@
     
   </div>
 </div>
-{{- partial "pagination.html" . }}
-{{- end }}
\ No newline at end of file
+{{ partial "pagination.html" . }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/flinks/single.html b/layouts/flinks/single.html
index 5206c7b..0cb7330 100644
--- a/layouts/flinks/single.html
+++ b/layouts/flinks/single.html
@@ -1,6 +1,6 @@
-{{- define "title" }}{{- .Title }} - {{ .Site.Title -}}{{- end }}
+{{ define "title" }}{{ .Title }} - {{ .Site.Title }}{{ end }}
 
-{{- define "main_inner_class" }}flinks posts-expand{{- end }}
+{{ define "main_inner_class" }}flinks posts-expand{{ end }}
 
 {{ define "main" }}
 
diff --git a/layouts/index.html b/layouts/index.html
index 1f743de..382f040 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,11 +1,11 @@
-{{- define "main_inner_class" }}index posts-expand{{- end }}
+{{ define "main_inner_class" }}index posts-expand{{ end }}
 
-{{- define "main" }}
+{{ define "main" }}
 
 {{ $paginator := .Paginate (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
-{{- range $paginator.Pages }}
+{{ range $paginator.Pages }}
   {{ partial "post.html"  (dict "ctx" . "IsHome" true) }}
-{{- end }}
+{{ end }}
 
-{{- partial "partials/pagination.html" . }}  
-{{- end }}
\ No newline at end of file
+{{ partial "partials/pagination.html" . }}  
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/_funs/get_res.html b/layouts/partials/_funs/get_res.html
index 21749d1..926ce54 100644
--- a/layouts/partials/_funs/get_res.html
+++ b/layouts/partials/_funs/get_res.html
@@ -6,15 +6,15 @@
 {{ with .res.alias2 }}
   {{ $npm = . }}
 {{ end }}   
-{{- $file := .res.file }}
+{{ $file := .res.file }}
 
-{{- if ne .vendor "unpkg" }}
-  {{- with .res.alias }}
-    {{- $npm = . }}
-  {{- end }}   
-  {{- $file = replaceRE `(dist|lib|source\/js)\/` "" .res.file }}
-  {{- $fmt = "%s/%s/%s/%s" }}
-{{- end }}
+{{ if ne .vendor "unpkg" }}
+  {{ with .res.alias }}
+    {{ $npm = . }}
+  {{ end }}   
+  {{ $file = replaceRE `(dist|lib|source\/js)\/` "" .res.file }}
+  {{ $fmt = "%s/%s/%s/%s" }}
+{{ end }}
 
 {{ $pluginRes := printf $fmt .router $npm .res.version $file }}
 
diff --git a/layouts/partials/_thirdparty/share/addthis.html b/layouts/partials/_thirdparty/share/addthis.html
index 683aeb0..520e2e1 100644
--- a/layouts/partials/_thirdparty/share/addthis.html
+++ b/layouts/partials/_thirdparty/share/addthis.html
@@ -1,3 +1,3 @@
-{{- if isset .Site.Params "addthisid" }}
+{{ if isset .Site.Params "addthisid" }}
 <div class="addthis_inline_share_toolbox" style="text-align: center;"></div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
index e6e9ed5..b24b1c1 100644
--- a/layouts/partials/comments.html
+++ b/layouts/partials/comments.html
@@ -1,42 +1,42 @@
-{{- $root := . -}}
-{{- with .Site.Params.comments }}
-{{- $tc := and .storage (gt (len .nav) 1) }}
-{{- $active := .active }}
-{{- $fc := .active }}
-{{- $sc := "" }}
-{{- $sn := "" }}
+{{ $root := . }}
+{{ with .Site.Params.comments }}
+{{ $tc := and .storage (gt (len .nav) 1) }}
+{{ $active := .active }}
+{{ $fc := .active }}
+{{ $sc := "" }}
+{{ $sn := "" }}
 <div id="comments" class="post-comments">
   <div class="comment-head">
     <div class="comment-headline">
       <i class="fas fa-comments fa-fw"></i>
       <span>{{ T "PostCommentTitle" }}</span>
     </div>
-    {{- if $tc }}
-    {{- $sn = (sort .nav "weight") }}
-    {{- $fc = index $sn 0 }}
-    {{- $sc = index $sn 1 }}
+    {{ if $tc }}
+    {{ $sn = (sort .nav "weight") }}
+    {{ $fc = index $sn 0 }}
+    {{ $sc = index $sn 1 }}
     <div class="comment-switch">
       <span class="first-comment">{{ $fc.title }}</span>
       <span class="switch-btn {{ if eq .active (lower $sc.name) }}move{{ end }}"></span>
       <span class="second-comment">{{ $sc.title }}</span>
     </div>  
-    {{- end }}
+    {{ end }}
   </div>
   <div class="comment-wrap">
   {{ $cp := "_thirdparty/comment/%s.html" }}
-  {{- if $tc }}
-  {{- range $sn }}
+  {{ if $tc }}
+  {{ range $sn }}
     <div>
-      {{- partial "_thirdparty/comment/comm_loading.html" . }}
-      {{- partial (printf $cp (lower .name)) $root }}
+      {{ partial "_thirdparty/comment/comm_loading.html" . }}
+      {{ partial (printf $cp (lower .name)) $root }}
     </div>
-  {{- end }}
-  {{- else }}
+  {{ end }}
+  {{ else }}
     <div>      
-      {{- partial "_thirdparty/comment/comm_loading.html" . }}
-      {{- partial (printf $cp $fc) $root }}
+      {{ partial "_thirdparty/comment/comm_loading.html" . }}
+      {{ partial (printf $cp $fc) $root }}
     </div>
-  {{- end }}
+  {{ end }}
   </div>
 </div>  
-{{- end }}
+{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index dd4ec0c..4b58581 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,4 +1,4 @@
-{{- $ft := .Site.Params.footer }}
+{{ $ft := .Site.Params.footer }}
 {{ if $ft.translate }}
 <div id="gtranslate" class="google-translate">
   <i class="fa fa-language"></i>
@@ -8,55 +8,55 @@
 <div class="copyright">
   &copy;
   <span itemprop="copyrightYear">
-    {{- $year := now.Year }}
-    {{- if isset $ft "since" }}
-    {{- if gt $year $ft.since }}
+    {{ $year := now.Year }}
+    {{ if isset $ft "since" }}
+    {{ if gt $year $ft.since }}
     {{ $ft.since }} - {{ $year }}
-    {{- else }}
+    {{ else }}
     {{ $year }}
-    {{- end }}
-    {{- else }}
+    {{ end }}
+    {{ else }}
     {{ $year }}
-    {{- end }}
+    {{ end }}
   </span>
   <span class="with-love">
     <i class="{{ $ft.icon.name }}"></i>
   </span>
   <span class="author" itemprop="copyrightHolder">{{ $ft.copyright | default .Site.Params.author }}</span>
 </div>
-{{- if $ft.powered }}
+{{ if $ft.powered }}
 <div class="powered-by">
   {{ $pb := printf "<a href='https://gohugo.io' title='%s' target='_blank'>Hugo</a> &amp; <a href='https://github.com/hugo-next/hugo-theme-next' title='%s' target='_blank'>Hugo NexT.%s</a>" hugo.Version .Site.Data.config.version .Site.Params.scheme }}
-  {{- printf (T "FooterPowerby") $pb | safeHTML }}
+  {{ printf (T "FooterPowerby") $pb | safeHTML }}
 </div>
-{{- end }}
-{{- with $ft.beian }}
-{{- if .enable }}
+{{ end }}
+{{ with $ft.beian }}
+{{ if .enable }}
 <div class="beian">
   <a href="https://beian.miit.gov.cn" target="_blank">{{ .icp }}</a>
   <img src="/imgs/gongan.png" alt="{{ .provinceAbbr }}公网安备">
   <a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode={{ .gonganNum }}" target="_blank">{{ .provinceAbbr }}公网安备 {{ .gonganNum }} 号</a>
 </div>
-{{- end }}
-{{- end }}
-{{- with $ft.vendors }}
+{{ end }}
+{{ end }}
+{{ with $ft.vendors }}
 {{ if .enable }}
 <div class="vendors-list">
-  {{- range .list }}
+  {{ range .list }}
     <a target="_blank" href="{{ .link }}" title="{{ .name }}">
-      {{- if .image }}        
+      {{ if .image }}        
         <img src="/imgs/img-lazy-loading.gif" data-src="{{ .image.url }}" alt="{{ .name }}" />
-      {{- else }}
+      {{ else }}
         {{ .name }}
-      {{- end }}
+      {{ end }}
     </a>
-  {{- end }}
+  {{ end }}
    <span>{{ .title }}</span>
 </div>
-{{- end }} 
-{{- end }}
+{{ end }} 
+{{ end }}
 
-{{- $custom := .Scratch.Get "footer" }}
-{{- if $custom }}
+{{ $custom := .Scratch.Get "footer" }}
+{{ if $custom }}
   {{ partialCached $custom . }}
-{{- end }}
+{{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2d3a8ed..768e626 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,10 +1,10 @@
-{{- partial "head/meta.html" . }}
-{{- partial "head/opengraph.html" . }}
-{{- partial "head/twitter.html" . }}
-{{- partial "head/googleplus.html" . }}
-{{- partial "head/facebook.html" . }}
-{{- partialCached "head/verify.html" . }}
-{{- partialCached "head/style.html" . }}
+{{ partial "head/meta.html" . }}
+{{ partial "head/opengraph.html" . }}
+{{ partial "head/twitter.html" . }}
+{{ partial "head/googleplus.html" . }}
+{{ partial "head/facebook.html" . }}
+{{ partialCached "head/verify.html" . }}
+{{ partialCached "head/style.html" . }}
 <script type="text/javascript">
 (function(){
   localDB = {
@@ -60,6 +60,6 @@
   theme.active();
 })(window);
 </script>
-{{- partial "head/config.html" . }}
-{{- partialCached "head/analytics.html" . }}
+{{ partial "head/config.html" . }}
+{{ partialCached "head/analytics.html" . }}
 
diff --git a/layouts/partials/head/analytics.html b/layouts/partials/head/analytics.html
index 63301bb..a18be0f 100644
--- a/layouts/partials/head/analytics.html
+++ b/layouts/partials/head/analytics.html
@@ -1,12 +1,12 @@
-{{- if isset .Site.Params.analytics "laid" }}
+{{ if isset .Site.Params.analytics "laid" }}
   {{ partial "_thirdparty/analytics/51la.html" . }}  
-{{- end }}
-{{- if isset .Site.Params.analytics "baidu" }}
+{{ end }}
+{{ if isset .Site.Params.analytics "baidu" }}
   {{ partial "_thirdparty/analytics/baidu.html" . }}  
-{{- end }}
-{{- if isset .Site.Params.analytics "google" }}
+{{ end }}
+{{ if isset .Site.Params.analytics "google" }}
   {{ partial "_thirdparty/analytics/google.html" . }}  
-{{- end }}
-{{- if isset .Site.Params.analytics "busuanzi" }}
+{{ end }}
+{{ if isset .Site.Params.analytics "busuanzi" }}
   {{ partial "_thirdparty/analytics/busuanzi.html" . }}  
-{{- end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head/config.html b/layouts/partials/head/config.html
index c4b9b5b..f0ae8ea 100644
--- a/layouts/partials/head/config.html
+++ b/layouts/partials/head/config.html
@@ -1,11 +1,11 @@
-{{- $pageCfg := dict
+{{ $pageCfg := dict
   "isHome"    .IsHome
   "isPage"    .IsPage
   "comments"  (.Scratch.Get "isComment")
   "permalink" (.Page.Permalink | absURL)
   "path"      (.Page.Permalink | path.Base)
   "title"     .Page.Title
--}}
+}}
 
 {{/* Append waline pageview & comment plugin */}}
 {{ if and .Site.Params.waline ( or .Site.Params.waline.pageView .Site.Params.waline.comment) }}
@@ -37,4 +37,4 @@
 {{ $pageCfg = merge $pageCfg (dict "math" $math) }}
 {{ end }}
 
-<script class="next-config" data-name="page" type="application/json">{{- $pageCfg -}}</script>
\ No newline at end of file
+<script class="next-config" data-name="page" type="application/json">{{ $pageCfg }}</script>
\ No newline at end of file
diff --git a/layouts/partials/head/facebook.html b/layouts/partials/head/facebook.html
index 6d04596..8873bdd 100644
--- a/layouts/partials/head/facebook.html
+++ b/layouts/partials/head/facebook.html
@@ -1,5 +1,5 @@
-{{- with .Site.Params.openGraph.facebook }}
-{{- range $attr, $val := . }}
+{{ with .Site.Params.openGraph.facebook }}
+{{ range $attr, $val := . }}
 <meta property="fb:{{ $attr }}" content="{{ $val }}">
-{{- end }}
-{{- end }}
\ No newline at end of file
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head/favicon.html b/layouts/partials/head/favicon.html
index 3fc20ac..18d1347 100644
--- a/layouts/partials/head/favicon.html
+++ b/layouts/partials/head/favicon.html
@@ -1,9 +1,9 @@
 <!-- Website icons -->
-{{- with .Site.Params.favicon }}
+{{ with .Site.Params.favicon }}
 <link rel="shortcut icon" type="image/x-icon" href="{{ .icon }}">
 <link rel="icon" type="image/x-icon" href="{{ .icon }}">
 <link rel="icon" type="image/png" sizes="16x16" href="{{ .small }}">
 <link rel="icon" type="image/png" sizes="32x32" href="{{ .medium }}">
 <link rel="apple-touch-icon" sizes="180x180" href="{{ .appleTouchIcon }}">
-{{- end }}
+{{ end }}
 <!-- Website icons -->
\ No newline at end of file
diff --git a/layouts/partials/head/googleplus.html b/layouts/partials/head/googleplus.html
index 391198e..0b310f3 100644
--- a/layouts/partials/head/googleplus.html
+++ b/layouts/partials/head/googleplus.html
@@ -1,3 +1,3 @@
-{{- with .Site.Params.openGraph.googlePlus }}
+{{ with .Site.Params.openGraph.googlePlus }}
 <link rel="publisher" href=" {{ . }}">
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html
index 338c015..6edd349 100644
--- a/layouts/partials/head/meta.html
+++ b/layouts/partials/head/meta.html
@@ -1,10 +1,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width">
-{{- if .Site.Params.darkmode }}
+{{ if .Site.Params.darkmode }}
 <meta name="theme-color" content="{{ .Site.Params.themeColor.dark }}" media="(prefers-color-scheme: dark)" />
-{{- else }}
+{{ else }}
 <meta name="theme-color" content="{{ .Site.Params.themeColor.light }}" media="(prefers-color-scheme: light)" />
-{{- end }}
+{{ end }}
 {{ hugo.Generator }}
 <link rel="shortcut icon" type="image/x-icon" href="{{ .Site.Params.favicon.icon }}">
 <link rel="icon" type="image/x-icon" href="{{ .Site.Params.favicon.icon }}">
@@ -13,18 +13,18 @@
 <link rel="apple-touch-icon" sizes="180x180" href="{{ .Site.Params.favicon.appleTouchIcon }}">
 <meta itemprop="name" content="{{ .Title }}" />
 <meta itemprop="description" content="{{ .Description | default .Site.Params.description }}" />
-{{- if .IsPage }}
-{{- with .Date }}
+{{ if .IsPage }}
+{{ with .Date }}
 <meta itemprop="datePublished" {{ . }} />
-{{- end }}
-{{- with .Lastmod }}
+{{ end }}
+{{ with .Lastmod }}
 <meta itemprop="dateModified" {{ . }} />
-{{- end }}
-{{- end }}
-{{- $img := .Site.Params.customLogo | default .Site.Params.avatar.url }}
-{{- if and .IsPage (isset .Params "images") }}
-  {{- $img := index .Params.images 0 }}
-{{- end }}
-{{- .Scratch.Set "metaImg" $img }}
+{{ end }}
+{{ end }}
+{{ $img := .Site.Params.customLogo | default .Site.Params.avatar.url }}
+{{ if and .IsPage (isset .Params "images") }}
+  {{ $img := index .Params.images 0 }}
+{{ end }}
+{{ .Scratch.Set "metaImg" $img }}
 <meta itemprop="image" content="{{ $img | absURL }}" />
 <meta itemprop="keywords" content="{{ if and .IsPage (isset .Params "tags")}}{{ delimit .Params.tags "," }}{{ else }}{{ .Site.Params.keywords }}{{ end }}" />
diff --git a/layouts/partials/head/open_graph.html b/layouts/partials/head/open_graph.html
index bdf0a9f..8316fae 100644
--- a/layouts/partials/head/open_graph.html
+++ b/layouts/partials/head/open_graph.html
@@ -1,9 +1,9 @@
-{{- $Site := .Site -}}
-{{- $Params := .Site.Params -}}
-{{- $Page := .Page -}}
-{{- $langCode := .Scratch.Get "langCode" -}}
-{{- with .Site.Params.openGraph -}}
-{{- if .enable -}}
+{{ $Site := .Site }}
+{{ $Params := .Site.Params }}
+{{ $Page := .Page }}
+{{ $langCode := .Scratch.Get "langCode" }}
+{{ with .Site.Params.openGraph }}
+{{ if .enable }}
   <meta property="og:type" content="website">
   <meta property="og:title" content="{{ $Page.Title }}">
   <meta property="og:description" content="{{ default $Params.description $Page.Description }}">
@@ -12,21 +12,21 @@
   <meta property="og:site_name" content="{{ $Site.Title }}">
   <meta property="og:locale" content="{{ $langCode }}">
   <meta property="article:author" content="{{ default $Params.author $Page.Params.Author }}">
-{{- with .twitter -}}
-{{- range $attr, $val := . }}
+{{ with .twitter }}
+{{ range $attr, $val := . }}
   <meta name="twitter:{{ $attr }}" content="{{ $val }}">
-{{- end -}}
-{{- end -}}
+{{ end }}
+{{ end }}
 
-{{- with .googlePlus }}
+{{ with .googlePlus }}
   <link rel="publisher" href=" {{ . }}">
-{{- end -}}
+{{ end }}
 
-{{- with .facebook -}}
-{{- range $attr, $val := . }}
+{{ with .facebook }}
+{{ range $attr, $val := . }}
   <meta property="fb:{{ $attr }}" content="{{ $val }}">
-{{- end -}}
-{{- end -}}
+{{ end }}
+{{ end }}
 
-{{- end -}}
-{{- end -}}
\ No newline at end of file
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head/opengraph.html b/layouts/partials/head/opengraph.html
index 199be36..eb11f17 100644
--- a/layouts/partials/head/opengraph.html
+++ b/layouts/partials/head/opengraph.html
@@ -1,4 +1,4 @@
-{{- if .Site.Params.openGraph.enable }}
+{{ if .Site.Params.openGraph.enable }}
 <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}" />
 <meta property="og:title" content="{{  .Title | default .Site.Title }}" />
 <meta property="og:description" content="{{ .Description | default .Site.Params.Description }}" />
@@ -9,9 +9,9 @@
 <meta property="og:url" content="{{ .Permalink }}"/>
 <meta property="og:site_name" content="{{ .Site.Title }}" />
 <meta property="og:locale" content="{{ .Site.LanguageCode }}"/>
-{{- if .IsPage }}
+{{ if .IsPage }}
 <meta property="article:author" content="{{ .Params.Author | default .Site.Params.Author }}" />
 <meta property="article:published_time" content="{{ .Date }}" />
 <meta property="article:modified_time" content="{{ .Lastmod }}" />
-{{- end }}  
-{{- end }}
+{{ end }}  
+{{ end }}
diff --git a/layouts/partials/head/style.html b/layouts/partials/head/style.html
index c91bd20..6faa942 100644
--- a/layouts/partials/head/style.html
+++ b/layouts/partials/head/style.html
@@ -1,31 +1,31 @@
 <!-- Plugin style files -->
-{{- $cssRes := .Site.Data.resources.css }}
-{{- $vendor := .Site.Params.vendors.plugins }}
-{{- $router := .Scratch.Get "router" }}
+{{ $cssRes := .Site.Data.resources.css }}
+{{ $vendor := .Site.Params.vendors.plugins }}
+{{ $router := .Scratch.Get "router" }}
 
-{{- range $css := $cssRes }}
+{{ range $css := $cssRes }}
   {{ $pluginCss := partial "_funs/get_res.html" (dict "res" . "vendor" $vendor "router" $router) }}
   <link type="text/css" rel="stylesheet" href="{{ $pluginCss }}" /> 
-{{- end }}
+{{ end }}
 
 <!-- Main Style file -->
-{{- $scss := resources.Get "css/main.scss" }}
-{{- $scss = $scss | resources.ExecuteAsTemplate "main.scss" .  }}
-{{- $css := $scss | toCSS (dict "targetPath" "/css/main.css" "outputStyle" "expanded") }}
-{{- if hugo.IsProduction }}
-{{- $css = $css | minify | fingerprint }}
-{{- end }}
+{{ $scss := resources.Get "css/main.scss" }}
+{{ $scss = $scss | resources.ExecuteAsTemplate "main.scss" .  }}
+{{ $css := $scss | toCSS (dict "targetPath" "/css/main.css" "outputStyle" "expanded") }}
+{{ if hugo.IsProduction }}
+{{ $css = $css | minify | fingerprint }}
+{{ end }}
 <link rel="stylesheet" href="{{ $css.RelPermalink }}">
-{{- if .IsPage }}
+{{ if .IsPage }}
   <style type="text/css">
     .post-footer, .flinks-list-footer hr:after {
       content: "{{ .Site.Params.postFooter.endLineTip }}";
     }
   </style>
-{{- end }}
+{{ end }}
 
-{{- $custom := .Scratch.Get "style" }}
-{{- if $custom }}
+{{ $custom := .Scratch.Get "style" }}
+{{ if $custom }}
 <link rel="stylesheet" type="text/css" href="{{ $custom }}">
-{{- end }}
+{{ end }}
   
\ No newline at end of file
diff --git a/layouts/partials/head/twitter.html b/layouts/partials/head/twitter.html
index d485eb1..c33c933 100644
--- a/layouts/partials/head/twitter.html
+++ b/layouts/partials/head/twitter.html
@@ -1,5 +1,5 @@
-{{- with .Site.Params.openGraph.twitter }}
-{{- $img := $.Params.openGraph.twitter.image | default ($.Scratch.Get "metaImg") }}
+{{ with .Site.Params.openGraph.twitter }}
+{{ $img := $.Params.openGraph.twitter.image | default ($.Scratch.Get "metaImg") }}
 <meta name="twitter:card" content="summary_large_image"/>
 <meta name="twitter:creator" content="{{ .creator }}"/>
 <meta name="twitter:description" content="{{ with $.Page.Description }}{{ . }}{{ else }}{{if $.Page.IsPage}}{{ .Summary }}{{ else }}{{ $.Params.description }}{{ end }}{{ end }}"/>
diff --git a/layouts/partials/head/verify.html b/layouts/partials/head/verify.html
index f395321..bc1acc0 100644
--- a/layouts/partials/head/verify.html
+++ b/layouts/partials/head/verify.html
@@ -1,14 +1,14 @@
 {{ if .IsHome }}
-{{- with .Site.Params.googleSiteVerification }}
+{{ with .Site.Params.googleSiteVerification }}
 <meta name="google-site-verification" content="{{ . }}">
-{{- end }}
-{{- with .Site.Params.bingSiteVerification }}
+{{ end }}
+{{ with .Site.Params.bingSiteVerification }}
 <meta name="msvalidate.01" content="{{ . }}">
-{{- end }}
-{{- with .Site.Params.yandexSiteVerification }}
+{{ end }}
+{{ with .Site.Params.yandexSiteVerification }}
 <meta name="yandex-verification" content="{{ . }}">
-{{- end }}
-{{- with .Site.Params.baiduSiteVerification }}
+{{ end }}
+{{ with .Site.Params.baiduSiteVerification }}
 <meta name="baidu-site-verification" content="{{ . }}">
-{{- end }}
+{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/header/brand.html b/layouts/partials/header/brand.html
index 0c1a8ad..11e66e8 100644
--- a/layouts/partials/header/brand.html
+++ b/layouts/partials/header/brand.html
@@ -9,9 +9,9 @@
   </div>
 
   <div class="site-meta">
-    {{- if and .Site.Params.customLogo (eq .Site.Params.scheme "Muse") }}
+    {{ if and .Site.Params.customLogo (eq .Site.Params.scheme "Muse") }}
       <img class="custom-logo-image" src="{{ .Site.Params.customLogo }}" alt="{{ $title }}">
-    {{- end }}
+    {{ end }}
 
     <a href="{{ "/" | relLangURL }}" class="brand" rel="start">
       <i class="logo-line"></i>
@@ -20,17 +20,17 @@
     </a>
     {{ if isset .Site.Params "subtitle" }}
       <p class="site-subtitle" itemprop="description">{{ .Site.Params.subtitle }}</p>
-    {{- end }}
-    {{- if and .Site.Params.customLogo (or (eq .Site.Params.scheme "Gemini") (eq .Site.Params.scheme "Pisces"))}}
+    {{ end }}
+    {{ if and .Site.Params.customLogo (or (eq .Site.Params.scheme "Gemini") (eq .Site.Params.scheme "Pisces"))}}
       <img class="custom-logo-image" src="{{ .Site.Params.customLogo }}" alt="{{ $title }}">
-    {{- end }}
+    {{ end }}
   </div>
 
   <div class="site-nav-right">
     <div class="toggle popup-trigger">
       {{ if or .Site.Params.algoliaSearch.enable .Site.Params.localSearch.enable }}
       <i class="fa fa-search fa-fw fa-lg"></i>
-      {{- end }}
+      {{ end }}
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/layouts/partials/header/menus.html b/layouts/partials/header/menus.html
index 6951b00..7e81609 100644
--- a/layouts/partials/header/menus.html
+++ b/layouts/partials/header/menus.html
@@ -1,25 +1,25 @@
-{{- $ms := .Site.Params.menuSets }}
-{{- $curP := .Page }}
+{{ $ms := .Site.Params.menuSets }}
+{{ $curP := .Page }}
 <nav class="site-nav">
   <ul class="main-menu menu">
-  {{- range .Site.Menus.main }}
-    {{- $active := $curP.IsMenuCurrent "main" . }}
+  {{ range .Site.Menus.main }}
+    {{ $active := $curP.IsMenuCurrent "main" . }}
     <li class="menu-item menu-item-{{ .Identifier }}">
       <a href="{{ .URL | relLangURL }}" class="hvr-icon-pulse {{if $active }} menu-item-active{{ end }}" rel="section">
-        {{- if $ms.icons }}<i class="fa fa-{{ .Pre }} hvr-icon"></i>{{ end }}{{- .Name }}
-        {{- if and $ms.badges (eq .Identifier "archives") }}
+        {{ if $ms.icons }}<i class="fa fa-{{ .Pre }} hvr-icon"></i>{{ end }}{{ .Name }}
+        {{ if and $ms.badges (eq .Identifier "archives") }}
         <span class="badge">{{ $.Scratch.Get "postsCount" }}</span>
-        {{- end }}
+        {{ end }}
       </a>
     </li>
-  {{- end }}
+  {{ end }}
 
-  {{- if or .Site.Params.algoliaSearch.enable .Site.Params.localSearch.enable }}
+  {{ if or .Site.Params.algoliaSearch.enable .Site.Params.localSearch.enable }}
     <li class="menu-item menu-item-search">
       <a role="button" class="popup-trigger hvr-icon-pulse">
-        {{- if $ms.icons }}<i class="fa fa-search fa-fw hvr-icon"></i>{{ end }}{{ T "MSearchLabel" }}
+        {{ if $ms.icons }}<i class="fa fa-search fa-fw hvr-icon"></i>{{ end }}{{ T "MSearchLabel" }}
       </a>
     </li>
-  {{- end }}
+  {{ end }}
   </ul>
 </nav>
\ No newline at end of file
diff --git a/layouts/partials/header/search.html b/layouts/partials/header/search.html
index 00353b8..30eb84e 100644
--- a/layouts/partials/header/search.html
+++ b/layouts/partials/header/search.html
@@ -1,11 +1,11 @@
-{{- if or .Site.Params.algoliaSearch.enable .Site.Params.localSearch.enable }}
+{{ if or .Site.Params.algoliaSearch.enable .Site.Params.localSearch.enable }}
   <div class="search-pop-overlay">
     <div class="popup search-popup">
-      {{- if .Site.Params.algoliaSearch.enable }}
+      {{ if .Site.Params.algoliaSearch.enable }}
         {{ partial "_thirdparty/search/algolia.html" . }}
-      {{- else if .Site.Params.localSearch.enable }}
+      {{ else if .Site.Params.localSearch.enable }}
         {{ partial "_thirdparty/search/local.html" . }}
-      {{- end }}
+      {{ end }}
     </div>
   </div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/header/sidebar.html b/layouts/partials/header/sidebar.html
index d860080..168c881 100644
--- a/layouts/partials/header/sidebar.html
+++ b/layouts/partials/header/sidebar.html
@@ -1,4 +1,4 @@
-{{- $SP := .Site.Params -}}
+{{ $SP := .Site.Params }}
 <aside class="sidebar">
   <div class="sidebar-inner sidebar-overview-active">
     <ul class="sidebar-nav">
@@ -15,7 +15,7 @@
           <div class="site-description" itemprop="description">{{ $SP.description }}</div>
         </div>
         <div class="site-state-wrap site-overview-item animated">
-          {{- if $SP.siteState }}
+          {{ if $SP.siteState }}
           <nav class="site-state">
             <div class="site-state-item site-state-posts">
               <a href="{{ "/archives/" | relLangURL }}">
@@ -36,7 +36,7 @@
               </a>
             </div>
           </nav>
-          {{- end }}
+          {{ end }}
           <div class="rss-link">
             <a href="{{ "/index.xml" | relLangURL }}" rel="alternate" type="application/rss+xml" target="_blank">
               <i class="fa fa-rss"></i>
@@ -46,26 +46,26 @@
         </div>
         <div class="links-of-social site-overview-item animated">
           {{ $si := $SP.socialIcons }}
-          {{- range $SP.socials }}
-          {{- range $name,$val := . }}
-          {{- $vals := split $val "||" }}
-          {{- $url := trim (index $vals 0) " " }}
-          {{- $icon := trim (index $vals 1) " " }}
+          {{ range $SP.socials }}
+          {{ range $name,$val := . }}
+          {{ $vals := split $val "||" }}
+          {{ $url := trim (index $vals 0) " " }}
+          {{ $icon := trim (index $vals 1) " " }}
           <span class="links-of-social-item">
-            <a href="{{- $url }}" title="{{- $name }} → {{- $url }}" rel="noopener" {{- if and $si.enable $si.transition }} class="hvr-icon-pulse" {{- end }} target="_blank">
-              {{- if $si.enable }}
-              <i class="{{- $icon }} fa-fw {{ if $si.transition }} hvr-icon {{ end }}"></i>
-              {{- end }}
-              {{- if or (not $si.enable) (not $si.iconsOnly) }}
-                 {{- $name }}
-              {{- end }} 
+            <a href="{{ $url }}" title="{{ $name }} → {{ $url }}" rel="noopener" {{ if and $si.enable $si.transition }} class="hvr-icon-pulse" {{ end }} target="_blank">
+              {{ if $si.enable }}
+              <i class="{{ $icon }} fa-fw {{ if $si.transition }} hvr-icon {{ end }}"></i>
+              {{ end }}
+              {{ if or (not $si.enable) (not $si.iconsOnly) }}
+                 {{ $name }}
+              {{ end }} 
             </a>
           </span>
-          {{- end }}
-          {{- end }}
+          {{ end }}
+          {{ end }}
         </div>
-        {{- $cc := $SP.creativeCommons }}
-        {{- if and $cc $cc.sidebar }}
+        {{ $cc := $SP.creativeCommons }}
+        {{ if and $cc $cc.sidebar }}
         <div class="cc-license animated" itemprop="license">
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.{{ substr .Site.Language 0 2 }}" class="cc-opacity" rel="noopener" target="_blank" title="{{ T "CCLinkTitle" }}">
             <img src="/imgs/cc/{{ $cc.size }}/{{ replace $cc.license "-" "_" }}.svg" alt="{{ T "CCLinkTitle" }}">
diff --git a/layouts/partials/list.html b/layouts/partials/list.html
index 82fd9b0..4b2690d 100644
--- a/layouts/partials/list.html
+++ b/layouts/partials/list.html
@@ -12,16 +12,16 @@
       </time>
     </div>
     <div class="post-title">
-      {{- if isset .Params "extlink" }}
+      {{ if isset .Params "extlink" }}
       <a href="{{ .Params.extlink }}" rel="noopener external nofollow noreferrer" target="_blank" class="exturl post-title-link post-title-link-external" title="">
-        <span itemprop="name">{{- .Title -}}</span>
+        <span itemprop="name">{{ .Title }}</span>
         <i class="fa fa-external-link-alt"></i>
       </a>
-      {{- else }}
+      {{ else }}
       <a class="post-title-link" href="{{ .RelPermalink | relLangURL }}" itemprop="url">
         <span itemprop="name">{{ .Title }}</span>
       </a>
-      {{- end }}
+      {{ end }}
     </div>
   </header>
 </article>
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index bd12821..25ec1e3 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,42 +1,42 @@
-{{- $pag := .Paginator }}
-{{- $tps := $pag.TotalPages }}
+{{ $pag := .Paginator }}
+{{ $tps := $pag.TotalPages }}
 
-{{- $begin := sub $pag.PageNumber  4}}
-{{- $.Scratch.Set "begin" $begin }}
-{{- $end := add $pag.PageNumber  4}}
-{{- $.Scratch.Set "end" $end }}
+{{ $begin := sub $pag.PageNumber  4}}
+{{ $.Scratch.Set "begin" $begin }}
+{{ $end := add $pag.PageNumber  4}}
+{{ $.Scratch.Set "end" $end }}
 
-{{- if lt $begin 0}}
-  {{- $end := sub $end $begin }}
-  {{- $.Scratch.Set "end" $end }}
-{{- end}}
-{{- $end := $.Scratch.Get "end"}}
+{{ if lt $begin 0}}
+  {{ $end := sub $end $begin }}
+  {{ $.Scratch.Set "end" $end }}
+{{ end}}
+{{ $end := $.Scratch.Get "end"}}
 
-{{- $over := sub  $tps $end }}
+{{ $over := sub  $tps $end }}
 
-{{- if lt $over 0}}
-  {{- $begin := add $begin $over}}
-  {{- $.Scratch.Set "begin" $begin }}
-{{- end }}
-{{- $begin := $.Scratch.Get "begin"}}
+{{ if lt $over 0}}
+  {{ $begin := add $begin $over}}
+  {{ $.Scratch.Set "begin" $begin }}
+{{ end }}
+{{ $begin := $.Scratch.Get "begin"}}
 <nav class="pagination">
-  {{- if $pag.HasPrev }}
-  <a class="extend prev" rel="prev" href="{{- $pag.Prev.URL  }}">
+  {{ if $pag.HasPrev }}
+  <a class="extend prev" rel="prev" href="{{ $pag.Prev.URL  }}">
     <i class="fa fa-angle-left"></i>
   </a>
-  {{- end }}
-  {{- range $p := $pag.Pagers }}
-      {{- if and (ge $p.PageNumber $begin) (le $p.PageNumber $end) }}
-      {{- if eq $p $pag }}
-        <span class="page-number current">{{- $p.PageNumber }}</span>
-      {{- else }}
-        <a class="page-number" href="{{- $p.URL  }}">{{- $p.PageNumber }}</a>
-      {{- end }}
-      {{- end }}
-  {{- end }}
-  {{- if $pag.HasNext }}
-  <a class="extend next" rel="next" href="{{- $pag.Next.URL }}">
+  {{ end }}
+  {{ range $p := $pag.Pagers }}
+      {{ if and (ge $p.PageNumber $begin) (le $p.PageNumber $end) }}
+      {{ if eq $p $pag }}
+        <span class="page-number current">{{ $p.PageNumber }}</span>
+      {{ else }}
+        <a class="page-number" href="{{ $p.URL  }}">{{ $p.PageNumber }}</a>
+      {{ end }}
+      {{ end }}
+  {{ end }}
+  {{ if $pag.HasNext }}
+  <a class="extend next" rel="next" href="{{ $pag.Next.URL }}">
     <i class="fa fa-angle-right"></i>
   </a>
-  {{- end }}
+  {{ end }}
 </nav>
\ No newline at end of file
diff --git a/layouts/partials/post.html b/layouts/partials/post.html
index d18cc16..b3ac6b2 100644
--- a/layouts/partials/post.html
+++ b/layouts/partials/post.html
@@ -1,6 +1,6 @@
 <div class="post-block">
   <article itemscope itemtype="http://schema.org/Article" class="post-content" lang="{{ .Site.LauageCode }}">
-    {{- with .ctx }}
+    {{ with .ctx }}
     <link itemprop="mainEntityOfPage" href="{{ .Permalink }}">
     <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
       <meta itemprop="image" content="{{ .Site.Params.avatar.url }}">
@@ -14,7 +14,7 @@
       <meta itemprop="name" content="{{ .Title }}">
       <meta itemprop="description" content="{{ .Description | default .Summary }}">
     </span>
-    {{- end }}
+    {{ end }}
     <header class="post-header">
       {{ partial "post/header.html" (dict "ctx" .ctx "IsHome" .IsHome) }}
     </header>
diff --git a/layouts/partials/post/body.html b/layouts/partials/post/body.html
index 4fb41fe..2c83587 100644
--- a/layouts/partials/post/body.html
+++ b/layouts/partials/post/body.html
@@ -1,11 +1,11 @@
 {{ with .ctx }}
-{{- if $.IsHome }}
-  {{- if .Params.Expand }}
+{{ if $.IsHome }}
+  {{ if .Params.Expand }}
   {{ .Content }}
-  {{- else }}
+  {{ else }}
   {{ .Summary }}
-  {{- end }}
-{{- else }}
+  {{ end }}
+{{ else }}
   {{ .Content }}
-{{- end }}
+{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/footer.html b/layouts/partials/post/footer.html
index cffa3eb..4cf58fc 100644
--- a/layouts/partials/post/footer.html
+++ b/layouts/partials/post/footer.html
@@ -1,44 +1,44 @@
 {{ with .ctx }}
-{{- if $.IsHome }} 
-{{- if and .Site.Params.readMoreBtn (not .Params.Expand) }}
+{{ if $.IsHome }} 
+{{ if and .Site.Params.readMoreBtn (not .Params.Expand) }}
 <div class="post-button">
   <a class="btn" href="{{ .RelPermalink | relLangURL }}#more" rel="contents">
     {{ T "PostReadMore" }} &raquo;
   </a>
 </div>
-{{- end }}
+{{ end }}
 <div class="post-eof"></div>
-{{- else }}
+{{ else }}
 {{ partial "post/footer_meta/tags.html" . }}
-{{- if and (not (isset .Params "share")) (not .Params.share) }}
+{{ if and (not (isset .Params "share")) (not .Params.share) }}
 {{ partial "_thirdparty/share/addthis.html" . }}
-{{- end }}
+{{ end }}
 <hr/>
 {{ partial "post/footer_meta/reward.html" . }}
-{{- if and (not (isset .Params "copyright")) (not .Params.copyright) }}
+{{ if and (not (isset .Params "copyright")) (not .Params.copyright) }}
 {{ partial "post/footer_meta/copyright.html" . }}
-{{- end }}
-{{- if and (not (isset .Params "followme")) (not .Params.followme) }}
+{{ end }}
+{{ if and (not (isset .Params "followme")) (not .Params.followme) }}
 {{ partial "post/footer_meta/followme.html" . }}
-{{- end }}
-{{- if and (not (isset .Params "nav")) (not .Params.nav) }}
+{{ end }}
+{{ if and (not (isset .Params "nav")) (not .Params.nav) }}
 <div class="post-nav">
   <div class="post-nav-next post-nav-item">
-    {{- with .NextInSection }}
+    {{ with .NextInSection }}
     <a href="{{ .RelPermalink | relLangURL }}" rel="next" title="{{ .Title }}">
       <i class="fa fa-chevron-left"></i> {{ .Title }}
     </a>
-    {{- end }}
+    {{ end }}
   </div>
   <div class="post-nav-prev post-nav-item">
-    {{- with .PrevInSection }}
+    {{ with .PrevInSection }}
     <a href="{{ .RelPermalink | relLangURL }}" rel="prev" title="{{ .Title }}">
       {{ .Title }}
       <i class="fa fa-chevron-right"></i>
     </a>
-    {{- end }}
+    {{ end }}
   </div>
 </div>
-{{- end }}
-{{- end }}
-{{- end }}
\ No newline at end of file
+{{ end }}
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/footer_meta/copyright.html b/layouts/partials/post/footer_meta/copyright.html
index f9b4169..e23ab72 100644
--- a/layouts/partials/post/footer_meta/copyright.html
+++ b/layouts/partials/post/footer_meta/copyright.html
@@ -1,4 +1,4 @@
-{{- if .Site.Params.creativeCommons.post }}
+{{ if .Site.Params.creativeCommons.post }}
 <div class="post-copyright">
   <img src="/imgs/cc/cc.svg" width="75" height="75" align="right" alt="{{ T "CCLinkTitle" }}"/>
   <ul>
@@ -7,29 +7,29 @@
       {{ .Title }}
     </li>
     <li class="post-copyright-author">
-      {{- if isset .Params "author" }}
+      {{ if isset .Params "author" }}
       <strong>{{ print (T "PostCROriginAuthor") (T "SymbolColon") }} </strong>
       {{ .Params.Author }}
-      {{- else }}
+      {{ else }}
       <strong>{{ print (T "PostCRAuthor") (T "SymbolColon") }} </strong>
       {{ .Site.Params.author }}
-      {{- end }}
+      {{ end }}
     </li>
     <li class="post-copyright-link">
-      {{- if isset .Params "link" }}
+      {{ if isset .Params "link" }}
       <strong>{{ print (T "PostCROriginLink") (T "SymbolColon") }} </strong>
       <a target="_blank" href="{{ .Params.OriginLink }}" title="{{ .Title }}">{{ .Params.Link }}</a>
-      {{- else }} 
+      {{ else }} 
       <strong>{{ print (T "PostCRLink") (T "SymbolColon") }}</strong>
        <a id="post-cr-link" href="{{ .Permalink | absLangURL }}" title="{{ .Title }}">{{ .Permalink | absLangURL }}</a>
-      {{- end }}
+      {{ end }}
     </li>
     <li class="post-copyright-license">
       <strong>{{ print (T "PostCRLicenseTitle") (T "SymbolColon") }} </strong>
-      {{- $ccText := .Site.Params.creativeCommons.license | upper }}
-      {{- $ccLink := printf "<a target='_blank' href='https://creativecommons.org/licenses/by-nc-sa/4.0/deed.%s'>%s</a>" (substr .Site.LanguageCode 0 2) $ccText }}
+      {{ $ccText := .Site.Params.creativeCommons.license | upper }}
+      {{ $ccLink := printf "<a target='_blank' href='https://creativecommons.org/licenses/by-nc-sa/4.0/deed.%s'>%s</a>" (substr .Site.LanguageCode 0 2) $ccText }}
       {{ printf (T "PostCRLicenseContent") $ccLink | safeHTML }}
     </li>
   </ul>
 </div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/footer_meta/followme.html b/layouts/partials/post/footer_meta/followme.html
index ba25ed3..32aa359 100644
--- a/layouts/partials/post/footer_meta/followme.html
+++ b/layouts/partials/post/footer_meta/followme.html
@@ -1,12 +1,12 @@
-{{- with .Site.Params.followMe }}
+{{ with .Site.Params.followMe }}
   <div class="followme">
   <span>{{ T "PostFollowMe" }}</span>
   <div class="social-list">
     {{ range . }}
-    {{- $vals := split . "||" }}
-    {{- $name := trim (index $vals 0) " " }}
-    {{- $url := trim (index $vals 1) " " }}
-    {{- $icon := trim (index $vals 2) " " }}
+    {{ $vals := split . "||" }}
+    {{ $name := trim (index $vals 0) " " }}
+    {{ $url := trim (index $vals 1) " " }}
+    {{ $icon := trim (index $vals 2) " " }}
     <div class="social-item">
         <a target="_blank" class="social-link" href="{{ $url }}">
           <span class="icon">
@@ -15,7 +15,7 @@
           <span class="label">{{ $name }}</span>
         </a>
       </div>
-    {{- end }}
+    {{ end }}
   </div>
 </div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/footer_meta/reward.html b/layouts/partials/post/footer_meta/reward.html
index f9eba82..6003e84 100644
--- a/layouts/partials/post/footer_meta/reward.html
+++ b/layouts/partials/post/footer_meta/reward.html
@@ -1,21 +1,21 @@
-{{- with .Site.Params.rewardSets }}
-{{- if .enable }}
+{{ with .Site.Params.rewardSets }}
+{{ if .enable }}
 <div class="reward-container">
-  <div>{{- .comment | safeHTML -}}</div>
+  <div>{{ .comment | safeHTML }}</div>
   <button>
-    {{- T "RewardDonate" -}}
+    {{ T "RewardDonate" }}
   </button>
   <div class="post-reward">
-    {{- range $name,$img := .reward }}
-    {{- $fw := substr $name 0 1  }}
-    {{- $pay := replace $name $fw ($fw | upper) 1 }}
-    {{- $payName := T (printf "Reward%s" $pay) }}
+    {{ range $name,$img := .reward }}
+    {{ $fw := substr $name 0 1  }}
+    {{ $pay := replace $name $fw ($fw | upper) 1 }}
+    {{ $payName := T (printf "Reward%s" $pay) }}
     <div class="post-reward-item">
       <img src="/imgs/img-lazy-loading.gif"  data-src="{{ $img }}" alt="{{ $.Site.Params.author }} - {{ $payName }}">
       <span>{{ $payName }}</span>
     </div>
-    {{- end }}
+    {{ end }}
   </div>
 </div>
-{{- end }}
-{{- end }}
+{{ end }}
+{{ end }}
diff --git a/layouts/partials/post/footer_meta/tags.html b/layouts/partials/post/footer_meta/tags.html
index 09498da..81c71a8 100644
--- a/layouts/partials/post/footer_meta/tags.html
+++ b/layouts/partials/post/footer_meta/tags.html
@@ -1,9 +1,9 @@
-{{- with .Params.tags }}
+{{ with .Params.tags }}
 <div class="post-tags">
   {{ range . }}
     <a href="{{ "/tags/" | relLangURL }}{{ . | urlize | lower  }}">
     {{ . }}
   </a>
-  {{- end }}
+  {{ end }}
 </div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/header.html b/layouts/partials/post/header.html
index 2097a4f..1739ce8 100644
--- a/layouts/partials/post/header.html
+++ b/layouts/partials/post/header.html
@@ -1,27 +1,27 @@
 {{ with .ctx }}
-{{- if $.IsHome }} <h2 {{ else }} <h1 {{ end -}} class="post-title" itemprop="name headline">
-  {{- if and .Weight (gt .Weight 0) }}
+{{ if $.IsHome }} <h2 {{ else }} <h1 {{ end }} class="post-title" itemprop="name headline">
+  {{ if and .Weight (gt .Weight 0) }}
   <span class="post-sticky-flag" title="{{ T "PostStickyTitle" }}">
     <i class="fa fa-thumbtack"></i>
   </span>
-  {{- end }}
-  {{- if $.IsHome }}
-  {{- if and (isset .Params "extlink") (ne .Params.Extlink "") }}
+  {{ end }}
+  {{ if $.IsHome }}
+  {{ if and (isset .Params "extlink") (ne .Params.Extlink "") }}
   <a href="{{ .Params.Extlink }}" rel="noopener external nofollow noreferrer" target="_blank" class="exturl post-title-link post-title-link-external">
     {{ .Title }}
     <i class="fa fa-external-link-alt"></i>
   </a>
-  {{- else }}
+  {{ else }}
   <a href="{{ .RelPermalink | relLangURL }}" itemprop="url" class="post-title-link">{{ .Title }}</a>
-  {{- end }}
-  {{- else }}
-  {{- .Title }}
-  {{- if .Site.Params.postEdit.enable }}
-  {{- $editURL := printf "%s%s" .Site.Params.postEdit.url (path.Clean .File.Path) }}
+  {{ end }}
+  {{ else }}
+  {{ .Title }}
+  {{ if .Site.Params.postEdit.enable }}
+  {{ $editURL := printf "%s%s" .Site.Params.postEdit.url (path.Clean .File.Path) }}
   <a href="{{ $editURL }}" rel="noopener external nofollow noreferrer" target="_blank" class="exturl post-edit-link" title="{{ T "PostEditTitle" }}"><i class="fa fa-pen-nib"></i></a>
-  {{- end }}
-  {{- end }}
-  {{- if $.IsHome }} </h2> {{ else }} </h1> {{ end -}}
+  {{ end }}
+  {{ end }}
+  {{ if $.IsHome }} </h2> {{ else }} </h1> {{ end }}
 {{ $isComment := and (.Scratch.Get "isComment") .Site.Params.waline.comment }}
 <div class="post-meta-container">
   <div class="post-meta-items">
@@ -39,7 +39,7 @@
     </div>
     {{ end }}    
   </div>
-  {{- if not $.IsHome }}
+  {{ if not $.IsHome }}
   <div class="post-meta-items">
     {{ partial "post/header_meta/words.html" . }}
     {{ partial "post/header_meta/readtime.html" . }}
diff --git a/layouts/partials/post/header_meta/categories.html b/layouts/partials/post/header_meta/categories.html
index db09ec4..fe3783b 100644
--- a/layouts/partials/post/header_meta/categories.html
+++ b/layouts/partials/post/header_meta/categories.html
@@ -1,17 +1,17 @@
-{{- if .Site.Params.postMeta.categories }}
-{{- with .Params.categories }}
+{{ if .Site.Params.postMeta.categories }}
+{{ with .Params.categories }}
 <span class="post-meta-item">
   <span class="post-meta-item-icon">
     <i class="far fa-folder-open"></i>
   </span>
-  <span class="post-meta-item-text">{{- print (T "PostCategory") (T "SymbolColon") -}}</span>
-  {{- range (first 1 .) }}
+  <span class="post-meta-item-text">{{ print (T "PostCategory") (T "SymbolColon") }}</span>
+  {{ range (first 1 .) }}
   <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
     <a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}" itemprop="url" rel="index">
-      <span itemprop="name">{{- . -}}</span>
+      <span itemprop="name">{{ . }}</span>
     </a>
   </span>
-  {{- end }}
+  {{ end }}
 </span>
-{{- end }}
-{{- end }}
\ No newline at end of file
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/header_meta/created_date.html b/layouts/partials/post/header_meta/created_date.html
index c92b543..23c8ed8 100644
--- a/layouts/partials/post/header_meta/created_date.html
+++ b/layouts/partials/post/header_meta/created_date.html
@@ -1,13 +1,13 @@
-{{- if .Site.Params.postMeta.created }}
+{{ if .Site.Params.postMeta.created }}
 {{ $timeF := .Site.Params.timeFormat }}
 {{ $createdTime := (.Date.Format $timeF) | default (.Date.Format $timeF) }}
 <span class="post-meta-item">
   <span class="post-meta-item-icon">
     <i class="far fa-calendar"></i>
   </span>
-  <span class="post-meta-item-text">{{- print (T "PostPublishDate") (T "SymbolColon") -}}</span>
+  <span class="post-meta-item-text">{{ print (T "PostPublishDate") (T "SymbolColon") }}</span>
   <time title="{{ print (T "PostPublishDate") (T "SymbolColon") }}{{ .Date }}" itemprop="dateCreated datePublished" datetime="{{ .Date }}">
-    {{- .Date.Format .Site.Params.dateFormat -}}
+    {{ .Date.Format .Site.Params.dateFormat }}
   </time>
 </span>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/header_meta/readtime.html b/layouts/partials/post/header_meta/readtime.html
index a3bd067..40dfd62 100644
--- a/layouts/partials/post/header_meta/readtime.html
+++ b/layouts/partials/post/header_meta/readtime.html
@@ -1,9 +1,9 @@
-{{- if .Site.Params.postMeta.readTime }}
+{{ if .Site.Params.postMeta.readTime }}
 <span class="post-meta-item" title="{{ T "PostReading" }}">
   <span class="post-meta-item-icon">
     <i class="far fa-clock"></i>
   </span>
-  <span class="post-meta-item-text">{{- print (T "PostReading") (T "SymbolColon") -}}&asymp;</span>
-  <span>{{- T "PostReadTime" . -}}</span>
+  <span class="post-meta-item-text">{{ print (T "PostReading") (T "SymbolColon") }}&asymp;</span>
+  <span>{{ T "PostReadTime" . }}</span>
 </span>
-{{- end }}
+{{ end }}
diff --git a/layouts/partials/post/header_meta/update_date.html b/layouts/partials/post/header_meta/update_date.html
index af82d7a..6eab87b 100644
--- a/layouts/partials/post/header_meta/update_date.html
+++ b/layouts/partials/post/header_meta/update_date.html
@@ -1,12 +1,12 @@
-{{- if and .Site.Params.postMeta.updated.enable .Site.Params.postMeta.updated.anotherDay }}
-{{- if and .Lastmod (gt .Lastmod .Date) }}
+{{ if and .Site.Params.postMeta.updated.enable .Site.Params.postMeta.updated.anotherDay }}
+{{ if and .Lastmod (gt .Lastmod .Date) }}
 {{ $modTime := .Lastmod.Format .Site.Params.timeFormat }}
 <span class="post-meta-item">
   <span class="post-meta-item-icon">
     <i class="far fa-calendar-check"></i>
   </span>
-  <span class="post-meta-item-text">{{- print (T "PostLastModDate") (T "SymbolColon") -}}</span>
-  <time title="{{ print (T "PostLastModTime") (T "SymbolColon") }}{{ $modTime }}" itemprop="dateModified" datetime="{{ $modTime }}">{{- .Lastmod.Format .Site.Params.dateFormat -}}</time>
+  <span class="post-meta-item-text">{{ print (T "PostLastModDate") (T "SymbolColon") }}</span>
+  <time title="{{ print (T "PostLastModTime") (T "SymbolColon") }}{{ $modTime }}" itemprop="dateModified" datetime="{{ $modTime }}">{{ .Lastmod.Format .Site.Params.dateFormat }}</time>
 </span>
-{{- end }}
-{{- end }}
\ No newline at end of file
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post/header_meta/views.html b/layouts/partials/post/header_meta/views.html
index 7a15037..a2b2c16 100644
--- a/layouts/partials/post/header_meta/views.html
+++ b/layouts/partials/post/header_meta/views.html
@@ -1,10 +1,10 @@
-{{- $pageViewId := "" }}
-{{- if .Site.Params.leancloudVisitors.enable }}
-{{- $pageViewId = "leancloud-visitors-count" }}  
-{{- end }}
-{{- if .Site.Params.analytics.busuanzi.postViews }}
-{{- $pageViewId = "busuanzi_value_page_pv" }}
-{{- end }}
+{{ $pageViewId := "" }}
+{{ if .Site.Params.leancloudVisitors.enable }}
+{{ $pageViewId = "leancloud-visitors-count" }}  
+{{ end }}
+{{ if .Site.Params.analytics.busuanzi.postViews }}
+{{ $pageViewId = "busuanzi_value_page_pv" }}
+{{ end }}
 <span class="post-meta-item" title="{{ T "PostViews" }}">
   <span class="post-meta-item-icon">
     <i class="far fa-eye"></i>
diff --git a/layouts/partials/post/header_meta/words.html b/layouts/partials/post/header_meta/words.html
index 512acb9..8c06edd 100644
--- a/layouts/partials/post/header_meta/words.html
+++ b/layouts/partials/post/header_meta/words.html
@@ -1,8 +1,8 @@
-{{- if .Site.Params.postMeta.wordCount }}
+{{ if .Site.Params.postMeta.wordCount }}
 <span class="post-meta-item" title="{{ T "PostWords" }}">
   <span class="post-meta-item-icon">
     <i class="far fa-file-word"></i>
   </span>
-  <span class="post-meta-item-text">{{- print (T "PostWords") (T "SymbolColon") -}}</span><span>{{- T "PostWordCount" . -}}</span>
+  <span class="post-meta-item-text">{{ print (T "PostWords") (T "SymbolColon") }}</span><span>{{ T "PostWordCount" . }}</span>
 </span>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 9f052a3..3f5d575 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,2 +1,2 @@
-{{- partialCached "scripts/global.html" . -}}
-{{- partial "scripts/plugins.html" . -}}
\ No newline at end of file
+{{ partialCached "scripts/global.html" . }}
+{{ partial "scripts/plugins.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/scripts/global.html b/layouts/partials/scripts/global.html
index 69e14d3..e7e9e28 100644
--- a/layouts/partials/scripts/global.html
+++ b/layouts/partials/scripts/global.html
@@ -7,7 +7,7 @@
   <script type="text/javascript" src="{{ $pluginJS }}" defer></script>
 {{ end }}
 
-<script class="next-config" data-name="main" type="application/json">{{ .Scratch.Get "config" -}}</script>
+<script class="next-config" data-name="main" type="application/json">{{ .Scratch.Get "config" }}</script>
 
 {{/* Core scripts */}}
 {{ $config := resources.Get "js/config.js" }}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index c4c5b0e..9cd5453 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -22,28 +22,28 @@
       </div>
       <!--/noindex-->
       <div class="site-overview-wrap sidebar-panel">
-        {{- partialCached "sidebar/overview.html" . -}}
+        {{ partialCached "sidebar/overview.html" . }}
         
-        {{- $custom := .Scratch.Get "sidebar" }}
-        {{- if $custom }}
+        {{ $custom := .Scratch.Get "sidebar" }}
+        {{ if $custom }}
           {{ partialCached $custom . }}
-        {{- end }}
+        {{ end }}
       </div>
     </div>
    
   </div>
 
-  {{- if .Site.Params.siteState.statistic.enable }}
-    {{- partial "sidebar/siteinfo.html" . }}
-  {{- end }}
+  {{ if .Site.Params.siteState.statistic.enable }}
+    {{ partial "sidebar/siteinfo.html" . }}
+  {{ end }}
 
-  {{- if and .Site.Params.backTop.enable .Site.Params.backTop.sidebar }}
+  {{ if and .Site.Params.backTop.enable .Site.Params.backTop.sidebar }}
   <div class="sidebar-card-widget back-to-top-card">
     <div class="back-to-top animated" role="button" aria-label="{{ T "BackTop" }}">
       <i class="fa fa-arrow-up"></i>
       <span>0%</span>
     </div>
   </div>
-  {{- end }}
+  {{ end }}
 </aside>
 <div class="sidebar-dimmer"></div>
diff --git a/layouts/partials/sidebar/overview.html b/layouts/partials/sidebar/overview.html
index 4a7b280..2dc4783 100644
--- a/layouts/partials/sidebar/overview.html
+++ b/layouts/partials/sidebar/overview.html
@@ -1,14 +1,14 @@
-{{- $author := .Site.Params.author }}
+{{ $author := .Site.Params.author }}
 <div class="site-author site-overview-item animated" itemprop="author" itemscope itemtype="http://schema.org/Person">
-  {{- with .Site.Params.avatar.url }}
+  {{ with .Site.Params.avatar.url }}
     <img class="site-author-image" itemprop="image" alt="{{ $author }}"
     src="/imgs/img-lazy-loading.gif" data-src="{{ . }}">
-  {{- end }}
+  {{ end }}
   <p class="site-author-name" itemprop="name">{{ $author }}</p>
   <div class="site-description" itemprop="description">{{ .Site.Params.description }}</div>
 </div>
 
-{{- if .Site.Params.siteState.basic }}
+{{ if .Site.Params.siteState.basic }}
 <div class="site-state-wrap site-overview-item animated">
   <nav class="site-state">
     <div class="site-state-item site-state-posts">
@@ -31,62 +31,62 @@
     </div>
   </nav>
 </div>
-{{- end }}
-{{- if and .Site.Params.chat.enable (or (or .Site.Params.chatra.enable .Site.Params.tidio.enable) .Site.Params.gitter.enable) }}
+{{ end }}
+{{ if and .Site.Params.chat.enable (or (or .Site.Params.chatra.enable .Site.Params.tidio.enable) .Site.Params.gitter.enable) }}
 <div class="sidebar-button site-overview-item animated">
   <button {{ if .Site.Params.gitter.enable }} class="js-gitter-toggle-chat-button" {{ end }}>
-    {{- if .Site.Params.chat.icon }}<i class="{{ .Site.Params.chat.icon }}"></i>{{ end }}
+    {{ if .Site.Params.chat.icon }}<i class="{{ .Site.Params.chat.icon }}"></i>{{ end }}
     {{ .Site.Params.chat.text }}
   </button>
 </div>
-{{- end }}
+{{ end }}
 <div class="links-of-social site-overview-item animated">
 {{ $si := .Site.Params.socialIcons }}
 {{ range $key,$val := .Site.Params.socials }}
-{{- $vals := split $val "||" }}
-{{- $name := trim (index $vals 0) " " }}
-{{- $url := trim (index $vals 1) " " }}
-{{- $icon := trim (index $vals 2) " " }}
+{{ $vals := split $val "||" }}
+{{ $name := trim (index $vals 0) " " }}
+{{ $url := trim (index $vals 1) " " }}
+{{ $icon := trim (index $vals 2) " " }}
   <span class="links-of-social-item">
-    <a href="{{ $url }}" title="{{ $name }} → {{ $url }}" rel="noopener" {{- if and $si.enable $si.transition }} class="hvr-icon-pulse" {{- end }} target="_blank">
-      {{- if $si.enable }}
-      <i class="{{- $icon }} fa-fw {{ if $si.transition }} hvr-icon {{ end }}"></i>
-      {{- end }}
-      {{- if or (not $si.enable) (not $si.iconsOnly) }}
-      {{- $name }}
-      {{- end }}
+    <a href="{{ $url }}" title="{{ $name }} → {{ $url }}" rel="noopener" {{ if and $si.enable $si.transition }} class="hvr-icon-pulse" {{ end }} target="_blank">
+      {{ if $si.enable }}
+      <i class="{{ $icon }} fa-fw {{ if $si.transition }} hvr-icon {{ end }}"></i>
+      {{ end }}
+      {{ if or (not $si.enable) (not $si.iconsOnly) }}
+      {{ $name }}
+      {{ end }}
     </a>
   </span>
-{{- end }}
+{{ end }}
 </div>
 
-{{- with .Site.Params.creativeCommons }}
-{{- if .sidebar }}
+{{ with .Site.Params.creativeCommons }}
+{{ if .sidebar }}
 <div class="cc-license animated" itemprop="license">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.{{ substr $.Site.LanguageCode 0 2 }}" class="cc-opacity" rel="noopener" target="_blank" title="{{ T "CCLinkTitle" }}">
     <img src="/imgs/img-lazy-loading.gif" data-src="/imgs/cc/{{ .size }}/{{ replace .license "-" "_" }}.svg" alt="{{ T "CCLinkTitle" }}">
   </a>
 </div>
-{{- end }}
-{{- end }}
+{{ end }}
+{{ end }}
 
-{{- if .Site.Params.links }}
+{{ if .Site.Params.links }}
 <div class="links-of-blogroll site-overview-item animated">
   <div class="links-of-blogroll-title">
-    {{- if .Site.Params.linksSets.icon }}
+    {{ if .Site.Params.linksSets.icon }}
     <i class="{{ .Site.Params.linksSets.icon }} fa-fw"></i>
-    {{- end }}
-    {{- .Site.Params.linksSets.title }}
+    {{ end }}
+    {{ .Site.Params.linksSets.title }}
   </div>
   <ul class="links-of-blogroll-list">
-    {{- range $key,$val := .Site.Params.links }}
-    {{- $vals := split $val "||" }}
-    {{- $name := trim (index $vals 0) " " }}
-    {{- $url := trim (index $vals 1) " " }}
+    {{ range $key,$val := .Site.Params.links }}
+    {{ $vals := split $val "||" }}
+    {{ $name := trim (index $vals 0) " " }}
+    {{ $url := trim (index $vals 1) " " }}
     <li class="links-of-blogroll-item">
       <a href="{{ $url }}" title="{{ $url }}" target="_blank">{{ $name }}</a>
     </li>
-    {{- end }}
+    {{ end }}
   </ul>
 </div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/sidebar/siteinfo.html b/layouts/partials/sidebar/siteinfo.html
index e03a5b9..f4c0bdc 100644
--- a/layouts/partials/sidebar/siteinfo.html
+++ b/layouts/partials/sidebar/siteinfo.html
@@ -9,8 +9,8 @@
       <div class="item-name"><i class="fa-solid fa-calendar-check"></i>{{ T "SiteInfoItems.runTimes" }}</div>
       <div class="item-count" id="runTimes" data-publishdate="{{ $scratch.Get "last" }}"></div>
     </div>
-    {{- if eq .Site.Params.siteState.statistic.plugin "busuanzi" }}
-      {{- with .Site.Params.analytics.busuanzi }}
+    {{ if eq .Site.Params.siteState.statistic.plugin "busuanzi" }}
+      {{ with .Site.Params.analytics.busuanzi }}
       <div class="siteinfo-item">
         <div class="item-name">
           <i class="fas {{ .visitorsIcon }}"></i>{{ T "SiteInfoItems.visitors" }}
@@ -23,9 +23,9 @@
         </div>
         <div class="item-count" id="busuanzi_value_site_pv"><i class="fa fa-sync fa-spin"></i></div>
       </div>
-      {{- end }}  
-    {{- end }}    
-    {{- if eq .Site.Params.siteState.statistic.plugin "51la" }}
+      {{ end }}  
+    {{ end }}    
+    {{ if eq .Site.Params.siteState.statistic.plugin "51la" }}
     <div id="la-siteinfo-widget" style="display: none;"></div>
     <div class="siteinfo-item">
       <div class="item-name">
@@ -51,7 +51,7 @@
       </div>
       <div class="item-count" id="total_site_pv"><i class="fa fa-sync fa-spin"></i></div>
     </div>
-    {{- end }}
+    {{ end }}
     <div class="siteinfo-item">
       <div class="item-name"><i class="fa fa-font"></i>{{ T "SiteInfoItems.words" }}</div>
       <div class="item-count" id="wordsCount" data-count="{{ $scratch.Get "totalWords" }}"></div>
diff --git a/layouts/partials/widgets.html b/layouts/partials/widgets.html
index 2cddedc..c54b603 100644
--- a/layouts/partials/widgets.html
+++ b/layouts/partials/widgets.html
@@ -12,33 +12,33 @@
   <div id="toggle-theme" class="button" title="{{ T "ToolBtns.theme" }}">
     <i class="fas fa-adjust"></i>
   </div>
-  {{- if and .Site.Params.backTop.enable (not .Site.Params.backTop.sidebar) }}
+  {{ if and .Site.Params.backTop.enable (not .Site.Params.backTop.sidebar) }}
   <div class="back-to-top" role="button" title="{{ T "ToolBtns.backTop" }}">
     <i class="fa fa-arrow-up"></i>
     <span>0%</span>
   </div>
-{{- end }} 
+{{ end }} 
 </div>
 
-{{- if .Site.Params.readingProgress.enable }}
+{{ if .Site.Params.readingProgress.enable }}
   <div class="reading-progress-bar"></div>
-{{- end }}
+{{ end }}
 
-{{- if .Site.Params.bookmark.enable }}
+{{ if .Site.Params.bookmark.enable }}
   <a role="button" class="book-mark-link book-mark-link-fixed"></a>
-{{- end }}
+{{ end }}
 
-{{- with .Site.Params.githubBanner }}
-{{- if .enable }}
+{{ with .Site.Params.githubBanner }}
+{{ if .enable }}
 <a href="{{ .permalink }}" rel="noopener external nofollow noreferrer" target="_blank" title="{{ .title }}" class="exturl github-corner">
   <svg width="80" height="80" viewBox="0 0 250 250" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg>
 </a>
-{{- end }}
-{{- end }}
+{{ end }}
+{{ end }}
 
-{{- if .Site.Params.gitter.enable }}
+{{ if .Site.Params.gitter.enable }}
   {{ partial "_thirdparty/chat/gitter.html" . }}   
-{{- end }}
+{{ end }}
 
 <noscript>
   <div class="noscript-warning">Theme NexT works best with JavaScript enabled</div>
