diff --git a/config.yaml b/config.yaml
index 4538490..f1d6935 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,19 +7,19 @@ hasCJKLanguage: true
 defaultContentLanguage: zh-CN
 disableKinds: [taxonomy, term, RSS]
 enableRobotsTXT: true
-googleAnalytics: G-DVB8ZD276Q
+
+services:
+  googleAnalytics:
+    ID: 'G-DVB8ZD276Q'
 
 params:
   description: Project Trans 非正式笔记
-
-author:
-  name: Project Trans
-  url: https://project-trans.org
-  email: admin@project-trans.org
-
-social:
   twitter: MtFwiki
   telegram: MtFwiki
+  author:
+    name: Project Trans
+    url: https://project-trans.org
+    email: admin@project-trans.org
 
 markup:
   goldmark:
diff --git a/themes/mtfwiki-blog/layouts/partials/head/google-analytics.html b/themes/mtfwiki-blog/layouts/partials/head/google-analytics.html
index 8dc1f46..8f823f9 100644
--- a/themes/mtfwiki-blog/layouts/partials/head/google-analytics.html
+++ b/themes/mtfwiki-blog/layouts/partials/head/google-analytics.html
@@ -1,4 +1,4 @@
-{{- $defines := dict "MEASUREMENT_ID" (jsonify .Site.GoogleAnalytics) -}}
+{{- $defines := dict "MEASUREMENT_ID" (jsonify .Site.Services.GoogleAnalytics.ID) -}}
 {{- with resources.Get "gtag.ts" | js.Build (dict "defines" $defines) | minify | fingerprint }}
 <script src="{{ .Permalink }}"></script>
 {{- end }}
\ No newline at end of file
diff --git a/themes/mtfwiki-blog/layouts/partials/head/jsonld.html b/themes/mtfwiki-blog/layouts/partials/head/jsonld.html
index ae6e832..b078cc0 100644
--- a/themes/mtfwiki-blog/layouts/partials/head/jsonld.html
+++ b/themes/mtfwiki-blog/layouts/partials/head/jsonld.html
@@ -22,9 +22,9 @@
 {{-
 $publisher := dict
   "@type" "Organization"
-  "name" .Site.Author.name
-  "url" .Site.Author.url
-  "email" .Site.Author.email
+  "name" .Site.Params.Author.name
+  "url" .Site.Params.Author.url
+  "email" .Site.Params.Author.email
 -}}
 {{-
 $brand := dict
@@ -33,7 +33,7 @@
   "name" .Site.Title
   "url" .Site.Home.Permalink
   "logo" (resources.GetMatch "favicon**").Permalink
-  "email" .Site.Author.email
+  "email" .Site.Params.Author.email
 -}}
 {{-
 $article := dict
diff --git a/themes/mtfwiki-blog/layouts/partials/head/resources.html b/themes/mtfwiki-blog/layouts/partials/head/resources.html
index d490003..e225809 100644
--- a/themes/mtfwiki-blog/layouts/partials/head/resources.html
+++ b/themes/mtfwiki-blog/layouts/partials/head/resources.html
@@ -8,6 +8,6 @@
 {{- with resources.Get "main.scss" | toCSS | minify | fingerprint }}
 <link rel="stylesheet" href="{{ .Permalink }}">
 {{- end }}
-{{- if not .Site.IsServer }}
+{{- if not hugo.IsServer }}
 {{- partial "head/google-analytics" . }}
 {{- end }}
\ No newline at end of file
diff --git a/themes/mtfwiki-blog/layouts/partials/head/telegram.html b/themes/mtfwiki-blog/layouts/partials/head/telegram.html
index 8fe2f49..f76a80f 100644
--- a/themes/mtfwiki-blog/layouts/partials/head/telegram.html
+++ b/themes/mtfwiki-blog/layouts/partials/head/telegram.html
@@ -1,3 +1,3 @@
-{{- with .Site.Social.telegram -}}
+{{- with .Site.Params.telegram -}}
 <meta name="telegram:channel" content="@{{ . }}">
 {{- end }}
\ No newline at end of file
diff --git a/themes/mtfwiki-blog/layouts/partials/head/twitter.html b/themes/mtfwiki-blog/layouts/partials/head/twitter.html
index f53b17a..26a5da9 100644
--- a/themes/mtfwiki-blog/layouts/partials/head/twitter.html
+++ b/themes/mtfwiki-blog/layouts/partials/head/twitter.html
@@ -3,10 +3,10 @@
 {{- with .Description | default (cond .IsPage .Summary .Site.Params.description) }}
 <meta name="twitter:description" content="{{ . }}">
 {{- end }}
-{{- with .Site.Social.twitter }}
+{{- with .Site.Params.twitter }}
 <meta name="twitter:site" content="@{{ . }}">
 {{- end }}
-{{- with .Params.twitter | default .Site.Social.twitter }}
+{{- with .Params.twitter | default .Site.Params.twitter }}
 <meta name="twitter:creator" content="@{{ . }}">
 {{- end }}
 {{- with resources.GetMatch "favicon**" }}