diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
index 375c283f76..ce40d2fe29 100644
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -22,4 +22,5 @@
     <setting id="TRANSMISSION_USER" value="openelec" />
     <setting id="TVHEADEND_START" value="false" />
     <setting id="UPDATE_AUTO" value="manually" />
+    <setting id="X11_KEYMAP" value="us" />
 </settings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
index 76453efdaf..0a0508496c 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="os.openelec.settings"
        name="OpenELEC OS Settings"
-       version="0.0.3"
+       version="0.0.4"
        provider-name="openelec.tv">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py
index 547ddba574..cc8fc94470 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/default.py
+++ b/packages/mediacenter/xbmc-addon-settings/source/default.py
@@ -27,7 +27,7 @@ __author__ = "OpenELEC"
 __url__ = "http://www.openelec.tv"
 __svn_url__ = ""
 __credits__ = ""
-__version__ = "0.0.3"
+__version__ = "0.0.4"
 __XBMC_Revision__ = "22240"
 
 __settings__   = xbmcaddon.Addon(id='os.openelec.settings')
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
index cf51531315..af1ab2e97e 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
 
-	<!-- General -->
-	<string id="2000">Update</string>
-	<string id="2010">Update</string>
-	<string id="2011">Auto update</string>
+	<!-- System -->
+	<string id="2000">System</string>
+	<string id="2010">Toetsenbord</string>
+	<string id="2011">Toetsenbord layout</string>
+	<string id="2020">System Update</string>
+	<string id="2021">Auto update</string>
+	<string id="2050">LCD/VFD Driver</string>
+	<string id="2051">Te gebruiken LCD Driver</string>
 
 	<!-- Netwerk -->
 	<string id="2100">Netwerk</string>
@@ -26,11 +30,6 @@
 	<string id="2153">WLAN beveiliging</string>
 	<string id="2154">WLAN wachtwoord</string>
 
-	<!-- LCD -->
-	<string id="3100">LCD/VFD</string>
-	<string id="3110">Driver</string>
-	<string id="3111">Te gebruiken LCD Driver</string>
-
 	<!-- TV_SERVER -->
 	<string id="4100">TV/PVR</string>
 	<string id="4110">Configuratie</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index 5137a33f67..f666cff917 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
 
-	<!-- General -->
-	<string id="2000">Update</string>
-	<string id="2010">Update</string>
-	<string id="2011">Auto update</string>
+	<!-- System -->
+	<string id="2000">System</string>
+	<string id="2010">Keyboard</string>
+	<string id="2011">Keyboardlayout</string>
+	<string id="2020">System Update</string>
+	<string id="2021">Auto update</string>
+	<string id="2050">LCD/VFD</string>
+	<string id="2051">LCD Driver to use</string>
 
 	<!-- Network -->
 	<string id="2100">Network</string>
@@ -26,11 +30,6 @@
 	<string id="2153">WLAN Security</string>
 	<string id="2154">WLAN Passphrase</string>
 
-	<!-- LCD -->
-	<string id="3100">LCD/VFD</string>
-	<string id="3110">Driver</string>
-	<string id="3111">LCD Driver to use</string>
-
 	<!-- TV_SERVER -->
 	<string id="4100">TV/PVR</string>
 	<string id="4110">Boot</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
index d65cba4a11..a0df776b75 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
@@ -2,9 +2,13 @@
 <strings>
 
 	<!-- General -->
-	<string id="2000">Mise à jour</string>
-	<string id="2010">Mise à jour</string>
-	<string id="2011">Mise à jour automatique</string>
+	<string id="2000">Système</string>
+	<string id="2010">Clavier</string>
+	<string id="2011">Clavier</string>
+	<string id="2020">Mise à jour du système</string>
+	<string id="2021">Mise à jour automatique</string>
+	<string id="2050">LCD/VFD</string>
+	<string id="2051">Pilote LCD</string>
 
 	<!-- Network -->
 	<string id="2100">Réseau</string>
@@ -26,11 +30,6 @@
 	<string id="2153">Sécurité WIFI</string>
 	<string id="2154">Passphrase</string>
 
-	<!-- LCD -->
-	<string id="3100">LCD/VFD</string>
-	<string id="3110">Pilote</string>
-	<string id="3111">Pilote LCD</string>
-
 	<!-- TV_SERVER -->
 	<string id="4100">TV/PVR</string>
 	<string id="4110">Démarrage</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index e53b26a52f..dd2ad35851 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
 
-   <!-- UPDATE -->
+   <!-- SYSTEM -->
 	<category label="2000">
 		<setting label="2010" type="lsep"/>
 		<setting type="sep" />
-		<setting id="UPDATE_AUTO" type="labelenum" label="2011" values="no|manually|auto" sort="yes" default="manually" />
+		<setting id="X11_KEYMAP" type="labelenum" label="2011" values="ch|de|fr|uk|us" sort="yes" default="us"/>
+		<setting label="2020" type="lsep"/>
+		<setting type="sep" />
+		<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manually|auto" sort="yes" default="manually" />
+		<setting label="2050" type="lsep"/>
+		<setting type="sep" />
+		<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon" sort="yes" default="none" />
     </category>
 
    <!-- Network -->
@@ -33,13 +39,6 @@
 		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default=""  enable="!eq(-1,0)"/>
     </category>
 
-   <!-- LCD -->
-	<category label="3100">
-		<setting label="3110" type="lsep"/>
-		<setting type="sep" />
-		<setting id="LCD_DRIVER" type="labelenum" label="3111" values="none|irtrans|imon" sort="yes" default="none" />
-    </category>
-
    <!-- TV-SERVER -->
 	<category label="4100">
 		<setting label="4110" type="lsep"/>