diff --git a/radio/src/gui/colorlcd/preview_window.h b/radio/src/gui/colorlcd/preview_window.h
index f90ac98b3..4c22e3286 100644
--- a/radio/src/gui/colorlcd/preview_window.h
+++ b/radio/src/gui/colorlcd/preview_window.h
@@ -179,12 +179,14 @@ class ThemedButton : public TextButton
 class ThemedTextEdit : public TextEdit
 {
   public:
-    ThemedTextEdit(Window *parent, const rect_t &rect, char *text, 
+    ThemedTextEdit(Window *parent, const rect_t &rect, const char *text, 
                    int colorBackgroundIndex, int colorTextIndex) :
-      TextEdit(parent, rect, text, strlen(text), NO_FOCUS),
+      TextEdit(parent, rect, editText, strlen(text), NO_FOCUS),
       _colorBackgroundIndex(colorBackgroundIndex),
       _colorTextIndex(colorTextIndex)
     {
+      strcpy(editText, text);
+      update();
     }
 
     void paint(BitmapBuffer *dc) override
@@ -192,7 +194,7 @@ class ThemedTextEdit : public TextEdit
       colorMaintainer.applyColorValues();
       lv_obj_set_style_bg_color(lvobj, makeLvColor(COLOR(_colorBackgroundIndex)), LV_PART_MAIN);
       lv_obj_set_style_text_color(lvobj, lv_color_white(), LV_PART_MAIN);
-      FormField::paint(dc);
+      TextEdit::paint(dc);
       colorMaintainer.restoreColorValues();
     }
 
@@ -213,9 +215,9 @@ class ThemedTextEdit : public TextEdit
   protected:
     int _colorBackgroundIndex;
     int _colorTextIndex;
+    char editText[50];
 };
 
-
 // display controls using the appropriate theme.
 class PreviewWindow : public FormGroup
 {
@@ -224,25 +226,24 @@ class PreviewWindow : public FormGroup
                 std::vector<ColorEntry> colorList) :
       FormGroup(window, rect, NO_FOCUS), _colorList(colorList)
   {
+
     // reset default group to avoid focus
     lv_group_t* def_group = lv_group_get_default();
     lv_group_set_default(nullptr);
 
-    new ThemedStaticText(this, {5, 40, 100, LINE_HEIGHT}, "Checkbox", COLOR_THEME_PRIMARY1_INDEX);
+    new ThemedStaticText(this, {5, 40, 100, LINE_HEIGHT}, STR_THEME_CHECKBOX, COLOR_THEME_PRIMARY1_INDEX);
     new ThemedCheckBox(this, {100 + 15, 40, 20, LINE_HEIGHT}, true);
     new ThemedCheckBox(this, {140 + 15, 40, 20, LINE_HEIGHT}, false);
-    new ThemedButton(this, {190, 40, 100, LINE_HEIGHT + 10}, "Active", true, BUTTON_CHECKED, COLOR_THEME_PRIMARY1_INDEX);
-    new ThemedButton(this, {190, 75, 100, LINE_HEIGHT + 10}, "Regular", false, 0, COLOR_THEME_PRIMARY1_INDEX);
+    new ThemedButton(this, {190, 40, 100, LINE_HEIGHT + 10}, STR_THEME_ACTIVE, true, BUTTON_CHECKED, COLOR_THEME_PRIMARY1_INDEX);
+    new ThemedButton(this, {190, 75, 100, LINE_HEIGHT + 10}, STR_THEME_REGULAR, false, 0, COLOR_THEME_PRIMARY1_INDEX);
     new ThemedMainViewHorizontalTrim(this, {5, 65, HORIZONTAL_SLIDERS_WIDTH, 20}, 0);
     new ThemedMainViewHorizontalSlider(this, {5, 87, HORIZONTAL_SLIDERS_WIDTH, 20}, 0);
-    new ThemedStaticText(this, {5, 115, 100, LINE_HEIGHT}, "Warning Text", COLOR_THEME_WARNING_INDEX);
-    new ThemedStaticText(this, {5, 140, 100, LINE_HEIGHT}, "Disabled Text", COLOR_THEME_DISABLED_INDEX);
+    new ThemedStaticText(this, {5, 115, 100, LINE_HEIGHT}, STR_THEME_WARNING, COLOR_THEME_WARNING_INDEX);
+    new ThemedStaticText(this, {5, 140, 100, LINE_HEIGHT}, STR_THEME_DISABLED, COLOR_THEME_DISABLED_INDEX);
 
-    static char EditText[] = "Edit";
-    new ThemedTextEdit(this, {5, 160, 100, LINE_HEIGHT + 1}, EditText, 
+    new ThemedTextEdit(this, {5, 160, 100, LINE_HEIGHT + 1}, STR_THEME_EDIT, 
                        COLOR_THEME_EDIT_INDEX, COLOR_THEME_PRIMARY2_INDEX);
-    static char FocusText[] = "Focus";
-    new ThemedTextEdit(this, {110, 160, 100, LINE_HEIGHT + 1}, FocusText, 
+    new ThemedTextEdit(this, {110, 160, 100, LINE_HEIGHT + 1}, STR_THEME_FOCUS, 
                        COLOR_THEME_FOCUS_INDEX, COLOR_THEME_PRIMARY2_INDEX);
     ticks = 0;
 
diff --git a/radio/src/gui/colorlcd/theme_manager.cpp b/radio/src/gui/colorlcd/theme_manager.cpp
index fa6bde591..9eabf7eee 100644
--- a/radio/src/gui/colorlcd/theme_manager.cpp
+++ b/radio/src/gui/colorlcd/theme_manager.cpp
@@ -128,9 +128,9 @@ static const struct YamlNode r_struct_YAMLTheme[] = {
 };
 
 static const char *colorNames[COLOR_COUNT] = {
-    "DEFAULT",    "PRIMARY1",   "PRIMARY2",   "PRIMARY3",
-    "SECONDARY1", "SECONDARY2", "SECONDARY3", "FOCUS",
-    "EDIT",       "ACTIVE",     "WARNING",    "DISABLED", "CUSTOM",
+    STR_THEME_COLOR_DEFAULT, STR_THEME_COLOR_PRIMARY1, STR_THEME_COLOR_PRIMARY2, STR_THEME_COLOR_PRIMARY3,
+    STR_THEME_COLOR_SECONDARY1, STR_THEME_COLOR_SECONDARY2, STR_THEME_COLOR_SECONDARY3, STR_THEME_COLOR_FOCUS,
+    STR_THEME_COLOR_EDIT, STR_THEME_COLOR_ACTIVE, STR_THEME_COLOR_WARNING, STR_THEME_COLOR_DISABLED, STR_THEME_COLOR_CUSTOM,
 };
 
 ThemeFile::ThemeFile(std::string themePath, bool loadYAML) :
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index f0a882861..ea060e722 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -935,6 +935,26 @@ const char STR_GREEN[] = TR_GREEN;
 const char STR_BLUE[] = TR_BLUE;
 const char STR_COLOR_PICKER[] = TR_COLOR_PICKER;
 const char STR_EDIT_THEME_DETAILS[] = TR_EDIT_THEME_DETAILS;
+const char STR_THEME_COLOR_DEFAULT[] = TR_THEME_COLOR_DEFAULT;
+const char STR_THEME_COLOR_PRIMARY1[] = TR_THEME_COLOR_PRIMARY1;
+const char STR_THEME_COLOR_PRIMARY2[] = TR_THEME_COLOR_PRIMARY2;
+const char STR_THEME_COLOR_PRIMARY3[] = TR_THEME_COLOR_PRIMARY3;
+const char STR_THEME_COLOR_SECONDARY1[] = TR_THEME_COLOR_SECONDARY1;
+const char STR_THEME_COLOR_SECONDARY2[] = TR_THEME_COLOR_SECONDARY2;
+const char STR_THEME_COLOR_SECONDARY3[] = TR_THEME_COLOR_SECONDARY3;
+const char STR_THEME_COLOR_FOCUS[] = TR_THEME_COLOR_FOCUS;
+const char STR_THEME_COLOR_EDIT[] = TR_THEME_COLOR_EDIT;
+const char STR_THEME_COLOR_ACTIVE[] = TR_THEME_COLOR_ACTIVE;
+const char STR_THEME_COLOR_WARNING[] = TR_THEME_COLOR_WARNING;
+const char STR_THEME_COLOR_DISABLED[] = TR_THEME_COLOR_DISABLED;
+const char STR_THEME_COLOR_CUSTOM[] = TR_THEME_COLOR_CUSTOM;
+const char STR_THEME_CHECKBOX[] = TR_THEME_CHECKBOX;
+const char STR_THEME_ACTIVE[] = TR_THEME_ACTIVE;
+const char STR_THEME_REGULAR[] = TR_THEME_REGULAR;
+const char STR_THEME_WARNING[] = TR_THEME_WARNING;
+const char STR_THEME_DISABLED[] = TR_THEME_DISABLED;
+const char STR_THEME_EDIT[] = TR_THEME_EDIT;
+const char STR_THEME_FOCUS[] = TR_THEME_FOCUS;
 const char STR_AUTHOR[] = TR_AUTHOR;
 const char STR_DESCRIPTION[] = TR_DESCRIPTION;
 const char STR_SAVE[] = TR_SAVE;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 7a89f6411..19ea11a31 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -1120,6 +1120,26 @@ extern const char STR_BLUE[];
 extern const char STR_GREEN[];
 extern const char STR_COLOR_PICKER[];
 extern const char STR_EDIT_THEME_DETAILS[];
+extern const char STR_THEME_COLOR_DEFAULT[];
+extern const char STR_THEME_COLOR_PRIMARY1[];
+extern const char STR_THEME_COLOR_PRIMARY2[];
+extern const char STR_THEME_COLOR_PRIMARY3[];
+extern const char STR_THEME_COLOR_SECONDARY1[];
+extern const char STR_THEME_COLOR_SECONDARY2[];
+extern const char STR_THEME_COLOR_SECONDARY3[];
+extern const char STR_THEME_COLOR_FOCUS[];
+extern const char STR_THEME_COLOR_EDIT[];
+extern const char STR_THEME_COLOR_ACTIVE[];
+extern const char STR_THEME_COLOR_WARNING[];
+extern const char STR_THEME_COLOR_DISABLED[];
+extern const char STR_THEME_COLOR_CUSTOM[];
+extern const char STR_THEME_CHECKBOX[];
+extern const char STR_THEME_ACTIVE[];
+extern const char STR_THEME_REGULAR[];
+extern const char STR_THEME_WARNING[];
+extern const char STR_THEME_DISABLED[];
+extern const char STR_THEME_EDIT[];
+extern const char STR_THEME_FOCUS[];
 extern const char STR_AUTHOR[];
 extern const char STR_DESCRIPTION[];
 extern const char STR_SAVE[];
diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h
index 7cb771a6a..33ce3b6fe 100644
--- a/radio/src/translations/cn.h
+++ b/radio/src/translations/cn.h
@@ -1211,6 +1211,26 @@
 #define TR_GREEN                      "绿"
 #define TR_COLOR_PICKER               "拾取颜色"
 #define TR_EDIT_THEME_DETAILS         "主题信息"
+#define TR_THEME_COLOR_DEFAULT        "默认"
+#define TR_THEME_COLOR_PRIMARY1       "主色1"
+#define TR_THEME_COLOR_PRIMARY2       "主色2"
+#define TR_THEME_COLOR_PRIMARY3       "主色3"
+#define TR_THEME_COLOR_SECONDARY1     "副色1"
+#define TR_THEME_COLOR_SECONDARY2     "副色2"
+#define TR_THEME_COLOR_SECONDARY3     "副色3"
+#define TR_THEME_COLOR_FOCUS          "焦点"
+#define TR_THEME_COLOR_EDIT           "编辑"
+#define TR_THEME_COLOR_ACTIVE         "激活"
+#define TR_THEME_COLOR_WARNING        "警告"
+#define TR_THEME_COLOR_DISABLED       "禁用"
+#define TR_THEME_COLOR_CUSTOM         "自定义"
+#define TR_THEME_CHECKBOX             "复选框"
+#define TR_THEME_ACTIVE               "激活"
+#define TR_THEME_REGULAR              "常规"
+#define TR_THEME_WARNING              "警告"
+#define TR_THEME_DISABLED             "禁用"
+#define TR_THEME_EDIT                 "编辑"
+#define TR_THEME_FOCUS                "焦点"
 #define TR_AUTHOR                     "作者"
 #define TR_DESCRIPTION                "描述"
 #define TR_SAVE                       "保存"
diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h
index 5916411d8..6b28e39f5 100644
--- a/radio/src/translations/cz.h
+++ b/radio/src/translations/cz.h
@@ -1216,6 +1216,26 @@
 #define TR_GREEN                        "Zelená"
 #define TR_COLOR_PICKER                 "Výběr barvy"
 #define TR_EDIT_THEME_DETAILS           "Editovat motiv"
+#define TR_THEME_COLOR_DEFAULT          "DEFAULTNÍ"
+#define TR_THEME_COLOR_PRIMARY1         "PRIMÁRNÍ1"
+#define TR_THEME_COLOR_PRIMARY2         "PRIMÁRNÍ2"
+#define TR_THEME_COLOR_PRIMARY3         "PRIMÁRNÍ3"
+#define TR_THEME_COLOR_SECONDARY1       "SEKUNDÁRNÍ1"
+#define TR_THEME_COLOR_SECONDARY2       "SEKUNDÁRNÍ2"
+#define TR_THEME_COLOR_SECONDARY3       "SEKUNDÁRNÍ3"
+#define TR_THEME_COLOR_FOCUS            "VYBRANÉ"
+#define TR_THEME_COLOR_EDIT             "UPRAVIT"
+#define TR_THEME_COLOR_ACTIVE           "AKTIVNÍ"
+#define TR_THEME_COLOR_WARNING          "VAROVÁNÍ"
+#define TR_THEME_COLOR_DISABLED         "VYPNUTÉ"
+#define TR_THEME_COLOR_CUSTOM           "VLASTNÍ"
+#define TR_THEME_CHECKBOX               "Pole výběru"
+#define TR_THEME_ACTIVE                 "Aktivní"
+#define TR_THEME_REGULAR                "Normální"
+#define TR_THEME_WARNING                "Varování"
+#define TR_THEME_DISABLED               "Vypnuté"
+#define TR_THEME_EDIT                   "Upravit"
+#define TR_THEME_FOCUS                  "Vybrané"
 #define TR_AUTHOR                       "Autor"
 #define TR_DESCRIPTION                  "Popis"
 #define TR_SAVE                         "Uložit"
diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h
index cd1c97036..396dbe5a8 100644
--- a/radio/src/translations/da.h
+++ b/radio/src/translations/da.h
@@ -1229,6 +1229,26 @@
 #define TR_GREEN                        "Grøn"
 #define TR_COLOR_PICKER                 "Farve vælger"
 #define TR_EDIT_THEME_DETAILS           "Ret tema detajler"
+#define TR_THEME_COLOR_DEFAULT          "STANDARD"
+#define TR_THEME_COLOR_PRIMARY1         "PRIMÆR 1"
+#define TR_THEME_COLOR_PRIMARY2         "PRIMÆR 2"
+#define TR_THEME_COLOR_PRIMARY3         "PRIMÆR 3"
+#define TR_THEME_COLOR_SECONDARY1       "SEKUNDÆR 1"
+#define TR_THEME_COLOR_SECONDARY2       "SEKUNDÆR 2"
+#define TR_THEME_COLOR_SECONDARY3       "SEKUNDÆR 3"
+#define TR_THEME_COLOR_FOCUS            "FOKUS"
+#define TR_THEME_COLOR_EDIT             "REDIGER"
+#define TR_THEME_COLOR_ACTIVE           "AKTIV"
+#define TR_THEME_COLOR_WARNING          "ADVARSEL"
+#define TR_THEME_COLOR_DISABLED         "DEAKTIV"
+#define TR_THEME_COLOR_CUSTOM           "BRUGER STYRET"
+#define TR_THEME_CHECKBOX               "Checkbox"
+#define TR_THEME_ACTIVE                 "Aktiv"
+#define TR_THEME_REGULAR                "Almindelig"
+#define TR_THEME_WARNING                "Advarsel"
+#define TR_THEME_DISABLED               "Deaktiv"
+#define TR_THEME_EDIT                   "Rediger"
+#define TR_THEME_FOCUS                  "Fokus"
 #define TR_AUTHOR                       "Forfatter"
 #define TR_DESCRIPTION                  "Beskrivelse"
 #define TR_SAVE                         "Gem"
diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h
index 2f9a57ca3..89226e229 100644
--- a/radio/src/translations/de.h
+++ b/radio/src/translations/de.h
@@ -1215,6 +1215,26 @@
 #define TR_GREEN                       "Grün"
 #define TR_COLOR_PICKER                "Farbauswahl"
 #define TR_EDIT_THEME_DETAILS          "Theme Details Bearb."
+#define TR_THEME_COLOR_DEFAULT         "Standard"
+#define TR_THEME_COLOR_PRIMARY1        "Primär1"
+#define TR_THEME_COLOR_PRIMARY2        "Primär2"
+#define TR_THEME_COLOR_PRIMARY3        "Primär3"
+#define TR_THEME_COLOR_SECONDARY1      "Sekundär1"
+#define TR_THEME_COLOR_SECONDARY2      "Sekundär2"
+#define TR_THEME_COLOR_SECONDARY3      "Sekundär3"
+#define TR_THEME_COLOR_FOCUS           "Fokus"
+#define TR_THEME_COLOR_EDIT            "Edit"
+#define TR_THEME_COLOR_ACTIVE          "Aktiv"
+#define TR_THEME_COLOR_WARNING         "Warnung"
+#define TR_THEME_COLOR_DISABLED        "Deaktiviert"
+#define TR_THEME_COLOR_CUSTOM          "Eigene"
+#define TR_THEME_CHECKBOX              "Schalter"
+#define TR_THEME_ACTIVE                "Aktiv"
+#define TR_THEME_REGULAR               "Regulär"
+#define TR_THEME_WARNING               "Warnung"
+#define TR_THEME_DISABLED              "Inaktiv"
+#define TR_THEME_EDIT                  "Editieren"
+#define TR_THEME_FOCUS                 "Fokus"
 #define TR_AUTHOR                      "Author"
 #define TR_DESCRIPTION                 "Beschreibung"
 #define TR_SAVE                        "Speichern"
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index 2fb8e5135..ef6c70256 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -1208,6 +1208,26 @@
 #define TR_GREEN                        "Green"
 #define TR_COLOR_PICKER                 "Color Picker"
 #define TR_EDIT_THEME_DETAILS           "Edit Theme Details"
+#define TR_THEME_COLOR_DEFAULT         "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1        "PRIMARY1"
+#define TR_THEME_COLOR_PRIMARY2        "PRIMARY2"
+#define TR_THEME_COLOR_PRIMARY3        "PRIMARY3"
+#define TR_THEME_COLOR_SECONDARY1      "SECONDARY1"
+#define TR_THEME_COLOR_SECONDARY2      "SECONDARY2"
+#define TR_THEME_COLOR_SECONDARY3      "SECONDARY3"
+#define TR_THEME_COLOR_FOCUS           "FOCUS"
+#define TR_THEME_COLOR_EDIT            "EDIT"
+#define TR_THEME_COLOR_ACTIVE          "ACTIVE"
+#define TR_THEME_COLOR_WARNING         "WARNING"
+#define TR_THEME_COLOR_DISABLED        "DISABLED"
+#define TR_THEME_COLOR_CUSTOM          "CUSTOM"
+#define TR_THEME_CHECKBOX              "Checkbox"
+#define TR_THEME_ACTIVE                "Active"
+#define TR_THEME_REGULAR               "Regular"
+#define TR_THEME_WARNING               "Warning"
+#define TR_THEME_DISABLED              "Disabled"
+#define TR_THEME_EDIT                  "Edit"
+#define TR_THEME_FOCUS                 "Focus"
 #define TR_AUTHOR                       "Author"
 #define TR_DESCRIPTION                  "Description"
 #define TR_SAVE                         "Save"
diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h
index a94e0ad83..67c9d4ca2 100644
--- a/radio/src/translations/es.h
+++ b/radio/src/translations/es.h
@@ -1219,6 +1219,26 @@
 #define TR_GREEN                        "Green"
 #define TR_COLOR_PICKER                 "Color Picker"
 #define TR_EDIT_THEME_DETAILS           "Edit Theme Details"
+#define TR_THEME_COLOR_DEFAULT         "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1        "PRIMARY1"
+#define TR_THEME_COLOR_PRIMARY2        "PRIMARY2"
+#define TR_THEME_COLOR_PRIMARY3        "PRIMARY3"
+#define TR_THEME_COLOR_SECONDARY1      "SECONDARY1"
+#define TR_THEME_COLOR_SECONDARY2      "SECONDARY2"
+#define TR_THEME_COLOR_SECONDARY3      "SECONDARY3"
+#define TR_THEME_COLOR_FOCUS           "FOCUS"
+#define TR_THEME_COLOR_EDIT            "EDIT"
+#define TR_THEME_COLOR_ACTIVE          "ACTIVE"
+#define TR_THEME_COLOR_WARNING         "WARNING"
+#define TR_THEME_COLOR_DISABLED        "DISABLED"
+#define TR_THEME_COLOR_CUSTOM          "CUSTOM"
+#define TR_THEME_CHECKBOX              "Checkbox"
+#define TR_THEME_ACTIVE                "Active"
+#define TR_THEME_REGULAR               "Regular"
+#define TR_THEME_WARNING               "Warning"
+#define TR_THEME_DISABLED              "Disabled"
+#define TR_THEME_EDIT                  "Edit"
+#define TR_THEME_FOCUS                 "Focus"
 #define TR_AUTHOR                       "Author"
 #define TR_DESCRIPTION                  "Description"
 #define TR_SAVE                         "Save"
diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h
index c8789a44e..236625ca8 100644
--- a/radio/src/translations/fi.h
+++ b/radio/src/translations/fi.h
@@ -1231,6 +1231,26 @@
 #define TR_GREEN                       "Vihreä"
 #define TR_COLOR_PICKER                "Värinvalitsija"
 #define TR_EDIT_THEME_DETAILS          "Edit Theme Details"
+#define TR_THEME_COLOR_DEFAULT         "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1        "PRIMARY1"
+#define TR_THEME_COLOR_PRIMARY2        "PRIMARY2"
+#define TR_THEME_COLOR_PRIMARY3        "PRIMARY3"
+#define TR_THEME_COLOR_SECONDARY1      "SECONDARY1"
+#define TR_THEME_COLOR_SECONDARY2      "SECONDARY2"
+#define TR_THEME_COLOR_SECONDARY3      "SECONDARY3"
+#define TR_THEME_COLOR_FOCUS           "FOCUS"
+#define TR_THEME_COLOR_EDIT            "EDIT"
+#define TR_THEME_COLOR_ACTIVE          "ACTIVE"
+#define TR_THEME_COLOR_WARNING         "WARNING"
+#define TR_THEME_COLOR_DISABLED        "DISABLED"
+#define TR_THEME_COLOR_CUSTOM          "CUSTOM"
+#define TR_THEME_CHECKBOX              "Checkbox"
+#define TR_THEME_ACTIVE                "Active"
+#define TR_THEME_REGULAR               "Regular"
+#define TR_THEME_WARNING               "Warning"
+#define TR_THEME_DISABLED              "Disabled"
+#define TR_THEME_EDIT                  "Edit"
+#define TR_THEME_FOCUS                 "Focus"
 #define TR_AUTHOR                      "Tekijä"
 #define TR_DESCRIPTION                 "Description"
 #define TR_SAVE                        "Tallentaa"
diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h
index e3dccffcf..38e38b69d 100644
--- a/radio/src/translations/fr.h
+++ b/radio/src/translations/fr.h
@@ -1236,6 +1236,26 @@
 #define TR_GREEN                        "Vert"
 #define TR_COLOR_PICKER                 "Pipette à couleurs"
 #define TR_EDIT_THEME_DETAILS           "Éditer Détails Thème"
+#define TR_THEME_COLOR_DEFAULT          "DEFAUT"
+#define TR_THEME_COLOR_PRIMARY1         "PRIMAIRE 1"
+#define TR_THEME_COLOR_PRIMARY2         "PRIMAIRE 2"
+#define TR_THEME_COLOR_PRIMARY3         "PRIMAIRE 3"
+#define TR_THEME_COLOR_SECONDARY1       "SECONDAIRE 1"
+#define TR_THEME_COLOR_SECONDARY2       "SECONDAIRE 2"
+#define TR_THEME_COLOR_SECONDARY3       "SECONDAIRE 3"
+#define TR_THEME_COLOR_FOCUS            "FOCUS"
+#define TR_THEME_COLOR_EDIT             "EDITER"
+#define TR_THEME_COLOR_ACTIVE           "ACTIF"
+#define TR_THEME_COLOR_WARNING          "ATTENTION"
+#define TR_THEME_COLOR_DISABLED         "DESACTIVE"
+#define TR_THEME_COLOR_CUSTOM           "PERSO"
+#define TR_THEME_CHECKBOX               "Case à cocher"
+#define TR_THEME_ACTIVE                 "Actif"
+#define TR_THEME_REGULAR                "Par défaut"
+#define TR_THEME_WARNING                "Attention"
+#define TR_THEME_DISABLED               "Désactivé"
+#define TR_THEME_EDIT                   "Editer"
+#define TR_THEME_FOCUS                  "Focus"
 #define TR_AUTHOR                       "Auteur"
 #define TR_DESCRIPTION                  "Description"
 #define TR_SAVE                         "Sauvegarder"
diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h
index 6116dea47..ec3dc4bc8 100644
--- a/radio/src/translations/he.h
+++ b/radio/src/translations/he.h
@@ -62,7 +62,6 @@
 #define TR_TELEMETRY_PROTOCOLS         "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
 
 #define TR_SBUS_INVERSION_VALUES       "normal","not inverted"
-#define TR_MULTI_TELEMETRY_MODE        "Off","On","Off+Aux","On+Aux"
 #define TR_MULTI_CUSTOM                "עיצוב מיוחד"
 #define TR_VTRIMINC                    TR("Expo","הולך ומתעצם"),TR("ExFine","זז ב-1"),"זז ב-2","זז ב-3","זז ב-6"
 #define TR_VDISPLAYTRIMS               "אל תציג","הצג שינוי בלבד","הצג"
@@ -1212,6 +1211,26 @@
 #define TR_GREEN                        "ירוק"
 #define TR_COLOR_PICKER                 "בחירת צבע"
 #define TR_EDIT_THEME_DETAILS           "עריכת ערכת נושא"
+#define TR_THEME_COLOR_DEFAULT          "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1         "ראשי 1"
+#define TR_THEME_COLOR_PRIMARY2         "ראשי 2"
+#define TR_THEME_COLOR_PRIMARY3         "ראשי 3"
+#define TR_THEME_COLOR_SECONDARY1       "משני 1"
+#define TR_THEME_COLOR_SECONDARY2       "משני 2"
+#define TR_THEME_COLOR_SECONDARY3       "משני 3"
+#define TR_THEME_COLOR_FOCUS            "מיקוד"
+#define TR_THEME_COLOR_EDIT             "עריכה"
+#define TR_THEME_COLOR_ACTIVE           "פעיל"
+#define TR_THEME_COLOR_WARNING          "אזהרה"
+#define TR_THEME_COLOR_DISABLED         "לא פעיל"
+#define TR_THEME_COLOR_CUSTOM           "מתקדם"
+#define TR_THEME_CHECKBOX               "Checkbox"
+#define TR_THEME_ACTIVE                 "פעיל"
+#define TR_THEME_REGULAR                "רגיל"
+#define TR_THEME_WARNING                "אזהרה"
+#define TR_THEME_DISABLED               "לא פעיל"
+#define TR_THEME_EDIT                   "עריכה"
+#define TR_THEME_FOCUS                  "מיקוד"
 #define TR_AUTHOR                       "Author"
 #define TR_DESCRIPTION                  "תיאור"
 #define TR_SAVE                         "שמור"
diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h
index 5b59aca7f..7a94c9214 100644
--- a/radio/src/translations/it.h
+++ b/radio/src/translations/it.h
@@ -1213,6 +1213,26 @@
 #define TR_GREEN                        "Verde"
 #define TR_COLOR_PICKER                 "Picker Colori"
 #define TR_EDIT_THEME_DETAILS           "Edita dett. tema"
+#define TR_THEME_COLOR_DEFAULT          "PREDEFINITO"
+#define TR_THEME_COLOR_PRIMARY1         "PRIMARIO1"
+#define TR_THEME_COLOR_PRIMARY2         "PRIMARIO2"
+#define TR_THEME_COLOR_PRIMARY3         "PRIMARIO3"
+#define TR_THEME_COLOR_SECONDARY1       "SECONDARIO1"
+#define TR_THEME_COLOR_SECONDARY2       "SECONDARIO2"
+#define TR_THEME_COLOR_SECONDARY3       "SECONDARIO3"
+#define TR_THEME_COLOR_FOCUS            "FUOCO"
+#define TR_THEME_COLOR_EDIT             "MODIFICA"
+#define TR_THEME_COLOR_ACTIVE           "ATTIVO"
+#define TR_THEME_COLOR_WARNING          "ATTENZIONE"
+#define TR_THEME_COLOR_DISABLED         "DISABILITATO"
+#define TR_THEME_COLOR_CUSTOM           "PERSONALE"
+#define TR_THEME_CHECKBOX               "Casella di spunta"
+#define TR_THEME_ACTIVE                 "Attivo"
+#define TR_THEME_REGULAR                "Regolare"
+#define TR_THEME_WARNING                "Attenzione"
+#define TR_THEME_DISABLED               "Disabilitato"
+#define TR_THEME_EDIT                   "Modifica"
+#define TR_THEME_FOCUS                  "Fuoco"
 #define TR_AUTHOR                       "Autore"
 #define TR_DESCRIPTION                  "Descrizione"
 #define TR_SAVE                         "Salva"
diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h
index 21f723acc..a196819e3 100644
--- a/radio/src/translations/jp.h
+++ b/radio/src/translations/jp.h
@@ -1209,6 +1209,26 @@
 #define TR_GREEN                        "緑"
 #define TR_COLOR_PICKER                 "ピックアップ色"
 #define TR_EDIT_THEME_DETAILS           "テーマ詳細の編集"
+#define TR_THEME_COLOR_DEFAULT          "デフォルト"
+#define TR_THEME_COLOR_PRIMARY1         "プライマリ 1"
+#define TR_THEME_COLOR_PRIMARY2         "プライマリ 2"
+#define TR_THEME_COLOR_PRIMARY3         "プライマリ 3"
+#define TR_THEME_COLOR_SECONDARY1       "セカンダリ 1"
+#define TR_THEME_COLOR_SECONDARY2       "セカンダリ 2"
+#define TR_THEME_COLOR_SECONDARY3       "セカンダリ 3"
+#define TR_THEME_COLOR_FOCUS            "フォーカス"
+#define TR_THEME_COLOR_EDIT             "編集"
+#define TR_THEME_COLOR_ACTIVE           "有効"
+#define TR_THEME_COLOR_WARNING          "警告"
+#define TR_THEME_COLOR_DISABLED         "無効"
+#define TR_THEME_COLOR_CUSTOM           "カスタム"
+#define TR_THEME_CHECKBOX               "チェック"
+#define TR_THEME_ACTIVE                 "有効"
+#define TR_THEME_REGULAR                "通常"
+#define TR_THEME_WARNING                "警告"
+#define TR_THEME_DISABLED               "無効"
+#define TR_THEME_EDIT                   "編集"
+#define TR_THEME_FOCUS                  "フォーカス"
 #define TR_AUTHOR                       "作者"
 #define TR_DESCRIPTION                  "説明"
 #define TR_SAVE                         "保存"
diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h
index fc13c63d2..3d3d0da58 100644
--- a/radio/src/translations/nl.h
+++ b/radio/src/translations/nl.h
@@ -1229,6 +1229,26 @@
 #define TR_GREEN                        "Green"
 #define TR_COLOR_PICKER                 "Color Picker"
 #define TR_EDIT_THEME_DETAILS           "Edit Theme Details"
+#define TR_THEME_COLOR_DEFAULT         "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1        "PRIMARY1"
+#define TR_THEME_COLOR_PRIMARY2        "PRIMARY2"
+#define TR_THEME_COLOR_PRIMARY3        "PRIMARY3"
+#define TR_THEME_COLOR_SECONDARY1      "SECONDARY1"
+#define TR_THEME_COLOR_SECONDARY2      "SECONDARY2"
+#define TR_THEME_COLOR_SECONDARY3      "SECONDARY3"
+#define TR_THEME_COLOR_FOCUS           "FOCUS"
+#define TR_THEME_COLOR_EDIT            "EDIT"
+#define TR_THEME_COLOR_ACTIVE          "ACTIVE"
+#define TR_THEME_COLOR_WARNING         "WARNING"
+#define TR_THEME_COLOR_DISABLED        "DISABLED"
+#define TR_THEME_COLOR_CUSTOM          "CUSTOM"
+#define TR_THEME_CHECKBOX              "Checkbox"
+#define TR_THEME_ACTIVE                "Active"
+#define TR_THEME_REGULAR               "Regular"
+#define TR_THEME_WARNING               "Warning"
+#define TR_THEME_DISABLED              "Disabled"
+#define TR_THEME_EDIT                  "Edit"
+#define TR_THEME_FOCUS                 "Focus"
 #define TR_AUTHOR                       "Author"
 #define TR_DESCRIPTION                  "Description"
 #define TR_SAVE                         "Save"
diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h
index de546a436..074c2728d 100644
--- a/radio/src/translations/pl.h
+++ b/radio/src/translations/pl.h
@@ -1213,6 +1213,26 @@
 #define TR_GREEN                        "Zielony"
 #define TR_COLOR_PICKER                 "Wybór koloru"
 #define TR_EDIT_THEME_DETAILS           "Edytuj szablon"
+#define TR_THEME_COLOR_DEFAULT          "DOMYŚLNY"
+#define TR_THEME_COLOR_PRIMARY1         "GŁÓWNY1"
+#define TR_THEME_COLOR_PRIMARY2         "GŁÓWNY2"
+#define TR_THEME_COLOR_PRIMARY3         "GŁÓWNY3"
+#define TR_THEME_COLOR_SECONDARY1       "POBOCZNY1"
+#define TR_THEME_COLOR_SECONDARY2       "POBOCZNY2"
+#define TR_THEME_COLOR_SECONDARY3       "POBOCZNY3"
+#define TR_THEME_COLOR_FOCUS            "WYBRANY"
+#define TR_THEME_COLOR_EDIT             "ZMIEŃ"
+#define TR_THEME_COLOR_ACTIVE           "AKTYWNY"
+#define TR_THEME_COLOR_WARNING          "OSTRZEŻENIE"
+#define TR_THEME_COLOR_DISABLED         "WYŁĄCZONY"
+#define TR_THEME_COLOR_CUSTOM           "WŁASNY"
+#define TR_THEME_CHECKBOX               "Pole wyboru"
+#define TR_THEME_ACTIVE                 "Aktywny"
+#define TR_THEME_REGULAR                "Normalny"
+#define TR_THEME_WARNING                "Ostrzeżenie"
+#define TR_THEME_DISABLED               "Wyłączony"
+#define TR_THEME_EDIT                   "Zmień"
+#define TR_THEME_FOCUS                  "Wybrany"
 #define TR_AUTHOR                       "Autor"
 #define TR_DESCRIPTION                  "Opis"
 #define TR_SAVE                         "Zapisz"
diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h
index e51a4617b..c5cc3a8b3 100644
--- a/radio/src/translations/pt.h
+++ b/radio/src/translations/pt.h
@@ -1222,6 +1222,26 @@
 #define TR_GREEN                        "Green"
 #define TR_COLOR_PICKER                 "Color Picker"
 #define TR_EDIT_THEME_DETAILS           "Edit Theme Details"
+#define TR_THEME_COLOR_DEFAULT         "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1        "PRIMARY1"
+#define TR_THEME_COLOR_PRIMARY2        "PRIMARY2"
+#define TR_THEME_COLOR_PRIMARY3        "PRIMARY3"
+#define TR_THEME_COLOR_SECONDARY1      "SECONDARY1"
+#define TR_THEME_COLOR_SECONDARY2      "SECONDARY2"
+#define TR_THEME_COLOR_SECONDARY3      "SECONDARY3"
+#define TR_THEME_COLOR_FOCUS           "FOCUS"
+#define TR_THEME_COLOR_EDIT            "EDIT"
+#define TR_THEME_COLOR_ACTIVE          "ACTIVE"
+#define TR_THEME_COLOR_WARNING         "WARNING"
+#define TR_THEME_COLOR_DISABLED        "DISABLED"
+#define TR_THEME_COLOR_CUSTOM          "CUSTOM"
+#define TR_THEME_CHECKBOX              "Checkbox"
+#define TR_THEME_ACTIVE                "Active"
+#define TR_THEME_REGULAR               "Regular"
+#define TR_THEME_WARNING               "Warning"
+#define TR_THEME_DISABLED              "Disabled"
+#define TR_THEME_EDIT                  "Edit"
+#define TR_THEME_FOCUS                 "Focus"
 #define TR_AUTHOR                       "Author"
 #define TR_DESCRIPTION                  "Description"
 #define TR_SAVE                         "Save"
diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h
index 17041a18f..45ea90298 100644
--- a/radio/src/translations/se.h
+++ b/radio/src/translations/se.h
@@ -69,7 +69,6 @@
 #define TR_JACK_MODES                   "Fråga","Audio","Lärare"
 #define TR_TELEMETRY_PROTOCOLS          "FrSky S.Port","FrSky D","FrSky D (sladd)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
 #define TR_SBUS_INVERSION_VALUES        "normal","ej inverterad"
-#define TR_MULTI_TELEMETRY_MODE         "Av","På","Av+Aux","På+Aux"
 #define TR_MULTI_CUSTOM                 "Anpassad"
 #define TR_VTRIMINC                     TR("Expo","Exponentiell"),TR("xFin","Extra fin"),"Fin","Medium","Grov"
 #define TR_VDISPLAYTRIMS                "Nej","Ändring","Ja"
@@ -1255,13 +1254,33 @@
 #define TR_BLUE                         "Blå"
 #define TR_GREEN                        "Grön"
 #define TR_COLOR_PICKER                 "Färgväljare"
-#define TR_EDIT_THEME_DETAILS           "Ändra temadetaljer"
+#define TR_EDIT_THEME_DETAILS           "Ändra temainformation"
+#define TR_THEME_COLOR_DEFAULT          "DEFAULT"
+#define TR_THEME_COLOR_PRIMARY1         "PRIMÄR1"
+#define TR_THEME_COLOR_PRIMARY2         "PRIMÄR2"
+#define TR_THEME_COLOR_PRIMARY3         "PRIMÄR3"
+#define TR_THEME_COLOR_SECONDARY1       "SEKUNDÄR1"
+#define TR_THEME_COLOR_SECONDARY2       "SEKUNDÄR2"
+#define TR_THEME_COLOR_SECONDARY3       "SEKUNDÄR3"
+#define TR_THEME_COLOR_FOCUS            "FOKUS"
+#define TR_THEME_COLOR_EDIT             "REDIGERA"
+#define TR_THEME_COLOR_ACTIVE           "AKTIV"
+#define TR_THEME_COLOR_WARNING          "VARNING"
+#define TR_THEME_COLOR_DISABLED         "INAKTIV"
+#define TR_THEME_COLOR_CUSTOM           "ANPASSAD"
+#define TR_THEME_CHECKBOX               "Kryssruta"
+#define TR_THEME_ACTIVE                 "Aktiv"
+#define TR_THEME_REGULAR                "Normal"
+#define TR_THEME_WARNING                "Varning"
+#define TR_THEME_DISABLED               "Inaktiv"
+#define TR_THEME_EDIT                   "Redigera"
+#define TR_THEME_FOCUS                  "Fokus"
 #define TR_AUTHOR                       "Författare"
 #define TR_DESCRIPTION                  "Beskrivning"
 #define TR_SAVE                         "Spara"
 #define TR_CANCEL                       "Avbryt"
-#define TR_EDIT_THEME                   "ÄNDRA TEMA"
-#define TR_DETAILS                      "Detaljer"
+#define TR_EDIT_THEME                   "REDIGERA TEMA"
+#define TR_DETAILS                      "Temainformation"
 #define TR_THEME_EDITOR                 "TEMAN"
 
 // Main menu
diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h
index 60560dca3..87be216d9 100644
--- a/radio/src/translations/tw.h
+++ b/radio/src/translations/tw.h
@@ -1209,6 +1209,26 @@
 #define TR_GREEN                      "綠"
 #define TR_COLOR_PICKER               "拾取顏色"
 #define TR_EDIT_THEME_DETAILS         "主題信息"
+#define TR_THEME_COLOR_DEFAULT        "默認"
+#define TR_THEME_COLOR_PRIMARY1       "主色1"
+#define TR_THEME_COLOR_PRIMARY2       "主色2"
+#define TR_THEME_COLOR_PRIMARY3       "主色3"
+#define TR_THEME_COLOR_SECONDARY1     "副色1"
+#define TR_THEME_COLOR_SECONDARY2     "副色2"
+#define TR_THEME_COLOR_SECONDARY3     "副色3"
+#define TR_THEME_COLOR_FOCUS          "焦點"
+#define TR_THEME_COLOR_EDIT           "編輯"
+#define TR_THEME_COLOR_ACTIVE         "激活"
+#define TR_THEME_COLOR_WARNING        "警告"
+#define TR_THEME_COLOR_DISABLED       "禁用"
+#define TR_THEME_COLOR_CUSTOM         "自定義"
+#define TR_THEME_CHECKBOX             "復選框"
+#define TR_THEME_ACTIVE               "激活"
+#define TR_THEME_REGULAR              "常規"
+#define TR_THEME_WARNING              "警告"
+#define TR_THEME_DISABLED             "禁用"
+#define TR_THEME_EDIT                 "編輯"
+#define TR_THEME_FOCUS                "焦點"
 #define TR_AUTHOR                     "作者"
 #define TR_DESCRIPTION                "描述"
 #define TR_SAVE                       "保存"