diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 72a13043e9..5b2a783de1 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -34,6 +34,7 @@
  - [Ryan Hartzell](https://github.com/ryan-hartzell)
  - [Thibault Nocchi](https://github.com/ThibaultNocchi)
  - [MrTimscampi](https://github.com/MrTimscampi)
+ - [artiume](https://github.com/Artiume)
  - [ConfusedPolarBear](https://github.com/ConfusedPolarBear)
  - [Sarab Singh](https://github.com/sarab97)
  - [DesertCookie](https://github.com/desertcookie)
diff --git a/src/components/displaySettings/displaySettings.template.html b/src/components/displaySettings/displaySettings.template.html
index ab298f7802..f79155b7fd 100644
--- a/src/components/displaySettings/displaySettings.template.html
+++ b/src/components/displaySettings/displaySettings.template.html
@@ -6,27 +6,35 @@
     <div class="selectContainer languageSection hide">
         <select id="selectLanguage" is="emby-select" label="${LabelDisplayLanguage}">
             <option value="">${Auto}</option>
+            <option value="af">Afrikaans</option>
+            <option value="sq">Albanian</option>
             <option value="ar">Arabic</option>
-            <option value="be-BY">Belarusian (Belarus)</option>
-            <option value="bg-BG">Bulgarian (Bulgaria)</option>
+            <option value="be-BY">Belarusian</option>
+            <option value="bn_BD">Bengali (Bangladesh)</option>
+            <option value="bg-BG">Bulgarian</option>
             <option value="ca">Catalan</option>
-            <option value="zh-CN">Chinese Simplified</option>
-            <option value="zh-TW">Chinese Traditional</option>
-            <option value="zh-HK">Chinese Traditional (Hong Kong)</option>
+            <option value="zh-HK">Chinese (Hong Kong)</option>
+            <option value="zh-CN">Chinese (Simplified)</option>
+            <option value="zh-TW">Chinese (Traditional)</option>
             <option value="hr">Croatian</option>
             <option value="cs">Czech</option>
             <option value="da">Danish</option>
             <option value="nl">Dutch</option>
+            <option value="en-US">English</option>
             <option value="en-GB">English (United Kingdom)</option>
-            <option value="en-US">English (United States)</option>
+            <option value="eo">Esperanto</option>
+            <option value="fil">Filipino</option>
             <option value="fi">Finnish</option>
             <option value="fr">French</option>
             <option value="fr-CA">French (Canada)</option>
+            <option value="gl">Galician</option>
             <option value="de">German</option>
+            <option value="gsw">German (Swiss)</option>
             <option value="el">Greek</option>
             <option value="he">Hebrew</option>
-            <option value="hi-IN">Hindi (India)</option>
+            <option value="hi-IN">Hindi</option>
             <option value="hu">Hungarian</option>
+            <option value="is">Icelandic</option>
             <option value="id">Indonesian</option>
             <option value="it">Italian</option>
             <option value="ja">Japanese</option>
@@ -34,9 +42,12 @@
             <option value="ko">Korean</option>
             <option value="lt-LT">Lithuanian</option>
             <option value="ms">Malay</option>
+            <option value="mr">Marathi</option>
             <option value="nb">Norwegian Bokmål</option>
             <option value="fa">Persian</option>
+            <option value="pr">Pirate</option>
             <option value="pl">Polish</option>
+            <option value="pt">Portuguese</option>
             <option value="pt-BR">Portuguese (Brazil)</option>
             <option value="pt-PT">Portuguese (Portugal)</option>
             <option value="ro">Romanian</option>
@@ -44,12 +55,16 @@
             <option value="sk">Slovak</option>
             <option value="sl-SI">Slovenian (Slovenia)</option>
             <option value="es">Spanish</option>
+            <option value="es_AR">Spanish (Argentina)</option>
+            <option value="es_DO">Spanish (Dominican Republic)</option>
             <option value="es-419">Spanish (Latin America)</option>
             <option value="es-MX">Spanish (Mexico)</option>
             <option value="sv">Swedish</option>
-            <option value="gsw">Swiss German</option>
+            <option value="ta">Tamil</option>
+            <option value="th">Thai</option>
             <option value="tr">Turkish</option>
             <option value="uk">Ukrainian</option>
+            <option value="ur_PK">Urdu (Pakistan)</option>
             <option value="vi">Vietnamese</option>
         </select>
         <div class="fieldDescription">
@@ -63,27 +78,35 @@
     <div class="selectContainer fldDateTimeLocale hide">
         <select is="emby-select" class="selectDateTimeLocale" label="${LabelDateTimeLocale}">
             <option value="">${Auto}</option>
+            <option value="af">Afrikaans</option>
+            <option value="sq">Albanian</option>
             <option value="ar">Arabic</option>
-            <option value="be-BY">Belarusian (Belarus)</option>
-            <option value="bg-BG">Bulgarian (Bulgaria)</option>
+            <option value="be-BY">Belarusian</option>
+            <option value="bn_BD">Bengali (Bangladesh)</option>
+            <option value="bg-BG">Bulgarian</option>
             <option value="ca">Catalan</option>
-            <option value="zh-CN">Chinese Simplified</option>
-            <option value="zh-TW">Chinese Traditional</option>
-            <option value="zh-HK">Chinese Traditional (Hong Kong)</option>
+            <option value="zh-HK">Chinese (Hong Kong)</option>
+            <option value="zh-CN">Chinese (Simplified)</option>
+            <option value="zh-TW">Chinese (Traditional)</option>
             <option value="hr">Croatian</option>
             <option value="cs">Czech</option>
             <option value="da">Danish</option>
             <option value="nl">Dutch</option>
+            <option value="en-US">English</option>
             <option value="en-GB">English (United Kingdom)</option>
-            <option value="en-US">English (United States)</option>
+            <option value="eo">Esperanto</option>
+            <option value="fil">Filipino</option>
             <option value="fi">Finnish</option>
             <option value="fr">French</option>
             <option value="fr-CA">French (Canada)</option>
+            <option value="gl">Galician</option>
             <option value="de">German</option>
+            <option value="gsw">German (Swiss)</option>
             <option value="el">Greek</option>
             <option value="he">Hebrew</option>
-            <option value="hi-IN">Hindi (India)</option>
+            <option value="hi-IN">Hindi</option>
             <option value="hu">Hungarian</option>
+            <option value="is">Icelandic</option>
             <option value="id">Indonesian</option>
             <option value="it">Italian</option>
             <option value="ja">Japanese</option>
@@ -91,9 +114,12 @@
             <option value="ko">Korean</option>
             <option value="lt-LT">Lithuanian</option>
             <option value="ms">Malay</option>
+            <option value="mr">Marathi</option>
             <option value="nb">Norwegian Bokmål</option>
             <option value="fa">Persian</option>
+            <option value="pr">Pirate</option>
             <option value="pl">Polish</option>
+            <option value="pt">Portuguese</option>
             <option value="pt-BR">Portuguese (Brazil)</option>
             <option value="pt-PT">Portuguese (Portugal)</option>
             <option value="ro">Romanian</option>
@@ -101,12 +127,16 @@
             <option value="sk">Slovak</option>
             <option value="sl-SI">Slovenian (Slovenia)</option>
             <option value="es">Spanish</option>
+            <option value="es_AR">Spanish (Argentina)</option>
+            <option value="es_DO">Spanish (Dominican Republic)</option>
             <option value="es-419">Spanish (Latin America)</option>
             <option value="es-MX">Spanish (Mexico)</option>
             <option value="sv">Swedish</option>
-            <option value="gsw">Swiss German</option>
+            <option value="ta">Tamil</option>
+            <option value="th">Thai</option>
             <option value="tr">Turkish</option>
             <option value="uk">Ukrainian</option>
+            <option value="ur_PK">Urdu (Pakistan)</option>
             <option value="vi">Vietnamese</option>
         </select>
     </div>
diff --git a/src/scripts/dfnshelper.js b/src/scripts/dfnshelper.js
index de9bec236e..193e3e7e73 100644
--- a/src/scripts/dfnshelper.js
+++ b/src/scripts/dfnshelper.js
@@ -1,11 +1,13 @@
-import { arDZ, be, bg, ca, cs, da, de, el, enGB, enUS, es, faIR, fi, fr, frCA, he, hi, hr, hu, id, it, ja, kk, ko, lt, ms, nb,
-    nl, pl, ptBR, pt, ro, ru, sk, sl, sv, tr, uk, vi, zhCN, zhTW } from 'date-fns/locale';
+import { af, arDZ, be, bg, bn, ca, cs, da, de, el, enGB, enUS, eo, es, faIR, fi, fil, fr, frCA, he, hi, hr, hu, gl, id, is, it, ja, kk, ko, lt, ms, nb,
+    nl, pl, ptBR, pt, ro, ru, sk, sl, sq, sv, ta, th, tr, uk, vi, zhCN, zhTW } from 'date-fns/locale';
 import globalize from './globalize';
 
 const dateLocales = (locale) => ({
+    'af': af,
     'ar': arDZ,
     'be-by': be,
     'bg-bg': bg,
+    'bn': bn,
     'ca': ca,
     'cs': cs,
     'da': da,
@@ -13,19 +15,24 @@ const dateLocales = (locale) => ({
     'el': el,
     'en-gb': enGB,
     'en-us': enUS,
+    'eo': eo,
     'es': es,
     'es-ar': es,
+    'es-do': es,
     'es-mx': es,
     'fa': faIR,
     'fi': fi,
+    'fil': fil,
     'fr': fr,
     'fr-ca': frCA,
+    'gl': gl,
     'gsw': de,
     'he': he,
     'hi-in': hi,
     'hr': hr,
     'hu': hu,
     'id': id,
+    'is': is,
     'it': it,
     'ja': ja,
     'kk': kk,
@@ -35,13 +42,17 @@ const dateLocales = (locale) => ({
     'nb': nb,
     'nl': nl,
     'pl': pl,
+    'pt': pt,
     'pt-br': ptBR,
     'pt-pt': pt,
     'ro': ro,
     'ru': ru,
     'sk': sk,
     'sl-si': sl,
+    'sq': sq,
     'sv': sv,
+    'ta': ta,
+    'th': th,
     'tr': tr,
     'uk': uk,
     'vi': vi,
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 942c8a0983..30e3aaa07d 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -68,7 +68,7 @@ window.getParameterByName = function(name, url) {
 };
 
 function loadCoreDictionary() {
-    const languages = ['ar', 'be-by', 'bg-bg', 'ca', 'cs', 'da', 'de', 'el', 'en-gb', 'en-us', 'es', 'es-ar', 'es-mx', 'fa', 'fi', 'fr', 'fr-ca', 'gsw', 'he', 'hi-in', 'hr', 'hu', 'id', 'it', 'ja', 'kk', 'ko', 'lt-lt', 'ms', 'nb', 'nl', 'pl', 'pt-br', 'pt-pt', 'ro', 'ru', 'sk', 'sl-si', 'sv', 'tr', 'uk', 'vi', 'zh-cn', 'zh-hk', 'zh-tw'];
+    const languages = ['af', 'ar', 'be-by', 'bg-bg', 'bn_bd', 'ca', 'cs', 'da', 'de', 'el', 'en-gb', 'en-us', 'eo', 'es', 'es-419', 'es-ar', 'es_do', 'es-mx', 'fa', 'fi', 'fil', 'fr', 'fr-ca', 'gl', 'gsw', 'he', 'hi-in', 'hr', 'hu', 'id', 'it', 'ja', 'kk', 'ko', 'lt-lt', 'mr', 'ms', 'nb', 'nl', 'pl', 'pr', 'pt', 'pt-br', 'pt-pt', 'ro', 'ru', 'sk', 'sl-si', 'sq', 'sv', 'ta', 'th', 'tr', 'uk', 'ur_pk', 'vi', 'zh-cn', 'zh-hk', 'zh-tw'];
     const translations = languages.map(function (language) {
         return {
             lang: language,