diff --git a/plugins/de@terminal/qml/Keyboard_de@terminal.qml b/plugins/de@terminal/qml/Keyboard_de@terminal.qml
index fca6574b..baf81e1f 100644
--- a/plugins/de@terminal/qml/Keyboard_de@terminal.qml
+++ b/plugins/de@terminal/qml/Keyboard_de@terminal.qml
@@ -45,7 +45,8 @@ KeyPad {
             CharKey { label: "u"; shifted: "U"; extended: ["7", "ü","ù","ú","û"]; extendedShifted: ["7", "Ü","Ù","Ú","Û"] }
             CharKey { label: "i"; shifted: "I"; extended: ["8", "ì","í","î","ï","ı"]; extendedShifted: ["8", "Ì","Í","Î","Ï","İ"] }
             CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ò","ó","ô","õ","ø"]; extendedShifted: ["9", "Ö","Ò","Ó","Ô","Õ","Ø"] }
-            CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
+            CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
+            CharKey { label: "ü"; shifted: "Ü"; }
         }
 
         Row {
@@ -62,7 +63,8 @@ KeyPad {
             CharKey { label: "j"; shifted: "J"; }
             CharKey { label: "k"; shifted: "K"; }
             CharKey { label: "l"; shifted: "L"; extended: ["ł","£"]; extendedShifted: ["Ł","£"] }
-            CharKey { label: "ü"; shifted: "Ü"; rightSide: true; }
+            CharKey { label: "ö"; shifted: "Ö"; }
+            CharKey { label: "ä"; shifted: "Ä"; }
         }
 
         Row {
@@ -77,7 +79,8 @@ KeyPad {
             CharKey { label: "b"; shifted: "B"; }
             CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
             CharKey { label: "m"; shifted: "M"; }
-            CharKey { label: "ä"; shifted: "Ä"; }
+            CharKey { label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"] }
+            CharKey { label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"];  extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"] }
             BackspaceKey { padding: 0 }
         }
 
@@ -87,14 +90,11 @@ KeyPad {
 
             height: panel.keyHeight + Device.row_margin;
 
-            ControlKey     { id: ctrlKey;     label: "strg"; shifted: "strg";   anchors.left: parent.left; height: parent.height; }
-            SymbolShiftKey { id: symShiftKey;                            anchors.left: ctrlKey.right; height: parent.height; }
-            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
-            SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"];  extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
-            CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
-            ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
+            ControlKey     { id: ctrlKey;     label: "strg"; shifted: "strg";   anchors.left: parent.left; anchors.right: symShiftKey.left; height: parent.height; }
+            SymbolShiftKey { id: symShiftKey;                                   anchors.left: ctrlKey.right; anchors.right: SpaceKey.left; height: parent.height; }
+            SpaceKey       { id: spaceKey;                                      anchors.left: symShiftKey.right; anchors.right: languageMenuButton.left; noMagnifier: true; height: parent.height; }
+            LanguageKey    { id: languageMenuButton;                            anchors.left: spaceKey.right; anchors.right: enterKey.left; height: parent.height; }
+            ReturnKey      { id: enterKey;                                      anchors.right: parent.right; height: parent.height; }
         }
     } // column
 }
diff --git a/qml/keys/languages.js b/qml/keys/languages.js
index 89fcc0cd..d45a09d7 100644
--- a/qml/keys/languages.js
+++ b/qml/keys/languages.js
@@ -16,47 +16,48 @@
 
 function languageIdToName(languageId)
 {
-    if (languageId == "ar")         return Gettext.qsTr("Arabic");
-    if (languageId == "az")         return Gettext.qsTr("Azerbaijani");
-    if (languageId == "be")         return Gettext.qsTr("Belarusian");
-    if (languageId == "bg")         return Gettext.qsTr("Bulgarian");
-    if (languageId == "bs")         return Gettext.qsTr("Bosnian");
-    if (languageId == "ca")         return Gettext.qsTr("Catalan");
-    if (languageId == "cs")         return Gettext.qsTr("Czech");
-    if (languageId == "da")         return Gettext.qsTr("Danish");
-    if (languageId == "de")         return Gettext.qsTr("German");
-    if (languageId == "el")         return Gettext.qsTr("Greek");
-    if (languageId == "en")         return Gettext.qsTr("English");
-    if (languageId == "en@dv")      return Gettext.qsTr("English\n(Dvorak)");
-    if (languageId == "eo")         return Gettext.qsTr("Esperanto");
-    if (languageId == "es")         return Gettext.qsTr("Spanish");
-    if (languageId == "fa")         return Gettext.qsTr("Persian");
-    if (languageId == "fi")         return Gettext.qsTr("Finnish");
-    if (languageId == "fr")         return Gettext.qsTr("French");
-    if (languageId == "fr-ch")      return Gettext.qsTr("French\n(Swiss)");
-    if (languageId == "gd")         return Gettext.qsTr("Scottish Gaelic");
-    if (languageId == "he")         return Gettext.qsTr("Hebrew");
-    if (languageId == "hr")         return Gettext.qsTr("Croatian");
-    if (languageId == "hu")         return Gettext.qsTr("Hungarian");
-    if (languageId == "is")         return Gettext.qsTr("Icelandic");
-    if (languageId == "it")         return Gettext.qsTr("Italian");
-    if (languageId == "ja")         return Gettext.qsTr("Japanese");
-    if (languageId == "lt")         return Gettext.qsTr("Lithuanian");
-    if (languageId == "lv")         return Gettext.qsTr("Latvian");
-    if (languageId == "mk")         return Gettext.qsTr("Macedonian");
-    if (languageId == "ko")         return Gettext.qsTr("Korean");
-    if (languageId == "nl")         return Gettext.qsTr("Dutch");
-    if (languageId == "nb")         return Gettext.qsTr("Norwegian");
-    if (languageId == "pl")         return Gettext.qsTr("Polish");
-    if (languageId == "pt")         return Gettext.qsTr("Portuguese");
-    if (languageId == "ro")         return Gettext.qsTr("Romanian");
-    if (languageId == "ru")         return Gettext.qsTr("Russian");
-    if (languageId == "sl")         return Gettext.qsTr("Slovenian");
-    if (languageId == "sr")         return Gettext.qsTr("Serbian");
-    if (languageId == "sv")         return Gettext.qsTr("Swedish");
-    if (languageId == "th")         return Gettext.qsTr("Thai");
-    if (languageId == "tr")         return Gettext.qsTr("Turkish");
-    if (languageId == "uk")         return Gettext.qsTr("Ukrainian");
+    if (languageId == "ar")              return Gettext.qsTr("Arabic");
+    if (languageId == "az")              return Gettext.qsTr("Azerbaijani");
+    if (languageId == "be")              return Gettext.qsTr("Belarusian");
+    if (languageId == "bg")              return Gettext.qsTr("Bulgarian");
+    if (languageId == "bs")              return Gettext.qsTr("Bosnian");
+    if (languageId == "ca")              return Gettext.qsTr("Catalan");
+    if (languageId == "cs")              return Gettext.qsTr("Czech");
+    if (languageId == "da")              return Gettext.qsTr("Danish");
+    if (languageId == "de")              return Gettext.qsTr("German");
+    if (languageId == "de@terminal")     return Gettext.qsTr("German\n(Terminal)");
+    if (languageId == "el")              return Gettext.qsTr("Greek");
+    if (languageId == "en")              return Gettext.qsTr("English");
+    if (languageId == "en@dv")           return Gettext.qsTr("English\n(Dvorak)");
+    if (languageId == "eo")              return Gettext.qsTr("Esperanto");
+    if (languageId == "es")              return Gettext.qsTr("Spanish");
+    if (languageId == "fa")              return Gettext.qsTr("Persian");
+    if (languageId == "fi")              return Gettext.qsTr("Finnish");
+    if (languageId == "fr")              return Gettext.qsTr("French");
+    if (languageId == "fr-ch")           return Gettext.qsTr("French\n(Swiss)");
+    if (languageId == "gd")              return Gettext.qsTr("Scottish Gaelic");
+    if (languageId == "he")              return Gettext.qsTr("Hebrew");
+    if (languageId == "hr")              return Gettext.qsTr("Croatian");
+    if (languageId == "hu")              return Gettext.qsTr("Hungarian");
+    if (languageId == "is")              return Gettext.qsTr("Icelandic");
+    if (languageId == "it")              return Gettext.qsTr("Italian");
+    if (languageId == "ja")              return Gettext.qsTr("Japanese");
+    if (languageId == "lt")              return Gettext.qsTr("Lithuanian");
+    if (languageId == "lv")              return Gettext.qsTr("Latvian");
+    if (languageId == "mk")              return Gettext.qsTr("Macedonian");
+    if (languageId == "ko")              return Gettext.qsTr("Korean");
+    if (languageId == "nl")              return Gettext.qsTr("Dutch");
+    if (languageId == "nb")              return Gettext.qsTr("Norwegian");
+    if (languageId == "pl")              return Gettext.qsTr("Polish");
+    if (languageId == "pt")              return Gettext.qsTr("Portuguese");
+    if (languageId == "ro")              return Gettext.qsTr("Romanian");
+    if (languageId == "ru")              return Gettext.qsTr("Russian");
+    if (languageId == "sl")              return Gettext.qsTr("Slovenian");
+    if (languageId == "sr")              return Gettext.qsTr("Serbian");
+    if (languageId == "sv")              return Gettext.qsTr("Swedish");
+    if (languageId == "th")              return Gettext.qsTr("Thai");
+    if (languageId == "tr")              return Gettext.qsTr("Turkish");
+    if (languageId == "uk")              return Gettext.qsTr("Ukrainian");
     if (languageId == "zh-hans")         return Gettext.qsTr("Chinese\n(Pinyin)");
     if (languageId == "zh-hant")         return Gettext.qsTr("Chinese\n(Chewing)");