diff --git a/exampleSite/config/_default/hugo.toml b/exampleSite/config/_default/hugo.toml
index 3dbd8b1065..4c433fdb46 100644
--- a/exampleSite/config/_default/hugo.toml
+++ b/exampleSite/config/_default/hugo.toml
@@ -87,6 +87,7 @@ summaryLength = 10
   [languages.en]
     title = "Hugo Relearn Theme"
     weight = 1
+    languageCode = "en"
     languageName = "English"
     # Language dependent settings:
     # Use case https://gohugo.io/content-management/multilingual/#translation-by-content-directory
@@ -129,7 +130,9 @@ summaryLength = 10
   [languages.pir]
     title = "Cap'n Hugo Relearrrn Theme"
     weight = 2
-    languageCode = "art-pir"
+    # It would be more standard compliant to have the language key also
+    # named art-x-pir but that would require to rename all files
+    languageCode = "art-x-pir"
     languageDirection = "rtl"
     languageName = "Arrr! ☠ Pirrrates ☠"
     # Language dependent settings:
diff --git a/i18n/pir.toml b/i18n/art-x-pir.toml
similarity index 100%
rename from i18n/pir.toml
rename to i18n/art-x-pir.toml
diff --git a/i18n/zh_cn.toml b/i18n/zh-CN.toml
similarity index 100%
rename from i18n/zh_cn.toml
rename to i18n/zh-CN.toml
diff --git a/i18n/zh-Hans.toml b/i18n/zh-Hans.toml
new file mode 100644
index 0000000000..b1d7b40789
--- /dev/null
+++ b/i18n/zh-Hans.toml
@@ -0,0 +1,119 @@
+[Reading-direction]
+other = "ltr"
+
+[Search]
+other = "搜索"
+
+[Search-placeholder]
+other = "搜索..."
+
+[Clear-search]
+other = "清除搜索"
+
+[No-results-found]
+other = "找不到\"{0}\"的结果"
+
+[N-results-found]
+other = "为\"{0}\"找到 {1} 个结果"
+
+[Clear-History]
+other = "清理历史记录"
+
+[Reset-view]
+other = "重置视图"
+
+[View-reset]
+other = "查看重置！"
+
+[Attachments-label]
+other = "附件"
+
+[title-404]
+other = "未定位"
+
+[message-404]
+other = "哎哟。 看起来这个页面不存在 ¯\\_(ツ)_/¯。"
+
+[Go-to-homepage]
+other = "转到主页"
+
+[Edit-this-page]
+other = "编辑"
+
+[Print-this-chapter]
+other = "打印整章"
+
+[More-action]
+other = "更多"
+
+[Shortcuts-Title]
+other = "更多"
+
+[Expand-title]
+other = "展开"
+
+[Navigation-toggle]
+other = "导航"
+
+[Toc-toggle]
+other = "目录"
+
+[Byte-symbol]
+other = "B"
+
+[Kilobyte-symbol]
+other = "KB"
+
+[Megabyte-symbol]
+other = "MB"
+
+[note]
+other = "注释"
+
+[info]
+other = "信息"
+
+[tip]
+other = "提示"
+
+[warning]
+other = "警告"
+
+[Copy-to-clipboard]
+other = "复制到剪贴板"
+
+[Copied-to-clipboard]
+other = "复制到剪贴板！"
+
+[Copy-link-to-clipboard]
+other = "将链接复制到剪贴板"
+
+[Link-copied-to-clipboard]
+other = "链接复制到剪贴板！"
+
+[Chapter]
+other = "第{{.}}章"
+
+[Language]
+other = "语言"
+
+[Theme]
+other = "主题"
+
+[Submenu]
+other = "子菜单{{.}}"
+
+[Subsections]
+other = "{{.}} 的子部分"
+
+[tags]
+other = "标签"
+
+[tag]
+other = "标签"
+
+[categories]
+other = "类别"
+
+[category]
+other = "类别"
diff --git a/i18n/zh_tw.toml b/i18n/zh-Hant.toml
similarity index 100%
rename from i18n/zh_tw.toml
rename to i18n/zh-Hant.toml
diff --git a/i18n/zh-TW.toml b/i18n/zh-TW.toml
new file mode 100644
index 0000000000..49509135ad
--- /dev/null
+++ b/i18n/zh-TW.toml
@@ -0,0 +1,119 @@
+[Reading-direction]
+other = "ltr"
+
+[Search]
+other = "搜尋"
+
+[Search-placeholder]
+other = "搜尋..."
+
+[Clear-search]
+other = "清除搜索"
+
+[No-results-found]
+other = "找不到\"{0}\"的結果"
+
+[N-results-found]
+other = "為\"{0}\"找到 {1} 個結果"
+
+[Clear-History]
+other = "清除歷史紀錄"
+
+[Reset-view]
+other = "重置檢視"
+
+[View-reset]
+other = "查看重置！"
+
+[Attachments-label]
+other = "附件"
+
+[title-404]
+other = "未定位"
+
+[message-404]
+other = "這個網頁已經被刪除、移動或從未存在"
+
+[Go-to-homepage]
+other = "回到首頁"
+
+[Edit-this-page]
+other = "編輯網頁"
+
+[Print-this-chapter]
+other = "列印整章"
+
+[More-action]
+other = "更多"
+
+[Shortcuts-Title]
+other = "更多"
+
+[Expand-title]
+other = "展開"
+
+[Navigation-toggle]
+other = "導航"
+
+[Toc-toggle]
+other = "目錄"
+
+[Byte-symbol]
+other = "B"
+
+[Kilobyte-symbol]
+other = "KB"
+
+[Megabyte-symbol]
+other = "MB"
+
+[note]
+other = "註釋"
+
+[info]
+other = "資訊"
+
+[tip]
+other = "提示"
+
+[warning]
+other = "警告"
+
+[Copy-to-clipboard]
+other = "複製到剪貼板"
+
+[Copied-to-clipboard]
+other = "複製到剪貼簿！"
+
+[Copy-link-to-clipboard]
+other = "將連結複製到剪貼簿"
+
+[Link-copied-to-clipboard]
+other = "連結複製到剪貼簿！"
+
+[Chapter]
+other = "第{{.}}章"
+
+[Language]
+other = "語言"
+
+[Theme]
+other = "主題"
+
+[Submenu]
+other = "子功能表{{.}}"
+
+[Subsections]
+other = "{{.}} 的子部分"
+
+[tags]
+other = "標籤"
+
+[tag]
+other = "標籤"
+
+[categories]
+other = "類別"
+
+[category]
+other = "類別"