diff --git a/apps/test/hugo.toml b/apps/test/hugo.toml
index 7cbea17b..202282ca 100644
--- a/apps/test/hugo.toml
+++ b/apps/test/hugo.toml
@@ -12,12 +12,12 @@ defaultContentLanguage = "en"
 # [languages]
 
 # [languages.en]
-# languageCode = "en"
-# languageName = "English"
+# locale = "en"
+# label = "English"
 
 # [languages.zh-cn]
-# languageCode = "zh-CN"
-# languageName = "简体中文"
+# locale = "zh-CN"
+# label = "简体中文"
 
 [permalinks]
 
diff --git a/hugo.toml b/hugo.toml
index 8a648eab..eff89695 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -22,10 +22,10 @@ baseURL = "http://localhost:1313"
 defaultContentLanguage = "en"
 # Language code.
 # available values: ["en", "zh-CN", "fr", "pl", ...]
-languageCode = "en"
+locale = "en"
 # Language name.
 # available values: ["English", "简体中文", "Français", "Polski", ...]
-languageName = "English"
+label = "English"
 # Whether to include Chinese/Japanese/Korean.
 hasCJKLanguage = false
 # Timezone local.
diff --git a/layouts/_partials/function/is-cjk.html b/layouts/_partials/function/is-cjk.html
index 53b92256..bbe082be 100644
--- a/layouts/_partials/function/is-cjk.html
+++ b/layouts/_partials/function/is-cjk.html
@@ -1,4 +1,4 @@
 {{- $cjk := slice "zh-cn" "zh-tw" "ja" "ko" -}}
-{{- $isCJK := (in $cjk .Page.Language.Lang) | default .Page.Params.IsCJKLanguage -}}
+{{- $isCJK := (in $cjk .Page.Language.Name) | default .Page.Params.IsCJKLanguage -}}
 
 {{- return $isCJK -}}
diff --git a/layouts/_partials/init/detection-env.html b/layouts/_partials/init/detection-env.html
index 37dae512..6a58b3c1 100644
--- a/layouts/_partials/init/detection-env.html
+++ b/layouts/_partials/init/detection-env.html
@@ -19,7 +19,7 @@
   {{- if ne .Site.Params.dev.enable true -}}
     {{- .Site.Store.Set "devOpts" dict -}}
   {{- end -}}
-  {{- if eq .Site hugo.Sites.Default -}}
+  {{- if .Site.Language.IsDefault -}}
     {{- warnf "FixIt %v\n%v\n\n" (hugo.Store.Get "version") (T "init.devEnvWarn") -}}
   {{- end -}}
 {{- end -}}
diff --git a/layouts/_partials/init/detection-pagefind.html b/layouts/_partials/init/detection-pagefind.html
index c8a6cd21..69a0ecb5 100644
--- a/layouts/_partials/init/detection-pagefind.html
+++ b/layouts/_partials/init/detection-pagefind.html
@@ -1,3 +1,3 @@
-{{- if and (eq .Site hugo.Sites.Default) .Site.Params.search.enable (eq .Site.Params.search.type "pagefind") (not (fileExists "public/pagefind")) -}}
+{{- if and .Site.Language.IsDefault .Site.Params.search.enable (eq .Site.Params.search.type "pagefind") (not (fileExists "public/pagefind")) -}}
   {{- warnf "[FixIt] Pagefind search index not found.\nRun `npx pagefind --site public` in the site root directory after building.\n" -}}
 {{- end -}}
diff --git a/layouts/_partials/init/detection-version.html b/layouts/_partials/init/detection-version.html
index 27de9bef..4bd79529 100644
--- a/layouts/_partials/init/detection-version.html
+++ b/layouts/_partials/init/detection-version.html
@@ -21,7 +21,7 @@
 {{- end -}}
 
 {{- /* FixIt theme version detection */ -}}
-{{- if eq .Site hugo.Sites.Default -}}
+{{- if .Site.Language.IsDefault -}}
   {{- if not .Site.Params.version -}}
     {{- errorf "FixIt %v\n%v\n\n" $version (T "init.configurationError") -}}
   {{- else if gt "0.2.0" (strings.TrimPrefix "v" .Site.Params.version) -}}
diff --git a/layouts/_partials/init/index.html b/layouts/_partials/init/index.html
index 557ec2c4..20258592 100644
--- a/layouts/_partials/init/index.html
+++ b/layouts/_partials/init/index.html
@@ -1,4 +1,4 @@
-{{- hugo.Store.Set "version" "v1.0.0-mrizf1fk" -}}
+{{- hugo.Store.Set "version" "v1.0.0-mrj0ikh7" -}}
 {{- .Store.Set "this" dict -}}
 
 {{- partial "init/detection-env.html" . -}}
diff --git a/layouts/_shortcodes/version.html b/layouts/_shortcodes/version.html
index 10a87dcd..ec31e3d3 100644
--- a/layouts/_shortcodes/version.html
+++ b/layouts/_shortcodes/version.html
@@ -25,7 +25,7 @@
 -}}
 {{- $color := index $colorMap $type | default (index $colorMap "new") -}}
 {{- $repoName := .Get 3 | default $rvc.name -}}
-{{- $pathTemplate := cond hugo.IsMultilingual (printf "images/version/%%v-%%v.%v.svg" .Page.Language.Lang) "images/version/%v-%v.svg" -}}
+{{- $pathTemplate := cond hugo.IsMultilingual (printf "images/version/%%v-%%v.%v.svg" .Page.Language.Name) "images/version/%v-%v.svg" -}}
 {{- $path := printf $pathTemplate $version $type -}}
 {{- $resource := resources.Get "images/version.template.svg" -}}
 {{- $resource = $resource | resources.ExecuteAsTemplate $path (dict "version" $version "label" $label "color" $color "isCJK" $isCJK) | minify -}}