Merge upstream master to 2022 Q4 breaking change

20 files changed, 0 insertions, 1088 deletions

diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
deleted file mode 100644
index e732f28855..0000000000
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ /dev/null
@@ -1,441 +0,0 @@
-{
-  "manufacturer": "Clueboard",
-  "keyboard_name": "Clueboard 2x1800 2018",
-  "maintainer": "skullydazed",
-  "processor": "at90usb1286",
-  "bootloader": "halfkay",
-  "debounce": 5,
-  "diode_direction": "ROW2COL",
-  "features": {
-    "audio": true,
-    "bootmagic": false,
-    "command": false,
-    "console": true,
-    "extrakey": true,
-    "midi": false,
-    "mousekey": true,
-    "nkro": true,
-    "rgblight": true,
-    "unicode": false
-  },
-  "indicators": {
-    "num_lock": "B4",
-    "caps_lock": "B5",
-    "scroll_lock": "B6"
-  },
-  "matrix_pins": {
-    "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"],
-    "rows": ["C0", "C1", "C2", "C3", "C7", "F7", "B1", "F2", "F3", "F4", "F5", "F6"]
-  },
-  "rgblight": {
-    "animations": {
-      "alternating": true,
-      "breathing": true,
-      "christmas": true,
-      "knight": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "rgb_test": true,
-      "snake": true,
-      "static_gradient": true,
-      "twinkle": true
-    },
-    "brightness_steps": 8,
-    "hue_steps": 8,
-    "led_count": 16,
-    "pin": "C6",
-    "saturation_steps": 8
-  },
-  "usb": {
-    "pid": "0x23A0"
-  },
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_all"
-  },
-  "layouts": {
-    "LAYOUT_4u_space": {
-      "layout": [
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
-        { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
-        { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
-        { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
-        { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
-        { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
-        { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 },
-        { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 },
-        { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 },
-        { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 },
-        { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 },
-        { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 },
-        { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 },
-        { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 },
-        { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 },
-        { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 },
-        { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 },
-        { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 },
-        { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 },
-        { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 },
-        { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 },
-        { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 },
-        { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 },
-        { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-        { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 },
-        { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 },
-        { "matrix": [5, 5], "w": 1, "x": 8.5, "y": 5.25 },
-        { "matrix": [5, 6], "w": 4, "x": 9.5, "y": 5.25 },
-        { "matrix": [5, 7], "w": 1, "x": 13.5, "y": 5.25 },
-        { "matrix": [5, 8], "w": 1, "x": 14.5, "y": 5.25 },
-        { "matrix": [11, 0], "w": 1, "x": 15.5, "y": 5.25 },
-        { "matrix": [11, 2], "w": 1, "x": 16.5, "y": 5.25 },
-        { "matrix": [11, 3], "w": 1, "x": 21, "y": 5.25 },
-        { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 },
-        { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 },
-        { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 },
-        { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 },
-        { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 },
-        { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 },
-        { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 }
-      ]
-    },
-    "LAYOUT_7u_space": {
-      "layout": [
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
-        { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
-        { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
-        { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
-        { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
-        { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
-        { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 },
-        { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 },
-        { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 },
-        { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 },
-        { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 },
-        { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 },
-        { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 },
-        { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 },
-        { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 },
-        { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 },
-        { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 },
-        { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 },
-        { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 },
-        { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 },
-        { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 },
-        { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 },
-        { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 },
-        { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-        { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 },
-        { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 },
-        { "matrix": [5, 5], "w": 7, "x": 8.5, "y": 5.25 },
-        { "matrix": [5, 6], "w": 1, "x": 15.5, "y": 5.25 },
-        { "matrix": [5, 7], "w": 1, "x": 16.5, "y": 5.25 },
-        { "matrix": [11, 0], "w": 1, "x": 21, "y": 5.25 },
-        { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 },
-        { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 },
-        { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 },
-        { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 },
-        { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 },
-        { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 },
-        { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 }
-      ]
-    },
-    "LAYOUT_all": {
-      "layout": [
-        { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "PgUp", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "PgDn", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "Esc", "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-        { "label": "F1", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-        { "label": "F2", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-        { "label": "F3", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-        { "label": "F4", "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-        { "label": "F5", "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-        { "label": "F6", "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-        { "label": "F7", "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-        { "label": "F8", "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-        { "label": "F9", "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-        { "label": "F10", "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-        { "label": "F11", "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-        { "label": "F12", "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-        { "label": "PrtSc", "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-        { "label": "Scroll Lock", "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-        { "label": "Pause", "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-        { "label": "Insert", "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-        { "label": "-", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-        { "label": "Num Lock", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-        { "label": "/", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-        { "label": "*", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-        { "label": "~", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-        { "label": "!", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-        { "label": "@", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-        { "label": "#", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-        { "label": "$", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-        { "label": "%", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-        { "label": "^", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-        { "label": "&", "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-        { "label": "*", "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-        { "label": "(", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-        { "label": ")", "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-        { "label": "_", "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-        { "label": "+", "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
-        { "label": "Backspace", "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-        { "label": "Num Lock", "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-        { "label": "/", "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-        { "label": "*", "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-        { "label": "-", "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-        { "h": 2, "label": "+", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-        { "label": "7", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-        { "label": "8", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-        { "label": "9", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
-        { "label": "Tab", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-        { "label": "Q", "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-        { "label": "W", "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-        { "label": "E", "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-        { "label": "R", "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-        { "label": "T", "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-        { "label": "Y", "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-        { "label": "U", "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-        { "label": "I", "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-        { "label": "O", "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-        { "label": "P", "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-        { "label": "{", "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-        { "label": "}", "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
-        { "label": "|", "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-        { "label": "7", "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-        { "label": "8", "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-        { "label": "9", "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-        { "h": 2, "label": "+", "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-        { "label": "4", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-        { "label": "5", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-        { "label": "6", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
-        { "label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-        { "label": "A", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-        { "label": "S", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-        { "label": "D", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-        { "label": "F", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-        { "label": "G", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-        { "label": "H", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-        { "label": "J", "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-        { "label": "K", "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-        { "label": "L", "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-        { "label": ":", "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-        { "label": "\"", "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
-        { "label": "Enter", "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-        { "label": "4", "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-        { "label": "5", "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-        { "label": "6", "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-        { "h": 2, "label": "Enter", "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-        { "label": "1", "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-        { "label": "2", "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-        { "label": "3", "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
-        { "label": "\\u2191", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 },
-        { "label": "Shift", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.25 },
-        { "label": "Z", "matrix": [4, 6], "w": 1, "x": 6.75, "y": 4.25 },
-        { "label": "X", "matrix": [4, 7], "w": 1, "x": 7.75, "y": 4.25 },
-        { "label": "C", "matrix": [4, 8], "w": 1, "x": 8.75, "y": 4.25 },
-        { "label": "V", "matrix": [4, 9], "w": 1, "x": 9.75, "y": 4.25 },
-        { "label": "B", "matrix": [4, 10], "w": 1, "x": 10.75, "y": 4.25 },
-        { "label": "N", "matrix": [10, 0], "w": 1, "x": 11.75, "y": 4.25 },
-        { "label": "M", "matrix": [10, 1], "w": 1, "x": 12.75, "y": 4.25 },
-        { "label": "<", "matrix": [10, 2], "w": 1, "x": 13.75, "y": 4.25 },
-        { "label": ">", "matrix": [10, 3], "w": 1, "x": 14.75, "y": 4.25 },
-        { "label": "?", "matrix": [10, 4], "w": 1, "x": 15.75, "y": 4.25 },
-        { "label": "Shift", "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 4.25 },
-        { "label": "\\u2191", "matrix": [9, 6], "w": 1, "x": 18.75, "y": 4.5 },
-        { "label": "1", "matrix": [10, 7], "w": 1, "x": 20, "y": 4.25 },
-        { "label": "2", "matrix": [10, 8], "w": 1, "x": 21, "y": 4.25 },
-        { "label": "3", "matrix": [10, 9], "w": 1, "x": 22, "y": 4.25 },
-        { "h": 2, "label": "Enter", "matrix": [10, 10], "w": 1, "x": 23, "y": 4.25 },
-        { "label": "0", "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-        { "label": ".", "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-        { "label": "\\u2190", "matrix": [5, 3], "w": 1, "x": 3.25, "y": 5.5 },
-        { "label": "\\u2193", "matrix": [5, 4], "w": 1, "x": 4.25, "y": 5.5 },
-        { "label": "\\u2192", "matrix": [5, 5], "w": 1, "x": 5.25, "y": 5.5 },
-        { "label": "Ctrl", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 5.25 },
-        { "label": "Win", "matrix": [5, 7], "w": 1, "x": 7.5, "y": 5.25 },
-        { "label": "Alt", "matrix": [5, 8], "w": 1, "x": 8.5, "y": 5.25 },
-        { "label": "1u", "matrix": [5, 9], "w": 1, "x": 9.5, "y": 5.25 },
-        { "label": "1u", "matrix": [5, 10], "w": 1, "x": 10.5, "y": 5.25 },
-        { "label": "1u", "matrix": [11, 0], "w": 1, "x": 11.5, "y": 5.25 },
-        { "label": "1u", "matrix": [11, 1], "w": 1, "x": 12.5, "y": 5.25 },
-        { "label": "Alt", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 5.25 },
-        { "label": "Win", "matrix": [11, 3], "w": 1, "x": 14.5, "y": 5.25 },
-        { "label": "Menu", "matrix": [11, 4], "w": 1, "x": 15.5, "y": 5.25 },
-        { "label": "Ctrl", "matrix": [11, 5], "w": 1, "x": 16.5, "y": 5.25 },
-        { "label": "\\u2190", "matrix": [10, 6], "w": 1, "x": 17.75, "y": 5.5 },
-        { "label": "\\u2193", "matrix": [11, 6], "w": 1, "x": 18.75, "y": 5.5 },
-        { "label": "\\u2192", "matrix": [11, 7], "w": 1, "x": 19.75, "y": 5.5 },
-        { "label": "0", "matrix": [11, 8], "w": 1, "x": 21, "y": 5.25 },
-        { "label": ".", "matrix": [11, 9], "w": 1, "x": 22, "y": 5.25 }
-      ]
-    }
-  }
-}
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json
deleted file mode 100644
index 1898ec419f..0000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "keyboard":"clueboard/2x1800/2018",
-    "keymap":"default",
-    "layout":"LAYOUT",
-    "layers":[
-        ["KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","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_PSCR","KC_SCRL","KC_PAUS","KC_INS","KC_PMNS","KC_NUM","KC_PSLS","KC_PAST","KC_GRV","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_NUM","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","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_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","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_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"]
-    ],
-    "author":"skullydazed",
-    "notes":"",
-    "version":1
-}
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c
deleted file mode 100644
index 3969e1058b..0000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@gmail.com>
- *
- * 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_4u_space(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    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_PSCR, KC_SCRL, KC_PAUS, KC_INS,
-
-      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-      KC_PPLS, KC_P7,   KC_P8,   KC_P9,        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_P7, KC_P8, KC_P9, KC_PSLS,
-               KC_P4,   KC_P5,   KC_P6,        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_P4, KC_P5, KC_P6,
-      KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  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_P1, KC_P2, KC_P3, KC_PENT,
-               KC_P0,   KC_PDOT,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,         KC_RALT, KC_RGUI, KC_APP, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0, KC_PDOT
-)
-};
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c
deleted file mode 100644
index 12995faee7..0000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@gmail.com>
- *
- * 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_7u_space(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    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_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
-
-      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-      KC_PPLS, KC_P7,   KC_P8,   KC_P9,        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_P7, KC_P8, KC_P9, KC_PSLS,
-               KC_P4,   KC_P5,   KC_P6,        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_P4, KC_P5, KC_P6,
-      KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  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_P1, KC_P2, KC_P3, KC_PENT,
-               KC_P0,   KC_PDOT,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_LCTL, KC_LALT,                  KC_SPC,                                  KC_LGUI, KC_APP,   KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0, KC_PDOT
-)
-};
-
-
-#ifdef AUDIO_ENABLE
-  float song_one_up[][2] = SONG(ONE_UP_SOUND);
-#endif
-
-volatile uint8_t runonce = true;
-static uint16_t my_timer;
-
-void matrix_init_user(void) {
-  my_timer = timer_read();
-}
-
-void matrix_scan_user(void) {
-  if (runonce && timer_elapsed(my_timer) > 500) {
-    runonce = false;
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(song_one_up);
-#endif
-  }
-}
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
deleted file mode 100644
index bc54d9da4a..0000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@gmail.com>
- *
- * 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 custom_keycodes {
-    MACRO01 = SAFE_RANGE,
-    MACRO02,
-    MACRO03,
-    MACRO04,
-    MACRO05,
-    MACRO06,
-    MACRO07,
-    MACRO08,
-    MACRO09,
-    MACRO10,
-    MACRO11,
-    MACRO12,
-    MACRO13,
-    MACRO14,
-    MACRO15,
-    MACRO16,
-    MACRO17,
-    MACRO18,
-    MACRO19,
-    MACRO20,
-    MACRO21,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT(
-      MACRO01, MACRO02, MACRO03, MACRO04,       KC_ESC,    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_PSCR, KC_SCRL, KC_PAUS, KC_INS,
-
-      MACRO05, MACRO06, MACRO07, MACRO08,      KC_GRV,  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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-      MACRO09, MACRO10, MACRO11, MACRO12,      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_P7, KC_P8, KC_P9, KC_PSLS,
-               MACRO13, MACRO14, MACRO15,      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_P4, KC_P5, KC_P6,
-      MACRO16, MACRO17, MACRO18, MACRO19,   KC_UP,  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_P1, KC_P2, KC_P3, KC_PENT,
-               MACRO20, MACRO21,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0, KC_PDOT
-)
-};
-