diff --git a/data/keyboards/ch+de.yaml b/data/keyboards/ch+de.yaml
new file mode 100644
index 00000000..9ae5ad16
--- /dev/null
+++ b/data/keyboards/ch+de.yaml
@@ -0,0 +1,73 @@
+# Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
+
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 48,    height: 52 }
+    wide:      { width: 59,    height: 52 }
+    spaceline: { width: 70,    height: 52 }
+    special:   { width: 28,    height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p ü"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers ? !  preferences    '   space        , . Return"
+    upper:
+        - "Q W E R T Z U I O P Ü"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers - _  preferences    \"  space        , . Return"
+    numbers:      
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ * + - = ( ) ~ < >"
+        - "show_symbols  # & / \\ √ ; : BackSpace"
+        - "show_letters ? !  preferences    _   space        , . Return"
+    symbols:
+        - "€ $ £ ¥ % | § µ [ ]"
+        - "© ® § ` ^ { } · ¡ ¿"
+        - "show_numbers  « » ÷ × “ ” „ BackSpace"
+        - "show_letters  preferences    -   space        , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "abc"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    "\"":
+        keysym: "quotedbl"
diff --git a/data/keyboards/ch.yaml b/data/keyboards/ch.yaml
index bc7c2acb..87e14c51 100644
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@@ -1,5 +1,5 @@
-# Maintained by: Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-# Thankfully copied from: Jordi Bossy <jordi@bossy.space>.
+# Maintained by: Jordy Bossy <jordi@bossy.space>
+# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 
 ---
 outlines:
@@ -22,7 +22,7 @@ views:
         - "show_numbers show_eschars preferences    \"  space        , . Return"
     numbers:      
         - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < >"
+        - "@ * + - = ( ) ~ < > ? !"
         - "show_symbols  # & / \\ √ ; : BackSpace"
         - "show_letters show_eschars preferences    _   space        , . Return"
     symbols:
diff --git a/src/resources.rs b/src/resources.rs
index fe3fbb55..6ee0af7e 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -29,6 +29,7 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
     ("br", include_str!("../data/keyboards/br.yaml")),
     
     ("ch+fr", include_str!("../data/keyboards/ch+fr.yaml")),
+    ("ch+de", include_str!("../data/keyboards/ch+de.yaml")),
     ("ch", include_str!("../data/keyboards/ch.yaml")),
 
     ("de", include_str!("../data/keyboards/de.yaml")),
diff --git a/tests/meson.build b/tests/meson.build
index 4eab8a27..54ae0d4e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -63,6 +63,7 @@ foreach layout : [
     'bg',
     'br',
     'ch+fr',
+    'ch+de',
     'ch',
     'cz', 'cz_wide',
     'cz+qwerty', 'cz+qwerty_wide',