diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 34d05778b..02b075c93 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -144,13 +144,14 @@ colormenusetup.menucontent_inactive Fensterinhalt deaktiviert
 colormenusetup.menucontent_selected Fensterinhalt selektiert
 colormenusetup.menuhead Titelleiste
 colorstatusbar.text Statusbalken
-colorthememenu.classic_theme Klassik
-colorthememenu.dblue_theme DarkBlue Theme
-colorthememenu.dvb2k_theme DVB2000 Theme
-colorthememenu.gray Grau
 colorthememenu.head Theme auswählen
+colorthememenu.head2 Themes laden
+colorthememenu.name Themename
 colorthememenu.neutrino_theme Neutrino Theme
-colorthememenu.red_theme Simply Red
+colorthememenu.question Aktuelles Theme beibehalten?
+colorthememenu.save aktuelles Theme speichern
+colorthememenu.select1 Benutzer Theme
+colorthememenu.select2 Standard Theme
 cpu.freq CPU Frequenz
 cpu.freq_normal Normale Frequenz
 cpu.freq_standby Standby Frequenz
@@ -610,14 +611,15 @@ keybindingmenu.cancel Kanalliste schließen
 keybindingmenu.channeldown Kanal runter
 keybindingmenu.channellist Kanalliste
 keybindingmenu.channelup Kanal hoch
-keybindingmenu.head Tasten-Einstellungen
+keybindingmenu.head Tasten-Belegungen bearbeiten
 keybindingmenu.lastchannel Letzter Kanal
+keybindingmenu.misc Sonstige
 keybindingmenu.modechange Moduswechsel
 keybindingmenu.pagedown Seite weiter
 keybindingmenu.pageup Seite zurück
 keybindingmenu.poweroff Umschalter
 keybindingmenu.quickzap Schnellumschaltung
-keybindingmenu.RC Fernbedienung
+keybindingmenu.RC Fernbedienung abstimmen
 keybindingmenu.repeatblock Anfangsverzögerung
 keybindingmenu.repeatblockgeneric Wiederholungsverzögerung
 keybindingmenu.sort Sortierreihenfolge ändern
@@ -631,7 +633,7 @@ keychooser.text2 Zum Abbrechen warten...
 keychoosermenu.currentkey Derzeitige Taste
 keychoosermenu.setnew Neue Taste einstellen
 keychoosermenu.setnone Keine Taste
-languagesetup.head Spracheinstellungen
+languagesetup.head Sprache und Zeitzonen
 languagesetup.osd Menüsprache
 languagesetup.select Sprache
 lcdcontroler.brightness normale Helligkeit
@@ -680,13 +682,13 @@ mainmenu.sleeptimer SleepTimer
 mainmenu.tvmode TV-Modus/Uhr
 mainsettings.audio Audio
 mainsettings.head Einstellungen
-mainsettings.keybinding Tasten Einstellungen
+mainsettings.keybinding Tasten
 mainsettings.language Sprache
 mainsettings.lcd VFD-Display
 mainsettings.misc Diverse Einstellungen
 mainsettings.manage Einstellungen verwalten
 mainsettings.network Netzwerk
-mainsettings.osd OSD Einstellungen
+mainsettings.osd OSD
 mainsettings.recording Aufnahme
 mainsettings.savesettingsnow Einstellungen jetzt speichern
 mainsettings.savesettingsnow_hint Einstellungen werden jetzt gespeichert,\nbitte warten...
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 26e6196bc..ba911cd4a 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -238,12 +238,14 @@ colormenusetup.menucontent_inactive Content inactive
 colormenusetup.menucontent_selected Content selected
 colormenusetup.menuhead Header
 colorstatusbar.text Infobar
-colorthememenu.classic_theme Classic Theme
-colorthememenu.dblue_theme DarkBlue Theme
-colorthememenu.dvb2k_theme DVB2000 Theme
-colorthememenu.head Theme Selector
+colorthememenu.head Theme auswählen
+colorthememenu.head2 Themes laden
+colorthememenu.name Themename
 colorthememenu.neutrino_theme Neutrino Theme
-colorthememenu.gray Gray Theme
+colorthememenu.question Aktuelles Theme beibehalten?
+colorthememenu.save aktuelles Theme speichern
+colorthememenu.select1 Benutzer Theme
+colorthememenu.select2 Standard Theme
 date.Apr  Apr
 date.Aug  Aug
 date.Dec  Dec
@@ -429,13 +431,15 @@ keybindingmenu.cancel close channellist
 keybindingmenu.channeldown channel down
 keybindingmenu.channellist Channellist
 keybindingmenu.channelup channel up
-keybindingmenu.head Keybinding Setup
+keybindingmenu.head Edit Keybindings
 keybindingmenu.lastchannel Quick Zap
+keybindingmenu.misc Misc
 keybindingmenu.modechange Modechange
 keybindingmenu.pagedown page down
 keybindingmenu.pageup page up
 keybindingmenu.poweroff Power toggle
 keybindingmenu.quickzap Quickzap
+keybindingmenu.RC Tune Remote-Control
 keybindingmenu.repeatblock generic delay
 keybindingmenu.repeatblockgeneric repeat delay
 keybindingmenu.sort change sort order
@@ -465,7 +469,7 @@ lcdmenu.statusline status line
 lcdmenu.statusline.both volume / playtime
 lcdmenu.statusline.playtime playtime
 lcdmenu.statusline.volume volume
-ledcontroler.menu Power Button LED´s
+ledcontroler.menu Power Button LED�s
 ledcontroler.mode.tv TV Mode
 ledcontroler.mode.deepstandby Deep Standby
 ledcontroler.mode.standby Standby
@@ -494,7 +498,7 @@ mainmenu.shutdown Shutdown
 mainmenu.sleeptimer SleepTimer
 mainmenu.tvmode TV-Mode
 mainsettings.audio Audio
-mainsettings.osd OSD settings
+mainsettings.osd OSD
 mainsettings.head Settings
 mainsettings.keybinding Key Setup
 mainsettings.language International settings
diff --git a/src/system/locals.h b/src/system/locals.h
index df4980687..e69cc9970 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -259,13 +259,14 @@ typedef enum {
 	LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED,
 	LOCALE_COLORMENUSETUP_MENUHEAD,
 	LOCALE_COLORSTATUSBAR_TEXT,
-	LOCALE_COLORTHEMEMENU_CLASSIC_THEME,
-	LOCALE_COLORTHEMEMENU_DBLUE_THEME,
-	LOCALE_COLORTHEMEMENU_DVB2K_THEME,
-	LOCALE_COLORTHEMEMENU_RED_THEME,
 	LOCALE_COLORTHEMEMENU_HEAD,
+	LOCALE_COLORTHEMEMENU_HEAD2,
+	LOCALE_COLORTHEMEMENU_NAME,
 	LOCALE_COLORTHEMEMENU_NEUTRINO_THEME,
-	LOCALE_COLORTHEMEMENU_GRAY,
+	LOCALE_COLORTHEMEMENU_QUESTION,
+	LOCALE_COLORTHEMEMENU_SAVE,
+	LOCALE_COLORTHEMEMENU_SELECT1,
+	LOCALE_COLORTHEMEMENU_SELECT2,
 	LOCALE_DATE_APR,
 	LOCALE_DATE_AUG,
 	LOCALE_DATE_DEC,
@@ -461,6 +462,7 @@ typedef enum {
 	LOCALE_KEYBINDINGMENU_CHANNELUP,
 	LOCALE_KEYBINDINGMENU_HEAD,
 	LOCALE_KEYBINDINGMENU_LASTCHANNEL,
+	LOCALE_KEYBINDINGMENU_MISC,
 	LOCALE_KEYBINDINGMENU_MODECHANGE,
 	LOCALE_KEYBINDINGMENU_PAGEDOWN,
 	LOCALE_KEYBINDINGMENU_PAGEUP,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 3911e007b..cd34f857a 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -259,13 +259,14 @@ const char *locale_real_names[] = {
 	"colormenusetup.menucontent_selected",
 	"colormenusetup.menuhead",
 	"colorstatusbar.text",
-	"colorthememenu.classic_theme",
-	"colorthememenu.dblue_theme",
-	"colorthememenu.dvb2k_theme",
-	"colorthememenu.red_theme",
 	"colorthememenu.head",
+	"colorthememenu.head2",
+	"colorthememenu.name",
 	"colorthememenu.neutrino_theme",
-	"colorthememenu.gray",
+	"colorthememenu.question",
+	"colorthememenu.save",
+	"colorthememenu.select1",
+	"colorthememenu.select2",
 	"date.Apr",
 	"date.Aug",
 	"date.Dec",
@@ -461,6 +462,7 @@ const char *locale_real_names[] = {
 	"keybindingmenu.channelup",
 	"keybindingmenu.head",
 	"keybindingmenu.lastchannel",
+	"keybindingmenu.misc",
 	"keybindingmenu.modechange",
 	"keybindingmenu.pagedown",
 	"keybindingmenu.pageup",