[Keyboard] fixed noah info.json (#7502)

* fixed noah info.json

* fixed iso keymap and adding default iso keymaps

* keymap cleanup

* verified through the qmk configurator preview mode

4 files changed, 795 insertions, 73 deletions

diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 2c40b5980..ccfc6739b 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -1,4 +1,4 @@
-{
+{
   "keyboard_name": "NOAH",
   "url": "",
   "maintainer": "astro",
@@ -79,12 +79,12 @@
           "y": 0
         },
         {
-          "label":"Backspace",
+          "label": "~",
           "x": 14,
           "y": 0
         },
         {
-          "label":"Print Screen",
+          "Label": "Ins",
           "x": 15,
           "y": 0
         },
@@ -155,17 +155,18 @@
           "y": 1
         },
         {
-          "label": "|",
+          "label": "Backspace",
           "x": 13.5,
           "y": 1,
           "w": 1.5
         },
-        { "label": "Page Up",
+        {
+          "label": "Page up",
           "x": 15,
           "y": 1
         },
         {
-          "label": "Caps Lock",
+          "label": "Ctrl",
           "x": 0,
           "y": 2,
           "w": 1.75
@@ -232,7 +233,7 @@
           "w": 2.25
         },
         {
-          "label": "Page Down",
+          "label": "Page down",
           "x": 15,
           "y": 2
         },
@@ -299,17 +300,17 @@
           "w": 1.75
         },
         {
-          "label": "Up",
+          "label": "↑",
           "x": 14,
           "y": 3
         },
         {
-          "label": "End"
+          "label": "End",
           "x": 15,
           "y": 3
         },
         {
-          "label": "Ctrl",
+          "label": "Caps Lock",
           "x": 0,
           "y": 4,
           "w": 1.25
@@ -338,30 +339,30 @@
           "w": 1.25
         },
         {
-          "label": "Win",
+          "label": "Fn",
           "x": 11.25,
           "y": 4,
           "w": 1.25
         },
         {
-          "label": "Left",
+          "label": "←",
           "x": 13,
           "y": 4
         },
         {
-          "label": "Down",
+          "label": "↓",
           "x": 14,
           "y": 4
         },
         {
-          "label": "Right",
+          "label": "→",
           "x": 15,
           "y": 4
         }
       ]
     },
-    "LAYOUT_iso": {
-      "key_count": 68,
+    "LAYOUT_default_splitspace": {
+      "key_count": 70,
       "layout": [
         {
           "label": "~",
@@ -429,13 +430,17 @@
           "y": 0
         },
         {
-          "label": "Backspace",
+          "label": "|",
           "x": 13,
-          "y": 0,
-          "w": 2
+          "y": 0
         },
         {
-          "label": "Print Screen",
+          "label": "~",
+          "x": 14,
+          "y": 0
+        },
+        {
+          "Label": "Ins",
           "x": 15,
           "y": 0
         },
@@ -506,19 +511,18 @@
           "y": 1
         },
         {
-          "label": "Enter",
-          "x": 13.75,
+          "label": "Backspace",
+          "x": 13.5,
           "y": 1,
-          "w": 1.25,
-          "h": 2
+          "w": 1.5
         },
         {
-          "label": "Page Up",
+          "label": "Page up",
           "x": 15,
           "y": 1
         },
         {
-          "label": "Caps Lock",
+          "label": "Ctrl",
           "x": 0,
           "y": 2,
           "w": 1.75
@@ -579,12 +583,13 @@
           "y": 2
         },
         {
-          "label": "|",
+          "label": "Enter",
           "x": 12.75,
-          "y": 2
+          "y": 2,
+          "w": 2.25
         },
         {
-          "label": "Page Down",
+          "label": "Page down",
           "x": 15,
           "y": 2
         },
@@ -592,12 +597,7 @@
           "label": "Shift",
           "x": 0,
           "y": 3,
-          "w": 1.25
-        },
-        {
-          "label":"Win",
-          "x": 1.25,
-          "y": 3
+          "w": 2.25
         },
         {
           "label": "Z",
@@ -656,7 +656,7 @@
           "w": 1.75
         },
         {
-          "label": "Up",
+          "label": "↑",
           "x": 14,
           "y": 3
         },
@@ -666,7 +666,7 @@
           "y": 3
         },
         {
-          "label": "Ctrl",
+          "label": "Caps Lock",
           "x": 0,
           "y": 4,
           "w": 1.25
@@ -686,7 +686,18 @@
         {
           "x": 3.75,
           "y": 4,
-          "w": 6.25
+          "w": 2.25
+        },
+        {
+          "label": "Fn",
+          "x": 6,
+          "y": 4,
+          "w": 1.25
+        },
+        {
+          "x": 7.25,
+          "y": 4,
+          "w": 2.75
         },
         {
           "label": "Alt",
@@ -695,23 +706,722 @@
           "w": 1.25
         },
         {
-          "label": "Win",
+          "label": "Fn",
           "x": 11.25,
           "y": 4,
           "w": 1.25
         },
         {
-          "label": "Left",
+          "label": "←",
+          "x": 13,
+          "y": 4
+        },
+        {
+          "label": "↓",
+          "x": 14,
+          "y": 4
+        },
+        {
+          "label": "→",
+          "x": 15,
+          "y": 4
+        }
+      ]
+    },
+    "LAYOUT_wkl": {
+      "key_count": 67,
+      "layout": [
+        {
+          "label": "~",
+          "x": 0,
+          "y": 0
+        },
+        {
+          "label": "!",
+          "x": 1,
+          "y": 0
+        },
+        {
+          "label": "@",
+          "x": 2,
+          "y": 0
+        },
+        {
+          "label": "#",
+          "x": 3,
+          "y": 0
+        },
+        {
+          "label": "$",
+          "x": 4,
+          "y": 0
+        },
+        {
+          "label": "%",
+          "x": 5,
+          "y": 0
+        },
+        {
+          "label": "^",
+          "x": 6,
+          "y": 0
+        },
+        {
+          "label": "&",
+          "x": 7,
+          "y": 0
+        },
+        {
+          "label": "*",
+          "x": 8,
+          "y": 0
+        },
+        {
+          "label": "(",
+          "x": 9,
+          "y": 0
+        },
+        {
+          "label": ")",
+          "x": 10,
+          "y": 0
+        },
+        {
+          "label": "_",
+          "x": 11,
+          "y": 0
+        },
+        {
+          "label": "+",
+          "x": 12,
+          "y": 0
+        },
+        {
+          "label": "|",
+          "x": 13,
+          "y": 0
+        },
+        {
+          "label": "~",
+          "x": 14,
+          "y": 0
+        },
+        {
+          "Label": "Ins",
+          "x": 15,
+          "y": 0
+        },
+        {
+          "label": "Tab",
+          "x": 0,
+          "y": 1,
+          "w": 1.5
+        },
+        {
+          "label": "Q",
+          "x": 1.5,
+          "y": 1
+        },
+        {
+          "label": "W",
+          "x": 2.5,
+          "y": 1
+        },
+        {
+          "label": "E",
+          "x": 3.5,
+          "y": 1
+        },
+        {
+          "label": "R",
+          "x": 4.5,
+          "y": 1
+        },
+        {
+          "label": "T",
+          "x": 5.5,
+          "y": 1
+        },
+        {
+          "label": "Y",
+          "x": 6.5,
+          "y": 1
+        },
+        {
+          "label": "U",
+          "x": 7.5,
+          "y": 1
+        },
+        {
+          "label": "I",
+          "x": 8.5,
+          "y": 1
+        },
+        {
+          "label": "O",
+          "x": 9.5,
+          "y": 1
+        },
+        {
+          "label": "P",
+          "x": 10.5,
+          "y": 1
+        },
+        {
+          "label": "{",
+          "x": 11.5,
+          "y": 1
+        },
+        {
+          "label": "}",
+          "x": 12.5,
+          "y": 1
+        },
+        {
+          "label": "Backspace",
+          "x": 13.5,
+          "y": 1,
+          "w": 1.5
+        },
+        {
+          "label": "Page up",
+          "x": 15,
+          "y": 1
+        },
+        {
+          "label": "Ctrl",
+          "x": 0,
+          "y": 2,
+          "w": 1.75
+        },
+        {
+          "label": "A",
+          "x": 1.75,
+          "y": 2
+        },
+        {
+          "label": "S",
+          "x": 2.75,
+          "y": 2
+        },
+        {
+          "label": "D",
+          "x": 3.75,
+          "y": 2
+        },
+        {
+          "label": "F",
+          "x": 4.75,
+          "y": 2
+        },
+        {
+          "label": "G",
+          "x": 5.75,
+          "y": 2
+        },
+        {
+          "label": "H",
+          "x": 6.75,
+          "y": 2
+        },
+        {
+          "label": "J",
+          "x": 7.75,
+          "y": 2
+        },
+        {
+          "label": "K",
+          "x": 8.75,
+          "y": 2
+        },
+        {
+          "label": "L",
+          "x": 9.75,
+          "y": 2
+        },
+        {
+          "label": ":",
+          "x": 10.75,
+          "y": 2
+        },
+        {
+          "label": "\"",
+          "x": 11.75,
+          "y": 2
+        },
+        {
+          "label": "Enter",
+          "x": 12.75,
+          "y": 2,
+          "w": 2.25
+        },
+        {
+          "label": "Page down",
+          "x": 15,
+          "y": 2
+        },
+        {
+          "label": "Shift",
+          "x": 0,
+          "y": 3,
+          "w": 2.25
+        },
+        {
+          "label": "Z",
+          "x": 2.25,
+          "y": 3
+        },
+        {
+          "label": "X",
+          "x": 3.25,
+          "y": 3
+        },
+        {
+          "label": "C",
+          "x": 4.25,
+          "y": 3
+        },
+        {
+          "label": "V",
+          "x": 5.25,
+          "y": 3
+        },
+        {
+          "label": "B",
+          "x": 6.25,
+          "y": 3
+        },
+        {
+          "label": "N",
+          "x": 7.25,
+          "y": 3
+        },
+        {
+          "label": "M",
+          "x": 8.25,
+          "y": 3
+        },
+        {
+          "label": "<",
+          "x": 9.25,
+          "y": 3
+        },
+        {
+          "label": ">",
+          "x": 10.25,
+          "y": 3
+        },
+        {
+          "label": "?",
+          "x": 11.25,
+          "y": 3
+        },
+        {
+          "label": "Shift",
+          "x": 12.25,
+          "y": 3,
+          "w": 1.75
+        },
+        {
+          "label": "&uarr;",
+          "x": 14,
+          "y": 3
+        },
+        {
+          "label": "End",
+          "x": 15,
+          "y": 3
+        },
+        {
+          "label": "Caps Lock",
+          "x": 0,
+          "y": 4,
+          "w": 1.5
+        },
+        {
+          "label": "Win",
+          "x": 1.5,
+          "y": 4
+        },
+        {
+          "label": "Alt",
+          "x": 2.5,
+          "y": 4,
+          "w": 1.5
+        },
+        {
+          "x": 4,
+          "y": 4,
+          "w": 7
+        },
+        {
+          "label": "Fn",
+          "x": 11,
+          "y": 4,
+          "w": 1.5
+        },
+        {
+          "label": "&larr;",
+          "x": 13,
+          "y": 4
+        },
+        {
+          "label": "&darr;",
+          "x": 14,
+          "y": 4
+        },
+        {
+          "label": "&rarr;",
+          "x": 15,
+          "y": 4
+        }
+      ]
+    },
+    "LAYOUT_iso": {
+      "key_count": 67,
+      "layout": [
+        {
+          "label": "~",
+          "x": 0,
+          "y": 0
+        },
+        {
+          "label": "!",
+          "x": 1,
+          "y": 0
+        },
+        {
+          "label": "@",
+          "x": 2,
+          "y": 0
+        },
+        {
+          "label": "#",
+          "x": 3,
+          "y": 0
+        },
+        {
+          "label": "$",
+          "x": 4,
+          "y": 0
+        },
+        {
+          "label": "%",
+          "x": 5,
+          "y": 0
+        },
+        {
+          "label": "^",
+          "x": 6,
+          "y": 0
+        },
+        {
+          "label": "&",
+          "x": 7,
+          "y": 0
+        },
+        {
+          "label": "*",
+          "x": 8,
+          "y": 0
+        },
+        {
+          "label": "(",
+          "x": 9,
+          "y": 0
+        },
+        {
+          "label": ")",
+          "x": 10,
+          "y": 0
+        },
+        {
+          "label": "_",
+          "x": 11,
+          "y": 0
+        },
+        {
+          "label": "+",
+          "x": 12,
+          "y": 0
+        },
+        {
+          "label": "Backspace",
+          "x": 13,
+          "y": 0,
+          "w": 2
+        },
+        {
+          "label": "Ins",
+          "x": 15,
+          "y": 0
+        },
+        {
+          "label": "Tab",
+          "x": 0,
+          "y": 1,
+          "w": 1.5
+        },
+        {
+          "label": "Q",
+          "x": 1.5,
+          "y": 1
+        },
+        {
+          "label": "W",
+          "x": 2.5,
+          "y": 1
+        },
+        {
+          "label": "E",
+          "x": 3.5,
+          "y": 1
+        },
+        {
+          "label": "R",
+          "x": 4.5,
+          "y": 1
+        },
+        {
+          "label": "T",
+          "x": 5.5,
+          "y": 1
+        },
+        {
+          "label": "Y",
+          "x": 6.5,
+          "y": 1
+        },
+        {
+          "label": "U",
+          "x": 7.5,
+          "y": 1
+        },
+        {
+          "label": "I",
+          "x": 8.5,
+          "y": 1
+        },
+        {
+          "label": "O",
+          "x": 9.5,
+          "y": 1
+        },
+        {
+          "label": "P",
+          "x": 10.5,
+          "y": 1
+        },
+        {
+          "label": "{",
+          "x": 11.5,
+          "y": 1
+        },
+        {
+          "label": "}",
+          "x": 12.5,
+          "y": 1
+        },
+        {
+          "label": "Page up",
+          "x": 15,
+          "y": 1
+        },
+        {
+          "label": "Caps Lock",
+          "x": 0,
+          "y": 2,
+          "w": 1.75
+        },
+        {
+          "label": "A",
+          "x": 1.75,
+          "y": 2
+        },
+        {
+          "label": "S",
+          "x": 2.75,
+          "y": 2
+        },
+        {
+          "label": "D",
+          "x": 3.75,
+          "y": 2
+        },
+        {
+          "label": "F",
+          "x": 4.75,
+          "y": 2
+        },
+        {
+          "label": "G",
+          "x": 5.75,
+          "y": 2
+        },
+        {
+          "label": "H",
+          "x": 6.75,
+          "y": 2
+        },
+        {
+          "label": "J",
+          "x": 7.75,
+          "y": 2
+        },
+        {
+          "label": "K",
+          "x": 8.75,
+          "y": 2
+        },
+        {
+          "label": "L",
+          "x": 9.75,
+          "y": 2
+        },
+        {
+          "label": ":",
+          "x": 10.75,
+          "y": 2
+        },
+        {
+          "label": "\"",
+          "x": 11.75,
+          "y": 2
+        },
+        {
+          "label": "|",
+          "x": 12.75,
+          "y": 2
+        },
+        {
+          "label": "Enter",
+          "x": 13.75,
+          "y": 1,
+          "w": 1.25,
+          "h": 2
+        },
+        {
+          "label": "Page down",
+          "x": 15,
+          "y": 2
+        },
+        {
+          "label": "Shift",
+          "x": 0,
+          "y": 3,
+          "w": 1.25
+        },
+        {
+          "label": "Win",
+          "x": 1.25,
+          "y": 3
+        },
+        {
+          "label": "Z",
+          "x": 2.25,
+          "y": 3
+        },
+        {
+          "label": "X",
+          "x": 3.25,
+          "y": 3
+        },
+        {
+          "label": "C",
+          "x": 4.25,
+          "y": 3
+        },
+        {
+          "label": "V",
+          "x": 5.25,
+          "y": 3
+        },
+        {
+          "label": "B",
+          "x": 6.25,
+          "y": 3
+        },
+        {
+          "label": "N",
+          "x": 7.25,
+          "y": 3
+        },
+        {
+          "label": "M",
+          "x": 8.25,
+          "y": 3
+        },
+        {
+          "label": "<",
+          "x": 9.25,
+          "y": 3
+        },
+        {
+          "label": ">",
+          "x": 10.25,
+          "y": 3
+        },
+        {
+          "label": "?",
+          "x": 11.25,
+          "y": 3
+        },
+        {
+          "label": "Shift",
+          "x": 12.25,
+          "y": 3,
+          "w": 1.75
+        },
+        {
+          "label": "&rarr;",
+          "x": 14,
+          "y": 3
+        },
+        {
+          "label": "End",
+          "x": 15,
+          "y": 3
+        },
+        {
+          "label": "Ctrl",
+          "x": 0,
+          "y": 4,
+          "w": 1.5
+        },
+        {
+          "label": "Win",
+          "x": 1.5,
+          "y": 4
+        },
+        {
+          "label": "Alt",
+          "x": 2.5,
+          "y": 4,
+          "w": 1.5
+        },
+        {
+          "x": 4,
+          "y": 4,
+          "w": 7
+        },
+        {
+          "label": "Fn",
+          "x": 11,
+          "y": 4,
+          "w": 1.5
+        },
+        {
+          "label": "&larr;",
           "x": 13,
           "y": 4
         },
         {
-          "label": "Down",
+          "label": "&darr;",
           "x": 14,
           "y": 4
         },
         {
-          "label": "Right",
+          "label": "&rarr;",
           "x": 15,
           "y": 4
         }
diff --git a/keyboards/matrix/noah/keymaps/iso/keymap.c b/keyboards/matrix/noah/keymaps/iso/keymap.c
new file mode 100644
index 000000000..990c4dd7a
--- /dev/null
+++ b/keyboards/matrix/noah/keymaps/iso/keymap.c
@@ -0,0 +1,20 @@
+/**
+ * keymap.c
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso(
+        KC_ESC,     KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,    KC_8,   KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_PSCR,
+        KC_TAB,     KC_Q,     KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,    KC_I,   KC_O,    KC_P, KC_LBRC, KC_RBRC,          KC_PGUP,
+        KC_LCTRL,   KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,    KC_K,   KC_L, KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT, KC_PGDN,
+        KC_LSFT, KC_LGUI,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N,    KC_M,KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_END,
+        KC_CAPS, KC_LGUI,  KC_LALT,                       KC_SPC,                    MO(1),          KC_LEFT, KC_DOWN,KC_RIGHT),
+    [1] = LAYOUT_iso(
+         KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, _______,
+          RESET, RGB_TOG, RGB_MOD, _______,  KC_F13,  KC_F14,  KC_F24, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______,                   _______, _______, _______),
+};
diff --git a/keyboards/matrix/noah/keymaps/wkl/keymap.c b/keyboards/matrix/noah/keymaps/wkl/keymap.c
new file mode 100644
index 000000000..049658244
--- /dev/null
+++ b/keyboards/matrix/noah/keymaps/wkl/keymap.c
@@ -0,0 +1,20 @@
+/**
+ * keymap.c
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_wkl(
+        KC_ESC,     KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,    KC_8,   KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSLS, KC_GRV, KC_PSCR,
+        KC_TAB,     KC_Q,     KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,    KC_I,   KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
+        KC_LCTRL,   KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,    KC_K,   KC_L, KC_SCLN, KC_QUOT,  KC_ENT, KC_PGDN,
+        KC_LSFT,    KC_Z,     KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_END,
+        KC_CAPS, KC_LGUI,  KC_LALT,                 KC_SPC,                         MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
+    [1] = LAYOUT_wkl(
+        KC_BSLS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, _______, _______,
+          RESET, RGB_TOG, RGB_MOD, _______,  KC_F13,  KC_F14,  KC_F24, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______,          _______, _______, _______),
+};
\ No newline at end of file
diff --git a/keyboards/matrix/noah/noah.h b/keyboards/matrix/noah/noah.h
index 1efb991d9..5d0da798d 100644
--- a/keyboards/matrix/noah/noah.h
+++ b/keyboards/matrix/noah/noah.h
@@ -35,14 +35,14 @@
 }
 
 #define LAYOUT_iso( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
 	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
 	k40, k41, k42, k43,      k45, k46, k47, k48 \
 ) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO}, \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,KC_NO, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,KC_NO, KC_NO}, \
     {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO}, \
     {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
     {k40, k41, k42,KC_NO,k43,KC_NO,KC_NO, k45, k46, k47, k48, k1e, k2e, k3e, k0f}  \
@@ -61,31 +61,3 @@
     {k30,KC_NO,k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
     {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k1e, k2e, k3e, k0f}  \
 }
-
-#define LAYOUT_wkl_splitspace( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-	k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42, k43,      k45, k46, k47, k48, k49, k4a \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,KC_NO,k2d, KC_NO}, \
-    {k30,KC_NO,k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42, k43, k45,KC_NO,k46, k47, k48, k49, k4a, k1e, k2e, k3e, k0f}  \
-}
-
-#define LAYOUT_iso_splitspace( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42, k43,      k45, k46, k47, k48, k49, k4a \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42, k43, k45,KC_NO,k46, k47, k48, k49, k4a, k1e, k2e, k3e, k0f}  \
-}