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