diff --git a/src/components/displaySettings/displaySettings.template.html b/src/components/displaySettings/displaySettings.template.html
index 2b7056b3d8..14c8a54d57 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 (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="af">Afrikaans</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 (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="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="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="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="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">汉语 (zh_Hans)</option>
-            <option value="zh-TW">漢語 (zh_Hant)</option>
-            <option value="zh-HK">廣東話 (zh-HK)</option>
+            <option value="zh-CN">汉语 (简化字)</option>
+            <option value="zh-TW">漢語 (繁体字)</option>
+            <option value="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 (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="af">Afrikaans</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 (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="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="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="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="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">汉语 (zh_Hans)</option>
-            <option value="zh-TW">漢語 (zh_Hant)</option>
-            <option value="zh-HK">廣東話 (zh-HK)</option>
+            <option value="zh-CN">汉语 (简化字)</option>
+            <option value="zh-TW">漢語 (繁体字)</option>
+            <option value="zh-HK">廣東話 (香港)</option>
         </select>
     </div>