diff --git a/_config.yml b/_config.yml
index 5cfacd4f..b0ce449a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -48,26 +48,3 @@ collections:
     output: true
   zh-TW:
     output: true
-
-lang-names:
-  da-DK: Dansk
-  de-DE: Deutsch
-  en-US: English
-  es-ES: Español
-  fr-FR: Français
-  he-IL: עברית
-  hu-HU: Magyar
-  it-IT: Italiano
-  ja-JP: 日本語
-  ko-KR: 한국어
-  no-NO: Norsk bokmål
-  pl-PL: Polski
-  pt-PT: Português
-  ru-RU: Русский
-  sv-SE: Svenska
-  tr-TR: Türkçe
-  uk-UA: Українська
-  zh-CN: 中文 (简体)
-  zh-TW: 中文 (繁體)
-
-rtl: [he-IL]
\ No newline at end of file
diff --git a/_data/crowdin-languages.yml b/_data/crowdin-languages.yml
new file mode 100644
index 00000000..5bffb08e
--- /dev/null
+++ b/_data/crowdin-languages.yml
@@ -0,0 +1,19 @@
+da-DK: da
+de-DE: de
+# en-US:
+es-ES: es
+fr-FR: fr
+# he-IL:
+hu-HU: hu
+it-IT: it
+ja-JP: ja
+# ko-KR:
+# no-NO:
+pl-PL: pl
+pt-PT: pt
+ru-RU: ru
+# sv-SE:
+tr-TR: tr
+uk-UA: uk
+# zh-CN:
+# zh-TW:
diff --git a/_data/lang-names.json b/_data/lang-names.json
new file mode 100644
index 00000000..37e7d952
--- /dev/null
+++ b/_data/lang-names.json
@@ -0,0 +1,21 @@
+{
+	"da-DK": "Dansk",
+	"de-DE": "Deutsch",
+	"en-US": "English",
+	"es-ES": "Español",
+	"fr-FR": "Français",
+	"he-IL": "עברית",
+	"hu-HU": "Magyar",
+	"it-IT": "Italiano",
+	"ja-JP": "日本語",
+	"ko-KR": "한국어",
+	"no-NO": "Norsk bokmål",
+	"pl-PL": "Polski",
+	"pt-PT": "Português",
+	"ru-RU": "Русский",
+	"sv-SE": "Svenska",
+	"tr-TR": "Türkçe",
+	"uk-UA": "Українська",
+	"zh-CN": "中文 (简体)",
+	"zh-TW": "中文 (繁體)"
+}
\ No newline at end of file
diff --git a/_data/rtl.json b/_data/rtl.json
new file mode 100644
index 00000000..2cc12750
--- /dev/null
+++ b/_data/rtl.json
@@ -0,0 +1,3 @@
+[
+	"he-IL"
+]
diff --git a/_includes/head.html b/_includes/head.html
index a6ff8146..871da75c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -11,7 +11,7 @@
 	</title>
 
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-	{% if site.rtl contains page.collection %}
+	{% if site.data.rtl contains page.collection %}
 		<link id="bootstrap-stylesheet" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.rtl.min.css" integrity="sha384-mUkCBeyHPdg0tqB6JDd+65Gpw5h/l8DKcCTV2D2UpaMMFd7Jo8A+mDAosaWgFBPl" crossorigin="anonymous">
 	{% else %}
 		<link id="bootstrap-stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
diff --git a/_includes/nav.html b/_includes/nav.html
index 0fb90336..0edd9692 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -47,14 +47,14 @@
 							{% 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.collection %} active{% endif %}" data-language-id="{{ item.lang }}" href="{{ item.url | remove: ".html" }}">{{ site.lang-names[item.lang] }}</a></li>
+									<li><a class="dropdown-item{% if item.lang == page.collection %} active{% endif %}" data-language-id="{{ item.lang }}" href="{{ item.url | remove: ".html" }}">{{ site.data.lang-names[item.lang] }}</a></li>
 								{% endif %}
 							{% endfor %}
 						{% endunless %}
 					{% endfor %}
 					<li><hr class="dropdown-divider"></li>
 					<li><a class="dropdown-item" href="{% for item in site.ic-IC %}{% assign itemRef = item.url | split: item.collection | last %}{% if itemRef == ref %}{{ item.url | remove: ".html" }}{% endif %}{% endfor %}">{{ site.data[page.collection].strings.translate-here }}</a></li>
-					<li><a class="dropdown-item" href="https://crowdin.com/project/ds-homebrew-wiki">{{ site.data[page.collection].strings.translate-on-crowdin }}</a></li>
+					<li><a class="dropdown-item" href="https://{% if site.data.crowdin-languages contains page.collection %}{{ site.data.crowdin-languages[page.collection] }}.{% endif %}crowdin.com/project/ds-homebrew-wiki">{{ site.data[page.collection].strings.translate-on-crowdin }}</a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/_layouts/default.html b/_layouts/default.html
index d16b79a8..14431a67 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,6 +1,6 @@
 
 <!DOCTYPE html>
-<html lang="{{ page.collection | default: "en-US" }}" {% if site.rtl contains page.collection %}dir="rtl"{% endif %}>
+<html lang="{{ page.collection | default: "en-US" }}" {% if site.data.rtl contains page.collection %}dir="rtl"{% endif %}>
 {% include head.html%}
 
 <body>
diff --git a/_layouts/wiki.html b/_layouts/wiki.html
index 63734a5a..fb4b2d03 100644
--- a/_layouts/wiki.html
+++ b/_layouts/wiki.html
@@ -3,7 +3,7 @@ layout: compress
 ---
 
 <!DOCTYPE html>
-<html lang="{{ page.collection | default: "en-US" }}" {% if site.rtl contains page.collection %}dir="rtl"{% endif %}>
+<html lang="{{ page.collection | default: "en-US" }}" {% if site.data.rtl contains page.collection %}dir="rtl"{% endif %}>
 {% include head.html%}
 
 <body>