diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 9ea3641..cb2af39 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -70,14 +70,20 @@ params:
         # Waline 前端配置参见 https://waline.js.org/reference/client.html
         # Waline client configuration see: https://waline.js.org/en/reference/client.html
         waline:
-            serverURL:
+            serverURL: 
             lang:
             visitor:
             avatar:
             emoji:
-            admin:
+                - emoji URL 1
+                - emoji URL 2
             requiredMeta:
+                - name
+                - email
+                - url
             placeholder:
+            locale:
+                admin: test
 
     widgets:
         enabled:
diff --git a/exampleSite/content/categories/Test/_index.md b/exampleSite/content/categories/Test/_index.md
index 0b3cfa9..de42112 100644
--- a/exampleSite/content/categories/Test/_index.md
+++ b/exampleSite/content/categories/Test/_index.md
@@ -1,9 +1,9 @@
 ---
 title: "Test"
-description: "This is a example category"
+description: "This is an example category"
 slug: "test"
 image: "hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg"
 style:
     background: "#2a9d8f"
     color: "#fff"
----
\ No newline at end of file
+---
diff --git a/i18n/ja.yaml b/i18n/ja.yaml
index e9744c2..b39f87c 100644
--- a/i18n/ja.yaml
+++ b/i18n/ja.yaml
@@ -28,7 +28,7 @@ widget:
 
 search:
     title:
-        other: サーチ
+        other: 検索
     placeholder:
         other: 入力...
     resultTitle:
diff --git a/layouts/partials/comments/provider/waline.html b/layouts/partials/comments/provider/waline.html
index 5033d66..d4b418f 100644
--- a/layouts/partials/comments/provider/waline.html
+++ b/layouts/partials/comments/provider/waline.html
@@ -7,25 +7,26 @@
         box-shadow: var(--shadow-l1);
         padding: var(--card-padding);
     }
+    .waline-container .vcount {
+        color: var(--card-text-color-main);
+    }
 </style>
 
 {{- with .Site.Params.comments.waline -}}
-<script>
-    // 本页配置参见 https://waline.js.org/reference/client.html
-    // Waline client configuration see: https://waline.js.org/en/reference/client.html
-	new Waline({
-        el: '#waline',
-        serverURL: '{{ .serverURL }}',
-        lang: '{{ .lang }}',
-        visitor: '{{ .visitor }}',
-        avatar: '{{ .avatar }}',
-        emoji: ['{{ .emoji }}'],
-        dark: 'body[data-scheme="dark"]',
-        requiredMeta: ['{{ .requiredMeta }}'],
-        locale: {
-            admin: '{{ .admin }}',
-            placeholder: '{{ .placeholder }}',
-        },
-    });
-</script>
+{{- $config := dict "el" "#waline" "dark" "body[data-scheme=\"dark\"]" -}}
+{{- $replaceKeys := dict "serverurl" "serverURL" "requiredmeta" "requiredMeta" "wordlimit" "wordLimit" "pagesize" "pageSize" "avatarcdn" "avatarCDN" "avatarforce" "avatarForce" -}}
+
+{{- range $key, $val := . -}}
+    {{- if $val -}}  
+        {{- $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
+    new Waline({{ $config | jsonify | safeJS }});
+</script>
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html
index fd9ef73..4d89b89 100644
--- a/layouts/partials/head/head.html
+++ b/layouts/partials/head/head.html
@@ -21,5 +21,5 @@
     <link rel="shortcut icon" href="{{ . }}" />
 {{ end }}
 
-{{- template "_internal/google_analytics_async.html" . -}}
+{{- template "_internal/google_analytics.html" . -}}
 {{- partial "head/custom.html" . -}}
diff --git a/layouts/partials/helper/image.html b/layouts/partials/helper/image.html
index dd86d27..11fc3b6 100644
--- a/layouts/partials/helper/image.html
+++ b/layouts/partials/helper/image.html
@@ -8,7 +8,7 @@
     {{ $url := urls.Parse $imageValue }}
 
     {{ if or (eq $url.Scheme "http") (eq $url.Scheme "https") }}
-        <!-- Is a external image -->
+        <!-- Is an external image -->
         {{ $result = merge $result (dict "permalink" $imageValue) }}
     {{ else }}
         {{ $pageResourceImage := .Context.Resources.GetMatch (printf "%s" ($imageValue | safeURL)) }}
@@ -58,4 +58,4 @@
 
 {{ end }}
 
-{{ return $result }}
\ No newline at end of file
+{{ return $result }}