diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 789d40e..d157a31 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -86,11 +86,9 @@
     <string name="settings_theme_monochrome_icons">Einfarbige Icons</string>
     <string name="settings_launcher_section_date_time"><![CDATA[Datum & Uhrzeit]]></string>
     <string name="settings_theme_color_theme">Farbschema</string>
-    <string-array name="settings_theme_color_theme_items">
-        <item>Standard</item>
-        <item>Dunkel</item>
-        <item>Hell</item>
-    </string-array>
+    <string name="settings_theme_color_theme_item_default">Standard</string>
+    <string name="settings_theme_color_theme_item_dark">Dunkel</string>
+    <string name="settings_theme_color_theme_item_light">Hell</string>
     <string name="settings_theme_wallpaper">Hintergrund auswählen</string>
     <string name="settings_launcher_change_wallpaper">Hintergrund ändern</string>
     <string name="settings_launcher_section_display">Bildschirm</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index acea272..f0a80c6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -56,11 +56,9 @@
       -->
     <string name="settings_launcher_section_appearance">Apariencia</string>
     <string name="settings_launcher_section_date_time">Formato de fecha</string>
-    <string-array name="settings_theme_color_theme_items">
-        <item>Normal</item>
-        <item>Oscuro</item>
-        <item>Luminoso</item>
-    </string-array>
+    <string name="settings_theme_color_theme_item_default">Normal</string>
+    <string name="settings_theme_color_theme_item_dark">Oscuro</string>
+    <string name="settings_theme_color_theme_item_light">Luminoso</string>
     <string name="settings_theme_wallpaper">Seleccionar fondo de pantalla</string>
     <string name="settings_launcher_change_wallpaper">Cambiar fondo de pantalla</string>
     <string name="settings_launcher_section_display">Pantalla</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1e4e0aa..8a5231a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -48,11 +48,9 @@
     <string name="settings_launcher_section_appearance">Apparence</string>
     <string name="settings_launcher_section_date_time">Format de date</string>
     <string name="settings_theme_color_theme">Thème</string>
-    <string-array name="settings_theme_color_theme_items">
-        <item>Défaut</item>
-        <item>Noir</item>
-        <item>Lumière</item>
-    </string-array>
+    <string name="settings_theme_color_theme_item_default">Défaut</string>
+    <string name="settings_theme_color_theme_item_dark">Noir</string>
+    <string name="settings_theme_color_theme_item_light">Lumière</string>
     <string name="settings_theme_wallpaper">Choisir un fond d\'écran</string>
     <string name="settings_launcher_change_wallpaper">Changer le fond d\'écran</string>
     <string name="settings_launcher_section_display">Écran</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5b60d1f..9535f2f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -55,11 +55,9 @@
       -->
     <string name="settings_launcher_section_appearance">Aparência</string>
     <string name="settings_theme_color_theme">Tema</string>
-    <string-array name="settings_theme_color_theme_items">
-        <item>Padrão</item>
-        <item>Escuro</item>
-        <item>Luz</item>
-    </string-array>
+    <string name="settings_theme_color_theme_item_default">Padrão</string>
+    <string name="settings_theme_color_theme_item_dark">Escuro</string>
+    <string name="settings_theme_color_theme_item_light">Luz</string>
     <string name="settings_clock_time_visible">Mostrar Horário</string>
     <string name="settings_clock_date_visible">Mostrar Data</string>
     <string name="settings_clock_localized">Use formato de data localizado</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index d51bd35..bac7a81 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -67,6 +67,12 @@
                 <item>DARK</item>
                 <item>LIGHT</item>
         </string-array>
+        <string-array name="settings_theme_color_theme_items" translatable="false">
+                <item>@string/settings_theme_color_theme_item_default</item>
+                <item>@string/settings_theme_color_theme_item_dark</item>
+                <item>@string/settings_theme_color_theme_item_light</item>
+        </string-array>
+
         <string name="settings_theme_text_shadow_key" translatable="false">theme.text_shadow</string>
         <string name="settings_theme_background_key" translatable="false">theme.background</string>
         <string-array name="settings_theme_background_values" translatable="false">
@@ -75,6 +81,13 @@
                 <item>BLUR</item>
                 <item>SOLID</item>
         </string-array>
+        <string-array name="settings_theme_background_items" translatable="false">
+                <item>@string/settings_theme_background_item_transparent</item>
+                <item>@string/settings_theme_background_item_dim</item>
+                <item>@string/settings_theme_background_item_blur</item>
+                <item>@string/settings_theme_background_item_solid</item>
+        </string-array>
+
         <string name="settings_theme_wallpaper_key" translatable="false">theme.wallpaper</string>
         <string name="settings_theme_font_key" translatable="false">theme.font</string>
 
@@ -87,6 +100,15 @@
                 <item>MONOSPACE</item>
                 <item>SERIF_MONOSPACE</item>
         </string-array>
+        <!-- names for @array/settings_theme_font_values -->
+        <string-array name="settings_theme_font_items" translatable="false">
+                <item>@string/settings_theme_font_item_hack</item>
+                <item>@string/settings_theme_font_item_system_default</item>
+                <item>@string/settings_theme_font_item_sans_serif</item>
+                <item>@string/settings_theme_font_item_serif</item>
+                <item>@string/settings_theme_font_item_monospace</item>
+                <item>@string/settings_theme_font_item_serif_monospace</item>
+        </string-array>
         <string name="settings_theme_monochrome_icons_key" translatable="false">theme.monochrome_icons</string>
 
         <!--
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c10fda4..169deab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,31 +87,27 @@
 
 
     <string name="settings_theme_color_theme">Color theme</string>
-    <string-array name="settings_theme_color_theme_items">
-        <item>Default</item>
-        <item>Dark</item>
-        <item>Light</item>
-    </string-array>
+    <string name="settings_theme_color_theme_item_default">Default</string>
+    <string name="settings_theme_color_theme_item_dark">Dark</string>
+    <string name="settings_theme_color_theme_item_light">Light</string>
 
     <string name="settings_theme_text_shadow">Text shadow</string>
     <string name="settings_theme_background">Background (app list and setting)</string>
-    <string-array name="settings_theme_background_items">
-        <item>Transparent</item>
-        <item>Dim</item>
-        <item>Blur</item>
-        <item>Solid</item>
-    </string-array>
+    <string name="settings_theme_background_item_transparent">Transparent</string>
+    <string name="settings_theme_background_item_dim">Dim</string>
+    <string name="settings_theme_background_item_blur">Blur</string>
+    <string name="settings_theme_background_item_solid">Solid</string>
+
+
     <string name="settings_theme_font">Font</string>
 
     <!-- names for @array/settings_theme_font_values -->
-    <string-array name="settings_theme_font_items">
-        <item>Hack</item>
-        <item>System default</item>
-        <item>Sans serif</item>
-        <item>Serif</item>
-        <item>Monospace</item>
-        <item>Serif monospace</item>
-    </string-array>
+    <string name="settings_theme_font_item_hack">Hack</string>
+    <string name="settings_theme_font_item_system_default">System default</string>
+    <string name="settings_theme_font_item_sans_serif">Sans serif</string>
+    <string name="settings_theme_font_item_serif">Serif</string>
+    <string name="settings_theme_font_item_monospace">Monospace</string>
+    <string name="settings_theme_font_item_serif_monospace">Serif monospace</string>
     <string name="settings_theme_monochrome_icons">Monochrome app icons</string>
 
     <string name="settings_launcher_section_date_time"><![CDATA[Date & time]]></string>