diff --git a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
index 66d7503d1..65c89abda 100644
--- a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
@@ -12,7 +12,6 @@ import com.github.libretube.activities.SettingsActivity
 import com.github.libretube.dialogs.RequireRestartDialog
 import com.github.libretube.dialogs.UpdateDialog
 import com.github.libretube.update.UpdateChecker
-import com.github.libretube.util.ThemeHelper
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -37,7 +36,8 @@ class MainSettings : PreferenceFragmentCompat() {
 
         val language = findPreference<ListPreference>("language")
         language?.setOnPreferenceChangeListener { _, _ ->
-            ThemeHelper.restartMainActivity(requireContext())
+            val restartDialog = RequireRestartDialog()
+            restartDialog.show(childFragmentManager, "RequireRestartDialog")
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/util/LocaleHelper.kt b/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
index a5ce2e973..a638c37b0 100644
--- a/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
@@ -12,15 +12,16 @@ object LocaleHelper {
     fun updateLanguage(context: Context) {
         val languageName = PreferenceHelper.getString(PreferenceKeys.LANGUAGE, "sys")
         if (languageName == "sys") updateLocaleConf(context, Locale.getDefault())
-        else if ("$languageName".length < 3) {
-            val locale = Locale(languageName.toString())
-            updateLocaleConf(context, locale)
-        } else if ("$languageName".length > 3) {
+        else if (languageName?.contains("-") == true) {
+            val languageParts = languageName.split("-")
             val locale = Locale(
-                languageName?.substring(0, 2).toString(),
-                languageName?.substring(4, 6).toString()
+                languageParts[0],
+                languageParts[1]
             )
             updateLocaleConf(context, locale)
+        } else {
+            val locale = Locale(languageName.toString())
+            updateLocaleConf(context, locale)
         }
     }
 
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 71fab768f..a3346533f 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -462,10 +462,13 @@
         <item>Arabic</item>
         <item>Azerbaijani</item>
         <item>Basque</item>
+        <item>Catalan</item>
         <item>Chinese (simplified)</item>
+        <item>Chinese (traditional)</item>
         <item>Czech</item>
         <item>Danish</item>
         <item>English</item>
+        <item>Filipino</item>
         <item>Finnish</item>
         <item>French</item>
         <item>German</item>
@@ -486,10 +489,14 @@
         <item>Polish</item>
         <item>Portuguese</item>
         <item>Portuguese (Brazil)</item>
+        <item>Romanian</item>
         <item>Russian</item>
+        <item>Slovak</item>
         <item>Sorani</item>
         <item>Spanish</item>
+        <item>Thai</item>
         <item>Turkish</item>
+        <item>Turkmen</item>
         <item>Ukrainian</item>
     </string-array>
 
@@ -498,10 +505,13 @@
         <item>ar</item>
         <item>az</item>
         <item>eu</item>
-        <item>zh</item>
+        <item>ca</item>
+        <item>zh-Hans</item>
+        <item>zh-Hant</item>
         <item>cs</item>
         <item>da</item>
         <item>en</item>
+        <item>fil</item>
         <item>fi</item>
         <item>fr</item>
         <item>de</item>
@@ -522,10 +532,14 @@
         <item>pl</item>
         <item>pt</item>
         <item>pt-rBR</item>
+        <item>ro</item>
         <item>ru</item>
+        <item>sk</item>
         <item>ckb</item>
         <item>es</item>
+        <item>th</item>
         <item>tr</item>
+        <item>tk</item>
         <item>uk</item>
     </string-array>