diff --git a/app/img/NEO2.png b/app/img/NEO2.png
new file mode 100644
index 0000000..86608ef
Binary files /dev/null and b/app/img/NEO2.png differ
diff --git a/app/img/QWERTZ.png b/app/img/QWERTZ.png
new file mode 100644
index 0000000..d922bac
Binary files /dev/null and b/app/img/QWERTZ.png differ
diff --git a/app/index.html b/app/index.html
index d16f69c..bcab5ed 100644
--- a/app/index.html
+++ b/app/index.html
@@ -76,8 +76,10 @@ <h2>Customize it</h2>
                     <option value="MINIMAK_4K">Minimak 4-Keys</option>
                     <option value="MINIMAK_8K">Minimak 8-Keys</option>
                     <option value="MINIMAK_12K">Minimak 12-Keys</option>
+                    <option value="NEO2">NEO 2</option>
                     <option value="NORMAN">Norman</option>
                     <option value="QWERTY" selected>QWERTY</option>
+                    <option value="QWERTZ">QWERTZ</option>
                     <option value="WORKMAN">Workman</option>
                 </select>
                 <!-- <div id="apply" class="button">
diff --git a/app/keyboard-layouts.js b/app/keyboard-layouts.js
index 8dcbefa..bbe590c 100644
--- a/app/keyboard-layouts.js
+++ b/app/keyboard-layouts.js
@@ -1351,7 +1351,7 @@ app.LAYOUTS = {
         "notset": [297, 250],
         "notset": [320, 336],
         "notset": [366, 293],
-        "notset": [366, 336],
+        "notset": [366, 336],                                                                                                                               
   
         // right thumb
         "notset": [434, 336],
@@ -1360,6 +1360,154 @@ app.LAYOUTS = {
         " ": [527, 256],
         "notset": [502, 293],
         "notset": [526, 336]
+    },
+    NEO2: {
+        "~": [710, 174, 70, 275],
+        "`": [685, 120],
+        "1": [90, 120],
+        "!": [386, 174, 40, 225],
+        "2": [144, 120],
+        "@": [670, 225, 40, 255],
+        "3": [198, 120],
+        "#": [158, 275, 40, 225],
+        "4": [253, 120],
+        "$": [361, 120, 40, 275],
+        "5": [307, 120],
+        "%": [482, 275, 20, 225],
+        "6": [361, 120],
+        "^": [35, 120],
+        "7": [415, 120],
+        "&": [602, 174, 40, 225],
+        "8": [469, 120],
+        "*": [346, 225, 40, 225],
+        "9": [524, 120],
+        "(": [454, 225, 40, 225],
+        "0": [579, 120],
+        ")": [508, 225, 40, 225],
+        "-": [630, 120],
+        "_": [169, 174, 40, 225],
+        "+": [428, 275, 40, 225],
+        "=": [548, 174, 40, 225],
+        "X": [115, 174],
+        "V": [169, 174],
+        "L": [224, 174],
+        "C": [278, 174],
+        "W": [332, 174],
+        "K": [386, 174],
+        "H": [440, 174],
+        "G": [494, 174],
+        "F": [548, 174],
+        "Q": [602, 174],
+        "[": [224, 174, 40, 225],
+        "{": [238, 225, 40, 225],
+        "]": [278, 174, 40, 225],
+        "}": [292, 225, 40, 225],
+        "\"": [130, 225, 40, 225],
+        "|": [266, 275, 40, 225],
+        "U": [130, 225],
+        "I": [184, 225],
+        "A": [238, 225],
+        "E": [292, 225],
+        "O": [346, 225],
+        "S": [400, 225],
+        "N": [454, 225],
+        "R": [508, 225],
+        "T": [562, 225],
+        ";": [644, 275, 40, 225],
+        ":": [616, 225, 40, 225],
+        "'": [590, 275, 40, 225],
+        "Ü": [158, 275],
+        "Ö": [212, 275],
+        "Ä": [266, 275],
+        "P": [320, 275],
+        "Z": [374, 275],
+        "B": [428, 275],
+        "M": [482, 275],
+        ",": [536, 275],
+        "<": [440, 174, 40, 225],
+        ".": [590, 275],
+        ">": [494, 174, 40, 225],
+        "/": [184, 225, 40, 225],
+        "?": [400, 225, 40, 225],
+        "ẞ": [656, 174],
+        "D": [616, 225],
+        "J": [644, 275],
+        "Y": [670, 225],
+        " ": [500, 300]
+    },
+    QWERTZ: {
+        "~": [710, 174, 602, 331],
+        "`": [685, 120, 40, 275],
+        "1": [90, 120],
+        "!": [90, 120, 40, 275],
+        "2": [144, 120],
+        "@": [115, 174, 602, 331],
+        "3": [198, 120],
+        "#": [725, 225],
+        "4": [253, 120],
+        "$": [253, 120, 40, 275],
+        "5": [307, 120],
+        "%": [307, 120, 40, 275],
+        "6": [361, 120],
+        "^": [35, 120],
+        "7": [415, 120],
+        "&": [361, 120, 40, 275],
+        "8": [469, 120],
+        "*": [710, 174, 40, 275],
+        "9": [524, 120],
+        "(": [469, 120, 40, 275],
+        "0": [579, 120],
+        ")": [524, 120, 40, 275],
+        "-": [644, 275],
+        "_": [644, 275, 40, 275],
+        "+": [710, 174],
+        "=": [579, 120, 40, 275],
+        "Q": [115, 174],
+        "W": [169, 174],
+        "E": [224, 174],
+        "R": [278, 174],
+        "T": [332, 174],
+        "Z": [386, 174],
+        "U": [440, 174],
+        "I": [494, 174],
+        "O": [548, 174],
+        "P": [602, 174],
+        "[": [469, 120, 602, 331],
+        "{": [415, 120, 602, 331],
+        "]": [524, 120, 602, 331],
+        "}": [579, 120, 602, 331],
+        "|": [98, 275, 602, 331],
+        "A": [130, 225],
+        "S": [184, 225],
+        "D": [238, 225],
+        "F": [292, 225],
+        "G": [346, 225],
+        "H": [400, 225],
+        "J": [454, 225],
+        "K": [508, 225],
+        "L": [562, 225],
+        ";": [536, 275, 40, 275],
+        ":": [590, 275, 40, 275],
+        "'": [725, 225, 40, 275],
+        "\"": [630, 120, 602, 331],
+        "Y": [158, 275],
+        "X": [212, 275],
+        "C": [266, 275],
+        "V": [320, 275],
+        "B": [374, 275],
+        "N": [428, 275],
+        "M": [482, 275],
+        ",": [536, 275],
+        "<": [98, 275],
+        ".": [590, 275],
+        ">": [98, 275, 40, 275],
+        "/": [415, 120, 40, 275],
+        "?": [630, 120, 602, 331],
+        "Ä": [670, 225],
+        "Ö": [616, 225],
+        "Ü": [656, 174],
+        "ß": [630, 120],
+        " ": [500, 300]
     }
 },
 app.EXCLUDES = [" "],