6 files changed, 16 insertions, 14 deletions
diff --git a/website/config/_default/languages.en.toml b/website/config/_default/languages.en.toml
deleted file mode 100644
index 120628c13c..0000000000
--- a/website/config/_default/languages.en.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-title = "The FreeBSD Project"
-contentDir = "content/en"
-languageName = "English"
-weight = 1
diff --git a/website/config/_default/languages.ru.toml b/website/config/_default/languages.ru.toml
deleted file mode 100644
index 7dfbab8551..0000000000
--- a/website/config/_default/languages.ru.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-title = "The FreeBSD Project"
-contentDir = "content/ru"
-languageName = "Russian"
-weight = 12
diff --git a/website/config/_default/languages.zh-tw.toml b/website/config/_default/languages.zh-tw.toml
deleted file mode 100644
index 3c37da111a..0000000000
--- a/website/config/_default/languages.zh-tw.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-title = "The FreeBSD Project"
-contentDir = "content/zh-tw"
-languageName = "繁體中文"
-weight = 6
diff --git a/website/config/_default/hugo.toml b/website/hugo.toml
index 0c1d93f723..22e19c1cb1 100644
--- a/website/config/_default/hugo.toml
+++ b/website/hugo.toml
@@ -49,3 +49,17 @@ IsHTML = true
 IsPlainText = false
 noUgly = true
 Rel = "alternate"
+
+[languages]
+  [languages.en]
+    contentDir = "content/en"
+    label = "English"
+    weight = 1
+  [languages.ru]
+    contentDir = "content/ru"
+    label = "Russian"
+    weight = 2
+  [languages.zh-tw]
+    contentDir = "content/zh-tw"
+    label = "繁體中文"
+    weight = 3
diff --git a/website/themes/beastie/layouts/baseof.html b/website/themes/beastie/layouts/baseof.html
index 46d88a99a9..7ecbe294ee 100644
--- a/website/themes/beastie/layouts/baseof.html
+++ b/website/themes/beastie/layouts/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $.Site.LanguageCode | default "en" }}">
+<html lang="{{ .Site.Language.Name }}">
   {{ partial "site-head.html" . }}
   <body>
     <div id="container">
diff --git a/website/themes/beastie/theme.toml b/website/themes/beastie/theme.toml
index 5058603475..74a6ee7a06 100644
--- a/website/themes/beastie/theme.toml
+++ b/website/themes/beastie/theme.toml
@@ -3,7 +3,7 @@ copyright = "BSD 2-clause 'Simplified' License"
 description = "Theme to build the FreeBSD website"
 homepage = "https://www.freebsd.org"
 tags = ["website", "freebsd", "bsd"]
-min_version = "0.146.0"
+min_version = "0.153.0"
 
 [author]
 name = "Sergio Carlavilla"