diff --git a/_includes/footer.html b/_includes/footer.html
index 80e0d4ed..742db1ee 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,8 +1,8 @@
 <footer class="bg-dark">
 	<div class="container">
 		<p class="text-light">
-			{{ site.data[page.lang].strings.by | replace: "$1", '<a href="https://github.com/DS-Homebrew/" class="link">DS-Homebrew</a>'}} •
-			<a href="https://ds-homebrew.com/discord" title="{{ site.data[page.lang].strings.discord-server }}" class="clean">
+			{{ site.data[page.collection].strings.by | replace: "$1", '<a href="https://github.com/DS-Homebrew/" class="link">DS-Homebrew</a>'}} •
+			<a href="https://ds-homebrew.com/discord" title="{{ site.data[page.collection].strings.discord-server }}" class="clean">
 				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-discord" viewBox="0 0 16 16">
 					<path d="M6.552 6.712c-.456 0-.816.4-.816.888s.368.888.816.888c.456 0 .816-.4.816-.888.008-.488-.36-.888-.816-.888zm2.92 0c-.456 0-.816.4-.816.888s.368.888.816.888c.456 0 .816-.4.816-.888s-.36-.888-.816-.888z"/>
 					<path d="M13.36 0H2.64C1.736 0 1 .736 1 1.648v10.816c0 .912.736 1.648 1.64 1.648h9.072l-.424-1.48 1.024.952.968.896L15 16V1.648C15 .736 14.264 0 13.36 0zm-3.088 10.448s-.288-.344-.528-.648c1.048-.296 1.448-.952 1.448-.952-.328.216-.64.368-.92.472-.4.168-.784.28-1.16.344a5.604 5.604 0 0 1-2.072-.008 6.716 6.716 0 0 1-1.176-.344 4.688 4.688 0 0 1-.584-.272c-.024-.016-.048-.024-.072-.04-.016-.008-.024-.016-.032-.024-.144-.08-.224-.136-.224-.136s.384.64 1.4.944c-.24.304-.536.664-.536.664-1.768-.056-2.44-1.216-2.44-1.216 0-2.576 1.152-4.664 1.152-4.664 1.152-.864 2.248-.84 2.248-.84l.08.096c-1.44.416-2.104 1.048-2.104 1.048s.176-.096.472-.232c.856-.376 1.536-.48 1.816-.504.048-.008.088-.016.136-.016a6.521 6.521 0 0 1 4.024.752s-.632-.6-1.992-1.016l.112-.128s1.096-.024 2.248.84c0 0 1.152 2.088 1.152 4.664 0 0-.68 1.16-2.448 1.216z"/>
@@ -10,7 +10,7 @@
 			</a>
 			<br>
 			
-			{{ site.data[page.lang].strings.published-with | replace: "$1", site.repo }}
+			{{ site.data[page.collection].strings.published-with | replace: "$1", site.repo }}
 		</p>
 	</div>
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index f06cd1ec..1db79ab9 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,10 +4,10 @@
 	<meta name="viewport" content="width=device-width,maximum-scale=2">
 
 	<title>
-		{% if site.data[page.lang].strings.title != page.title %}
+		{% if site.data[page.collection].strings.title != page.title %}
 			{{ page.title }} |
 		{% endif %}
-		{{ site.data[page.lang].strings.title }}
+		{{ site.data[page.collection].strings.title }}
 	</title>
 
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
diff --git a/_includes/nav.html b/_includes/nav.html
index ae038b03..5919d83c 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,17 +1,17 @@
 <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
 	<div class="container-fluid maxwidth">
 		<span class="navbar-brand">
-			<a class="navbar-brand mb-0 h1" href="{{ site.data[page.lang].nav[0].url }}">{{ site.data[page.lang].strings.title }}</a>
+			<a class="navbar-brand mb-0 h1" href="{% unless page.collection == "en-US" %}/{{ page.collection }}{% endunless %}{{ site.data[page.collection].nav[0].url }}">{{ site.data[page.collection].strings.title }}</a>
 		</span>
 		<button class="navbar-toggler mr-4" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 			<span class="navbar-toggler-icon"></span>
 		</button>
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 			<ul class="navbar-nav">
-				{% for item in site.data[page.lang].nav %}
+				{% for item in site.data[page.collection].nav %}
 					{% if item.url %}
 						<li class="nav-item">
-							<a class="nav-link {% if item.title == page.title %} active {% endif %}" href="{{ item.url }}">{{ item.title }}</a>
+							<a class="nav-link {% if item.title == page.title %} active {% endif %}" href="{% unless page.collection == "en-US" %}/{{ page.collection }}{% endunless %}{{ item.url }}">{{ item.title }}</a>
 						</li>
 					{% endif %}
 					{% if item.items %}
@@ -30,7 +30,7 @@
 					{% endif %}
 				{% endfor %}
 				<li class="nav-item">
-					<a class="nav-link" href="https://github.com/{{ page.repo | default: site.repo }}">{{ site.data[page.lang].strings.source}}</a>
+					<a class="nav-link" href="https://github.com/{{ page.repo | default: site.repo }}">{{ site.data[page.collection].strings.source}}</a>
 				</li>
 			</ul>
 			<div class="btn-group language-dropdown">
@@ -40,17 +40,17 @@
 					</svg>
 				</button>
 				<ul class="dropdown-menu dropdown-menu-end-sm">
-					{% assign ref = page.url | split: page.lang | last %}
+					{% assign ref = page.url | split: page.collection | last %}
 					{% for collection in site.collections %}
 						{% for item in site[collection.label] %}
 							{% assign itemRef = item.url | split: item.lang | last %}
 							{% if itemRef == ref %}
-								<li><a class="dropdown-item{% if item.lang == page.lang %} active {% endif %}" href="{{ item.url }}">{{ site.lang-names[item.lang] }}</a></li>
+								<li><a class="dropdown-item{% if item.lang == page.collection %} active {% endif %}" href="{{ item.url }}">{{ site.lang-names[item.lang] }}</a></li>
 							{% endif %}
 						{% endfor %}
 					{% endfor %}
 					<li><hr class="dropdown-divider"></li>
-					<li><a class="dropdown-item" href="https://crowdin.com/project/ds-homebrew-wiki">{{ site.data[page.lang].strings.help-translate }}</a></li>
+					<li><a class="dropdown-item" href="https://crowdin.com/project/ds-homebrew-wiki">{{ site.data[page.collection].strings.help-translate }}</a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/_includes/seo.html b/_includes/seo.html
index ccb5b095..334232a3 100644
--- a/_includes/seo.html
+++ b/_includes/seo.html
@@ -1,14 +1,14 @@
 <link rel="canonical" href="{{ site.url | append: page.url }}" />
-<meta name="description" content="{{ page.description | default: site.data[page.lang].strings.description | escape }}" />
-<meta property="og:title" content="{{ page.title | default: site.data[page.lang].strings.title | escape }}" />
-<meta property="og:locale" content="{{ page.lang | default: "en_US"}}" />
+<meta name="description" content="{{ page.description | default: site.data[page.collection].strings.description | escape }}" />
+<meta property="og:title" content="{{ page.title | default: site.data[page.collection].strings.title | escape }}" />
+<meta property="og:locale" content="{{ page.collection | default: "en_US"}}" />
 <meta property="og:url" content="{{ site.url | append: page.url }}" />
-<meta property="og:site_name" content="{{ site.data[page.lang].strings.title | escape }}" />
+<meta property="og:site_name" content="{{ site.data[page.collection].strings.title | escape }}" />
 <meta property="og:image" content="{{ page.image | default: site.image }}">
-<meta property="og:description" content="{{ page.description | default: site.data[page.lang].strings.description | escape }}" />
+<meta property="og:description" content="{{ page.description | default: site.data[page.collection].strings.description | escape }}" />
 <meta name="twitter:card" content="summary">
-<meta name="twitter:title" content="{{ page.title | default: site.data[page.lang].strings.title | escape }}">
-<meta name="twitter:description" content="{{ page.description | default: site.data[page.lang].strings.description | escape }}">
+<meta name="twitter:title" content="{{ page.title | default: site.data[page.collection].strings.title | escape }}">
+<meta name="twitter:description" content="{{ page.description | default: site.data[page.collection].strings.description | escape }}">
 <meta name="twitter:image" content="{{ page.image | default: site.image }}">
 <meta name="theme-color" content="{{ page.color | default: site.color }}"/>
 <meta name="msapplication-navbutton-color" content="{{ page.color | default: site.color }}">
diff --git a/_layouts/default.html b/_layouts/default.html
index 201d68ba..992006b5 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,7 +3,7 @@ layout: compress
 ---
 
 <!DOCTYPE html>
-<html lang="{{ page.lang | default: "en-US" }}">
+<html lang="{{ page.collection | default: "en-US" }}">
 {% include head.html%}
 
 <body>
diff --git a/_layouts/wiki.html b/_layouts/wiki.html
index db77df6b..bc733c44 100644
--- a/_layouts/wiki.html
+++ b/_layouts/wiki.html
@@ -3,7 +3,7 @@ layout: compress
 ---
 
 <!DOCTYPE html>
-<html lang="{{ page.lang | default: "en-US" }}">
+<html lang="{{ page.collection | default: "en-US" }}">
 {% include head.html%}
 
 <body>