KBDfans KBD66 Layout Additions and Refactor (#20693)

* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_66_ansi_split_space

* add LAYOUT_66_iso_split_space

* refactor default keymap

- use four-space indent
- use QMK-native keycode aliases directly
- use `enum` statement for layer names
- grid-align keycodes

* refactor ansi keymap

- use four-space indent
- use QMK-native keycode aliases directly
- use `enum` statement for layer names
- grid-align keycodes

* refactor iso keymap

- use four-space indent
- use QMK-native keycode aliases directly
- use `enum` statement for layer names
- grid-align keycodes

* change layout macro for ansi keymap

Refactors the `ansi` keymap to use the `LAYOUT_66_ansi_split_space` macro, and renames the keymap to `default_ansi_split_space`.

* change layout macro for iso keymap

Refactors the `iso` keymap to use the `LAYOUT_66_iso_split_space` macro, and renames the keymap to `default_iso_split_space`.

* add LAYOUT_66_ansi

The column for the spacebar key may be wrong; I was unable to find high-resolution images of the PCB.

* add LAYOUT_66_iso

The column for the spacebar key may be wrong; I was unable to find high-resolution images of the PCB.

* enable Community Layout support

9 files changed, 622 insertions, 274 deletions

diff --git a/keyboards/kbdfans/kbd66/info.json b/keyboards/kbdfans/kbd66/info.json
index abe948ed99..3b72b8de67 100644
--- a/keyboards/kbdfans/kbd66/info.json
+++ b/keyboards/kbdfans/kbd66/info.json
@@ -1,104 +1,416 @@
 {
-  "keyboard_name": "KBD66",
-  "manufacturer": "KBDfans",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xBD66",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["C6", "C7", "E2", "F5", "F6", "F4", "D3", "D2", "D5", "D0", "D1", "B4", "D7", "D6", "E6", "B3"],
-    "rows": ["B0", "B1", "F0", "F1", "D4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B6",
-    "breathing": true
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 15.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-        {"matrix": [3, 1], "x": 1.25, "y": 3},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
-        {"matrix": [3, 13], "x": 13.5, "y": 3},
-        {"matrix": [3, 14], "x": 14.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
-        {"matrix": [4, 8], "x": 6.75, "y": 4, "w": 2.75},
-        {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.5, "y": 4},
-        {"matrix": [4, 14], "x": 14.5, "y": 4},
-        {"matrix": [4, 15], "x": 15.5, "y": 4}
-      ]
+    "keyboard_name": "KBD66",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xBD66",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "E2", "F5", "F6", "F4", "D3", "D2", "D5", "D0", "D1", "B4", "D7", "D6", "E6", "B3"],
+        "rows": ["B0", "B1", "F0", "F1", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": [
+        "66_ansi",
+        "66_iso"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "`", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+                {"label": "Fn", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+                {"label": "Space", "matrix": [4, 8], "x": 6.75, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_ansi_split_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+                {"label": "Space", "matrix": [4, 8], "x": 6.75, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_iso_split_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+                {"label": "Space", "matrix": [4, 8], "x": 6.75, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
deleted file mode 100644
index 2b4f033f16..0000000000
--- a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2018 Alex Peters
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#define _____ KC_TRNS
-#define XXXXX KC_NO
-#define _L0 0
-#define _L1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer 0
-     * ,-----------------------------------------------------------.   ,---.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| BckSp |   |INS|
-     * |-----------------------------------------------------------|   |---|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|   |DEL|
-     * |-----------------------------------------------------------|   `---'
-     * |Cap  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Enter  |
-     * |---------------------------------------------------------------.
-     * |  Shift |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|   Shift  | UP|
-     * |-------------------------------------------------------------------.
-     * |Ctl |OS  |Alt |         Space           |Alt | Fn |Ctl |LFT|DWN|RIG|
-     * `-------------------------------------------------------------------'
-     */
-[_L0] = LAYOUT_all(
-  QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXXX, KC_BSPC,        KC_INS,
-  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_BSLS,           KC_DEL,
-  KC_CAPS,     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_LSFT, XXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXX, KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC, KC_SPC,               KC_RALT, MO(_L1), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------.   ,---.
-     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       |   |HOM|
-     * |-----------------------------------------------------------|   |---|
-     * |     |   |   |   |   |   |   |   |   |   |PSc|VDn|VUp| Mute|   |END|
-     * |-----------------------------------------------------------|   `---'
-     * |QK_BOOT|   |   |   |   |   |   |PRV|PLY|NXT|STP|   |         |
-     * |---------------------------------------------------------------.
-     * |        |   |   |   |   |   |   |   |BLB|BLC|Slp|          |PUp|
-     * |-------------------------------------------------------------------.
-     * |    |    |    |                         |    |    |    |   |PDn|SLk|
-     * `-------------------------------------------------------------------'
-     */
-[_L1] = LAYOUT_all(
-  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, _____, _____,     KC_HOME,
-  _____,  _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,       KC_END,
-  QK_BOOT,  _____, _____, _____, _____, _____, _____, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _____, _____,
-  _____, _____, _____, _____, _____, _____, _____, _____, _____, BL_BRTG, BL_STEP, KC_SLEP, _____, _____, KC_PGUP,
-  _____, _____, _____,                     _____, _____,                      _____, _____, _____, _____, KC_PGDN, KC_SCRL
-)
-
-};
diff --git a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
index 0bfab45536..138fe1cbe6 100644
--- a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
@@ -15,53 +15,53 @@
  */
 #include QMK_KEYBOARD_H
 
-#define _____ KC_TRNS
-#define XXXXX KC_NO
-#define _L0 0
-#define _L1 1
+enum layer_names {
+    _L0,
+    _L1
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Layer 0
-     * ,-----------------------------------------------------------.   ,---.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  `| BS|   |INS|
-     * |-----------------------------------------------------------|   |---|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|   |DEL|
-     * |-----------------------------------------------------------|   `---'
+     * ,-----------------------------------------------------------. ,---.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  `| BS| |INS|
+     * |-----------------------------------------------------------| |---|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |DEL|
+     * |-----------------------------------------------------------| `---'
      * |Cap  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Enter  |
-     * |---------------------------------------------------------------.
-     * |Shft|  `|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shft |Fn | UP|
-     * |-------------------------------------------------------------------.
-     * |Ctl |OS  |Alt |         Space           |Alt | Fn |Ctl |LFT|DWN|RIG|
-     * `-------------------------------------------------------------------'
+     * |-------------------------------------------------------------.
+     * |Shft|  `|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shft| Fn| UP|
+     * |-----------------------------------------------------------------.
+     * |Ctl |OS  |Alt |         Space          | Alt| Fn| Ctl|LFT|DWN|RIG|
+     * `-----------------------------------------------------------------'
      */
-[_L0] = LAYOUT_all(
-  QK_GESC, 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_GRV, KC_BSPC,            KC_INS,
-  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_BSLS,               KC_DEL,
-  KC_CAPS,     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_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_L1), KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC, KC_SPC,               KC_RALT, MO(_L1), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-),
+    [_L0] = LAYOUT_all(
+        QK_GESC, 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_GRV,  KC_BSPC, KC_INS,
+        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_BSLS,          KC_DEL,
+        KC_CAPS, 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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_L1), KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
     /* Layer 1
-     * ,-----------------------------------------------------------.   ,---.
-     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |   |   |HOM|
-     * |-----------------------------------------------------------|   |---|
-     * |     |   |   |   |   |   |   |   |   |   |PSc|VDn|VUp| Mute|   |END|
-     * |-----------------------------------------------------------|   `---'
-     * |QK_BOOT|   |   |   |   |   |   |PRV|PLY|NXT|STP|   |         |
-     * |---------------------------------------------------------------.
-     * |    |   |   |   |   |   |   |   |   |BLB|BLC|Slp|      |   |PUp|
-     * |-------------------------------------------------------------------.
-     * |    |    |    |                         |    |    |    |   |PDn|SLk|
-     * `-------------------------------------------------------------------'
+     * ,-----------------------------------------------------------. ,---.
+     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |   | |HOM|
+     * |-----------------------------------------------------------| |---|
+     * |     |   |   |   |   |   |   |   |   |   |PSc|VDn|VUp| Mute| |END|
+     * |-----------------------------------------------------------| `---'
+     * |Reset |   |   |   |   |   |   |PRV|PLY|NXT|STP|   |        |
+     * |-------------------------------------------------------------.
+     * |    |   |   |   |   |   |   |   |   |BLB|BLC|Slp|    |   |PUp|
+     * |-----------------------------------------------------------------.
+     * |    |    |    |                        |    |   |    |   |PDn|SLk|
+     * `-----------------------------------------------------------------'
      */
-[_L1] = LAYOUT_all(
-  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, _____, _____,  KC_HOME,
-  _____,  _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,    KC_END,
-  QK_BOOT,  _____, _____, _____, _____, _____, _____, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _____, _____,
-  _____, _____, _____, _____, _____, _____, _____, _____, _____, BL_BRTG, BL_STEP, KC_SLEP, _____, _____, KC_PGUP,
-  _____, _____, _____,                     _____, _____,                   _____, _____, _____, _____, KC_PGDN, KC_SCRL
-)
+    [_L1] = LAYOUT_all(
+        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,  _______, _______, KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,          KC_END,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_STEP, KC_SLEP, _______, _______, KC_PGUP,
+        _______, _______, _______,                   _______,          _______,                   _______, _______, _______, _______, KC_PGDN, KC_SCRL
+    )
 
 };
diff --git a/keyboards/kbdfans/kbd66/keymaps/default_ansi_split_space/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default_ansi_split_space/keymap.c
new file mode 100644
index 0000000000..8751d015ad
--- /dev/null
+++ b/keyboards/kbdfans/kbd66/keymaps/default_ansi_split_space/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2018 Alex Peters
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _L0,
+    _L1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Layer 0
+     * ,-----------------------------------------------------------. ,---.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| BckSp | |INS|
+     * |-----------------------------------------------------------| |---|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |DEL|
+     * |-----------------------------------------------------------| `---'
+     * |Cap   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Enter |
+     * |-------------------------------------------------------------.
+     * |  Shift |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift | UP|
+     * |-----------------------------------------------------------------.
+     * |Ctl |OS  |Alt |         Space          | Alt| Fn| Ctl|LFT|DWN|RIG|
+     * `-----------------------------------------------------------------'
+     */
+    [_L0] = LAYOUT_66_ansi_split_space(
+        QK_GESC, 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_INS,
+        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_BSLS,          KC_DEL,
+        KC_CAPS, 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_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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Layer 1
+     * ,-----------------------------------------------------------. ,---.
+     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       | |HOM|
+     * |-----------------------------------------------------------| |---|
+     * |     |   |   |   |   |   |   |   |   |   |PSc|VDn|VUp| Mute| |END|
+     * |-----------------------------------------------------------| `---'
+     * |Reset |   |   |   |   |   |   |PRV|PLY|NXT|STP|   |        |
+     * |-------------------------------------------------------------.
+     * |        |   |   |   |   |   |   |   |BLB|BLC|Slp|        |PUp|
+     * |-----------------------------------------------------------------.
+     * |    |    |    |                        |    |   |    |   |PDn|SLk|
+     * `-----------------------------------------------------------------'
+     */
+    [_L1] = LAYOUT_66_ansi_split_space(
+        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,  _______,          KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,          KC_END,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_STEP, KC_SLEP, _______,          KC_PGUP,
+        _______, _______, _______,                   _______,          _______,                   _______, _______, _______, _______, KC_PGDN, KC_SCRL
+    )
+
+};
diff --git a/keyboards/kbdfans/kbd66/keymaps/ansi/readme.md b/keyboards/kbdfans/kbd66/keymaps/default_ansi_split_space/readme.md
index 6ad0d85e08..6ad0d85e08 100644
--- a/keyboards/kbdfans/kbd66/keymaps/ansi/readme.md
+++ b/keyboards/kbdfans/kbd66/keymaps/default_ansi_split_space/readme.md
diff --git a/keyboards/kbdfans/kbd66/keymaps/default_iso_split_space/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default_iso_split_space/keymap.c
new file mode 100644
index 0000000000..f55a4b81cb
--- /dev/null
+++ b/keyboards/kbdfans/kbd66/keymaps/default_iso_split_space/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2018 Alex Peters
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _L0,
+    _L1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Layer 0
+     * ,-----------------------------------------------------------. ,---.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| BckSp | |INS|
+     * |-----------------------------------------------------------| |---|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     | |DEL|
+     * |------------------------------------------------------.Ent | `---'
+     * |Cap   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|    |
+     * |-------------------------------------------------------------.
+     * |Shft|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift | UP|
+     * |-----------------------------------------------------------------.
+     * |Ctl |OS  |Alt |         Space          | Alt| Fn| Ctl|LFT|DWN|RIG|
+     * `-----------------------------------------------------------------'
+     */
+    [_L0] = LAYOUT_66_iso_split_space(
+        QK_GESC, 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_INS,
+        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_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Layer 1
+     * ,-----------------------------------------------------------. ,---.
+     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       | |HOM|
+     * |-----------------------------------------------------------| |---|
+     * |     |   |   |   |   |   |   |   |   |   |PSc|VDn|VUp|     | |END|
+     * |------------------------------------------------------.    | `---'
+     * |Reset |   |   |   |   |   |   |PRV|PLY|NXT|STP|   |Mut|    |
+     * |-------------------------------------------------------------.
+     * |    |   |   |   |   |   |   |   |   |BLB|BLC|Slp|        |PUp|
+     * |-----------------------------------------------------------------.
+     * |    |    |    |                        |    |   |    |   |PDn|SLk|
+     * `-----------------------------------------------------------------'
+     */
+    [_L1] = LAYOUT_66_iso_split_space(
+        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,  _______,          KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_VOLD, KC_VOLU,                   KC_END,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, KC_MUTE, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_STEP, KC_SLEP, _______,          KC_PGUP,
+        _______, _______, _______,                   _______,          _______,                   _______, _______, _______, _______, KC_PGDN, KC_SCRL
+    )
+
+};
diff --git a/keyboards/kbdfans/kbd66/keymaps/iso/readme.md b/keyboards/kbdfans/kbd66/keymaps/default_iso_split_space/readme.md
index f325b741cc..f325b741cc 100644
--- a/keyboards/kbdfans/kbd66/keymaps/iso/readme.md
+++ b/keyboards/kbdfans/kbd66/keymaps/default_iso_split_space/readme.md
diff --git a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
deleted file mode 100644
index 4b11bfdb07..0000000000
--- a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2018 Alex Peters
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#define _____ KC_TRNS
-#define XXXXX KC_NO
-#define _L0 0
-#define _L1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer 0
-     * ,-----------------------------------------------------------.   ,---.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| BckSp |   |INS|
-     * |-----------------------------------------------------------|   |---|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |   |DEL|
-     * |------------------------------------------------------|Ent |   `---'
-     * |Cap   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|    |
-     * |---------------------------------------------------------------.
-     * |Shft|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shft |Fn | UP|
-     * |-------------------------------------------------------------------.
-     * |Ctl |OS  |Alt |         Space           |Alt | Fn |Ctl |LFT|DWN|RIG|
-     * `-------------------------------------------------------------------'
-     */
-[_L0] = LAYOUT_all(
-  QK_GESC, 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_GRV, KC_BSPC,            KC_INS,
-  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_NUHS,               KC_DEL,
-  KC_CAPS,     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_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_L1), KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC, KC_SPC,               KC_RALT, MO(_L1), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------.   ,---.
-     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |   |   |HOM|
-     * |-----------------------------------------------------------|   |---|
-     * |     |   |   |   |   |   |   |   |   |   |PSc|VDn|VUp|     |   |END|
-     * |------------------------------------------------------|    |   `---'
-     * |QK_BOOT |   |   |   |   |   |   |PRV|PLY|NXT|STP|   |Mut|    |
-     * |---------------------------------------------------------------.
-     * |    |   |   |   |   |   |   |   |   |BLB|BLC|Slp|      |   |PUp|
-     * |-------------------------------------------------------------------.
-     * |    |    |    |                         |    |    |    |   |PDn|SLk|
-     * `-------------------------------------------------------------------'
-     */
-[_L1] = LAYOUT_all(
-  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, _____, _____,  KC_HOME,
-  _____,  _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,    KC_END,
-  QK_BOOT,  _____, _____, _____, _____, _____, _____, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _____, _____,
-  _____, _____, _____, _____, _____, _____, _____, _____, _____, BL_BRTG, BL_STEP, KC_SLEP, _____, _____, KC_PGUP,
-  _____, _____, _____,                     _____, _____,                   _____, _____, _____, _____, KC_PGDN, KC_SCRL
-)
-
-};
diff --git a/keyboards/kbdfans/kbd66/matrix_diagram.md b/keyboards/kbdfans/kbd66/matrix_diagram.md
new file mode 100644
index 0000000000..1bfc36a9fe
--- /dev/null
+++ b/keyboards/kbdfans/kbd66/matrix_diagram.md
@@ -0,0 +1,36 @@
+# Matrix Diagram for KBDfans KBD66
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤        ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │ │1F │        │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┘     ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │           │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┬─┴─┐       ┌─┴───┴──┬─┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C  │3D │3E │       │3C      │ 2.25u RShift
+├────┼───┴┬──┴──┬┴───┴───┴─┬─┴───┴───┴┬──┴──┬┴───┼────┼───┼───┼───┐   └────────┘
+│40  │41  │42   │45        │48        │4A   │4B  │4C  │4D │4E │4F │
+└────┴────┴─────┴──────────┴──────────┴─────┴────┴────┴───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬────┬────┬──────────┬──────────┬────┬────┬─────┐
+│40   │41  │42  │45        │48        │4A  │4B  │4C   │ 1.5u/1.25u/1.25u/2.75u/2.75u/1.25u/1.25u/1.5u
+└─────┴────┴────┴──────────┴──────────┴────┴────┴─────┘
+┌────┬────┬────┬────────────────────────┬────┬───┬────┐
+│40  │41  │42  │??                      │4A  │4B │4C  │ 1.25u/1.25u/1.25u/6.25u/1.25u/1u/1.25u
+└────┴────┴────┴────────────────────────┴────┴───┴────┘
+┌────┬───┬────┬────────────────────────┬────┬────┬────┐
+│40  │41 │42  │??                      │4A  │4B  │4C  │ 1.25u/1u/1.25u/6.25u/1.25u/1.25u/1.25u
+└────┴───┴────┴────────────────────────┴────┴────┴────┘
+┌─────┬─────┬───────────────────────────┬───┬───┬─────┐
+│40   │41   │??                         │4A │4B │4C   │ 1.5u/1.5u/7u/1u/1u/1.5u
+└─────┴─────┴───────────────────────────┴───┴───┴─────┘
+┌─────┬───┬───┬───────────────────────────┬─────┬─────┐
+│40   │41 │42 │??                         │4B   │4C   │ 1.5u/1u/1u/7u/1.5u/1.5u
+└─────┴───┴───┴───────────────────────────┴─────┴─────┘
+```