diff --git a/src/components/displaySettings/displaySettings.template.html b/src/components/displaySettings/displaySettings.template.html
index 158d2a9a09..2e8f6449f6 100644
--- a/src/components/displaySettings/displaySettings.template.html
+++ b/src/components/displaySettings/displaySettings.template.html
@@ -7,65 +7,75 @@
         <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</option>
-            <option value="bn_BD">Bengali (Bangladesh)</option>
-            <option value="bg-BG">Bulgarian</option>
-            <option value="ca">Catalan</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="ar">العربية</option>
+            <option value="be-BY">Беларуская</option>
+            <option value="bg-BG">Български</option>
+            <option value="bn_BD">বাংলা (বাংলাদেশ)</option>
+            <option value="ca">Català</option>
+            <option value="cs">Čeština</option>
+            <option value="cy">Cymraeg</option>
+            <option value="da">Dansk</option>
+            <option value="de">Deutsch</option>
+            <option value="el">Ελληνικά</option>
             <option value="en-GB">English (United Kingdom)</option>
+            <option value="en-US">English</option>
             <option value="eo">Esperanto</option>
+            <option value="es">Español</option>
+            <option value="es_419">Español americano</option>
+            <option value="es-AR">Español (Argentina)</option>
+            <option value="es_DO">Español (Dominicana)</option>
+            <option value="es-MX">Español (México)</option>
+            <option value="et">Eesti</option>
+            <option value="fa">فارسی</option>
+            <option value="fi">Suomi</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</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>
-            <option value="kk">Kazakh</option>
-            <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="fr">Français</option>
+            <option value="fr-CA">Français (Canada)</option>
+            <option value="gl">Galego</option>
+            <option value="gsw">Schwiizerdütsch</option>
+            <option value="he">עִבְרִית</option>
+            <option value="hi-IN">हिन्दी</option>
+            <option value="hr">Hrvatski </option>
+            <option value="hu">Magyar</option>
+            <option value="id">Bahasa Indonesia</option>
+            <option value="is-IS">Íslenska</option>
+            <option value="it">Italiano</option>
+            <option value="ja">日本語</option>
+            <option value="kk">Qazaqşa</option>
+            <option value="ko">한국어</option>
+            <option value="lt-LT">Lietuvių</option>
+            <option value="lv">Latviešu</option>
+            <option value="mk">Македонски</option>
+            <option value="ml">മലയാളം</option>
+            <option value="mr">मराठी</option>
+            <option value="ms">Bahasa Melayu</option>
+            <option value="nb">Norsk bokmål</option>
+            <option value="ne">नेपाली</option>
+            <option value="nl">Nederlands</option>
+            <option value="nn">Norsk nynorsk</option>
+            <option value="pa">ਪੰਜਾਬੀ</option>
+            <option value="pl">Polski</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>
-            <option value="ru">Russian</option>
-            <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="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>
+            <option value="pt">Português</option>
+            <option value="pt-BR">Português (Brasil)</option>
+            <option value="pt-PT">Português (Portugal)</option>
+            <option value="ro">Românește</option>
+            <option value="ru">Русский</option>
+            <option value="sk">Slovenčina</option>
+            <option value="sl-SI">Slovenščina</option>
+            <option value="sq">Shqip</option>
+            <option value="sr">Српски</option>
+            <option value="sv">Svenska</option>
+            <option value="ta">தமிழ்</option>
+            <option value="te">తెలుగు</option>
+            <option value="th">ภาษาไทย</option>
+            <option value="tr">Türkçe</option>
+            <option value="uk">Українська</option>
+            <option value="ur_PK">اُردُو</option>
+            <option value="vi">Tiếng Việt</option>
+            <option value="zh-CN">汉语 (简化字)</option>
+            <option value="zh-TW">漢語 (繁体字)</option>
+            <option value="zh-HK">廣東話 (香港)</option>
         </select>
         <div class="fieldDescription">
             <div>${LabelDisplayLanguageHelp}</div>
@@ -79,65 +89,75 @@
         <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</option>
-            <option value="bn_BD">Bengali (Bangladesh)</option>
-            <option value="bg-BG">Bulgarian</option>
-            <option value="ca">Catalan</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="ar">العربية</option>
+            <option value="be-BY">Беларуская</option>
+            <option value="bg-BG">Български</option>
+            <option value="bn_BD">বাংলা (বাংলাদেশ)</option>
+            <option value="ca">Català</option>
+            <option value="cs">Čeština</option>
+            <option value="cy">Cymraeg</option>
+            <option value="da">Dansk</option>
+            <option value="de">Deutsch</option>
+            <option value="el">Ελληνικά</option>
             <option value="en-GB">English (United Kingdom)</option>
+            <option value="en-US">English</option>
             <option value="eo">Esperanto</option>
+            <option value="es">Español</option>
+            <option value="es_419">Español americano</option>
+            <option value="es-AR">Español (Argentina)</option>
+            <option value="es_DO">Español (Dominicana)</option>
+            <option value="es-MX">Español (México)</option>
+            <option value="et">Eesti</option>
+            <option value="fa">فارسی</option>
+            <option value="fi">Suomi</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</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>
-            <option value="kk">Kazakh</option>
-            <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="fr">Français</option>
+            <option value="fr-CA">Français (Canada)</option>
+            <option value="gl">Galego</option>
+            <option value="gsw">Schwiizerdütsch</option>
+            <option value="he">עִבְרִית</option>
+            <option value="hi-IN">हिन्दी</option>
+            <option value="hr">Hrvatski </option>
+            <option value="hu">Magyar</option>
+            <option value="id">Bahasa Indonesia</option>
+            <option value="is-IS">Íslenska</option>
+            <option value="it">Italiano</option>
+            <option value="ja">日本語</option>
+            <option value="kk">Qazaqşa</option>
+            <option value="ko">한국어</option>
+            <option value="lt-LT">Lietuvių</option>
+            <option value="lv">Latviešu</option>
+            <option value="mk">Македонски</option>
+            <option value="ml">മലയാളം</option>
+            <option value="mr">मराठी</option>
+            <option value="ms">Bahasa Melayu</option>
+            <option value="nb">Norsk bokmål</option>
+            <option value="ne">नेपाली</option>
+            <option value="nl">Nederlands</option>
+            <option value="nn">Norsk nynorsk</option>
+            <option value="pa">ਪੰਜਾਬੀ</option>
+            <option value="pl">Polski</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>
-            <option value="ru">Russian</option>
-            <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="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>
+            <option value="pt">Português</option>
+            <option value="pt-BR">Português (Brasil)</option>
+            <option value="pt-PT">Português (Portugal)</option>
+            <option value="ro">Românește</option>
+            <option value="ru">Русский</option>
+            <option value="sk">Slovenčina</option>
+            <option value="sl-SI">Slovenščina</option>
+            <option value="sq">Shqip</option>
+            <option value="sr">Српски</option>
+            <option value="sv">Svenska</option>
+            <option value="ta">தமிழ்</option>
+            <option value="te">తెలుగు</option>
+            <option value="th">ภาษาไทย</option>
+            <option value="tr">Türkçe</option>
+            <option value="uk">Українська</option>
+            <option value="ur_PK">اُردُو</option>
+            <option value="vi">Tiếng Việt</option>
+            <option value="zh-CN">汉语 (简化字)</option>
+            <option value="zh-TW">漢語 (繁体字)</option>
+            <option value="zh-HK">廣東話 (香港)</option>
         </select>
     </div>