Move single `LAYOUT`s to data driven (#20365)

15 files changed, 344 insertions, 524 deletions

diff --git a/keyboards/mechwild/bbs/bbs.c b/keyboards/mechwild/bbs/bbs.c
index 9a7253e5da..341103c1ab 100644
--- a/keyboards/mechwild/bbs/bbs.c
+++ b/keyboards/mechwild/bbs/bbs.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Kyle McCreery (@kylemccreery)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "bbs.h"
+#include "quantum.h"
 
 #ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) { 
diff --git a/keyboards/mechwild/bbs/bbs.h b/keyboards/mechwild/bbs/bbs.h
deleted file mode 100644
index 2088b68646..0000000000
--- a/keyboards/mechwild/bbs/bbs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,    k06, k07, k08, k09, k0A, k0B,\
-    k10, k11, k12, k13, k14, k15,    k16, k17, k18, k19, k1A, k1B,\
-                   k23, k24, k25,    k26, k27, k28                \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k16, k17, k18, k19, k1A, k1B }, \
-    { k26, k27, k28, k23, k24, k25 }  \
-}
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json
index bdc29e68ac..beafbac222 100644
--- a/keyboards/mechwild/bbs/info.json
+++ b/keyboards/mechwild/bbs/info.json
@@ -23,38 +23,41 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.375},
-                {"x":1, "y":0.375},
-                {"x":2, "y":0.125},
-                {"x":3, "y":0},
-                {"x":4, "y":0.125},
-                {"x":5, "y":0.125},
-                {"x":6.75, "y":0.125},
-                {"x":7.75, "y":0.125},
-                {"x":8.75, "y":0},
-                {"x":9.75, "y":0.125},
-                {"x":10.75, "y":0.375},
-                {"x":11.75, "y":0.375},
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.125},
 
-                {"x":0, "y":1.375},
-                {"x":1, "y":1.375},
-                {"x":2, "y":1.125},
-                {"x":3, "y":1},
-                {"x":4, "y":1.125},
-                {"x":5, "y":1.125},
-                {"x":6.75, "y":1.125},
-                {"x":7.75, "y":1.125},
-                {"x":8.75, "y":1},
-                {"x":9.75, "y":1.125},
-                {"x":10.75, "y":1.375},
-                {"x":11.75, "y":1.375},
+                {"matrix": [1, 0], "x": 6.75, "y": 0.125},
+                {"matrix": [1, 1], "x": 7.75, "y": 0.125},
+                {"matrix": [1, 2], "x": 8.75, "y": 0},
+                {"matrix": [1, 3], "x": 9.75, "y": 0.125},
+                {"matrix": [1, 4], "x": 10.75, "y": 0.375},
+                {"matrix": [1, 5], "x": 11.75, "y": 0.375},
 
-                {"x":2.75, "y":3.125, "h":1.5},
-                {"x":3.75, "y":3.125, "h":1.5},
-                {"x":4.75, "y":2.875, "h":1.5},
-                {"x":7, "y":2.875, "h":1.5},
-                {"x":8, "y":3.125, "h":1.5},
-                {"x":9, "y":3.125, "h":1.5}
+                {"matrix": [2, 0], "x": 0, "y": 1.375},
+                {"matrix": [2, 1], "x": 1, "y": 1.375},
+                {"matrix": [2, 2], "x": 2, "y": 1.125},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1.125},
+                {"matrix": [2, 5], "x": 5, "y": 1.125},
+
+                {"matrix": [3, 0], "x": 6.75, "y": 1.125},
+                {"matrix": [3, 1], "x": 7.75, "y": 1.125},
+                {"matrix": [3, 2], "x": 8.75, "y": 1},
+                {"matrix": [3, 3], "x": 9.75, "y": 1.125},
+                {"matrix": [3, 4], "x": 10.75, "y": 1.375},
+                {"matrix": [3, 5], "x": 11.75, "y": 1.375},
+
+                {"matrix": [4, 3], "x": 2.75, "y": 3.125, "h": 1.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 3.125, "h": 1.5},
+                {"matrix": [4, 5], "x": 4.75, "y": 2.875, "h": 1.5},
+
+                {"matrix": [4, 0], "x": 7, "y": 2.875, "h": 1.5},
+                {"matrix": [4, 1], "x": 8, "y": 3.125, "h": 1.5},
+                {"matrix": [4, 2], "x": 9, "y": 3.125, "h": 1.5}
             ]
         }
     }
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 2ef17fd3aa..5401c8898f 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -26,85 +26,93 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_mirrored": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_mirrored": {
+        "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0.62, "y":0},
-                {"label":"1!", "x":1.62, "y":0},
-                {"label":"2@", "x":2.62, "y":0},
-                {"label":"3#", "x":3.62, "y":0},
-                {"label":"4$", "x":4.62, "y":0},
-                {"label":"5%", "x":5.62, "y":0},
-                {"label":"6^", "x":6.62, "y":0},
-                {"label":"7&", "x":10.12, "y":0},
-                {"label":"8*", "x":11.12, "y":0},
-                {"label":"9(", "x":12.12, "y":0},
-                {"label":"0)", "x":13.12, "y":0},
-                {"label":"-_", "x":14.12, "y":0},
-                {"label":"Backspace", "x":15.12, "y":0},
-                {"label":"Backspace", "x":16.12, "y":0},
+                {"matrix": [0, 0], "x": 0.62, "y": 0},
+                {"matrix": [0, 1], "x": 1.62, "y": 0},
+                {"matrix": [0, 2], "x": 2.62, "y": 0},
+                {"matrix": [0, 3], "x": 3.62, "y": 0},
+                {"matrix": [0, 4], "x": 4.62, "y": 0},
+                {"matrix": [0, 5], "x": 5.62, "y": 0},
+                {"matrix": [5, 5], "x": 6.62, "y": 0},
+
+                {"matrix": [11, 5], "x": 10.12, "y": 0},
+                {"matrix": [6, 5], "x": 11.12, "y": 0},
+                {"matrix": [6, 4], "x": 12.12, "y": 0},
+                {"matrix": [6, 3], "x": 13.12, "y": 0},
+                {"matrix": [6, 2], "x": 14.12, "y": 0},
+                {"matrix": [6, 1], "x": 15.12, "y": 0},
+                {"matrix": [6, 0], "x": 16.12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.87, "y": 1},
+                {"matrix": [1, 2], "x": 2.87, "y": 1},
+                {"matrix": [1, 3], "x": 3.87, "y": 1},
+                {"matrix": [1, 4], "x": 4.87, "y": 1},
+                {"matrix": [1, 5], "x": 5.87, "y": 1},
+                {"matrix": [5, 4], "x": 6.87, "y": 1},
+
+                {"matrix": [11, 4], "x": 9.87, "y": 1},
+                {"matrix": [7, 5], "x": 10.87, "y": 1},
+                {"matrix": [7, 4], "x": 11.87, "y": 1},
+                {"matrix": [7, 3], "x": 12.87, "y": 1},
+                {"matrix": [7, 2], "x": 13.87, "y": 1},
+                {"matrix": [7, 1], "x": 14.87, "y": 1},
+                {"matrix": [7, 0], "x": 15.87, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+
+                {"matrix": [11, 3], "x": 9.75, "y": 2},
+                {"matrix": [8, 5], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 3], "x": 12.75, "y": 2},
+                {"matrix": [8, 2], "x": 13.75, "y": 2},
+                {"matrix": [8, 1], "x": 14.75, "y": 2},
+                {"matrix": [8, 0], "x": 15.75, "y": 2, "w": 1.75},
 
-                {"label":"Tab", "x":0.37, "y":1, "w":1.5},
-                {"label":"Q", "x":1.87, "y":1},
-                {"label":"W", "x":2.87, "y":1},
-                {"label":"E", "x":3.87, "y":1},
-                {"label":"R", "x":4.87, "y":1},
-                {"label":"T", "x":5.87, "y":1},
-                {"label":"Y", "x":6.87, "y":1},
-                {"label":"Y", "x":9.87, "y":1},
-                {"label":"U", "x":10.87, "y":1},
-                {"label":"I", "x":11.87, "y":1},
-                {"label":"O", "x":12.87, "y":1},
-                {"label":"P", "x":13.87, "y":1},
-                {"label":"]}", "x":14.87, "y":1},
-                {"label":"\\|", "x":15.87, "y":1, "w":1.5},
+                {"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": [5, 1], "x": 6.25, "y": 3},
+                {"matrix": [5, 2], "x": 7.37, "y": 3},
 
-                {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75},
-                {"label":"A", "x":2, "y":2},
-                {"label":"S", "x":3, "y":2},
-                {"label":"D", "x":4, "y":2},
-                {"label":"F", "x":5, "y":2},
-                {"label":"G", "x":6, "y":2},
-                {"label":"H", "x":7, "y":2},
-                {"label":";:", "x":9.75, "y":2},
-                {"label":"H", "x":10.75, "y":2},
-                {"label":"J", "x":11.75, "y":2},
-                {"label":"K", "x":12.75, "y":2},
-                {"label":"L", "x":13.75, "y":2},
-                {"label":"'\"", "x":14.75, "y":2},
-                {"label":"Enter", "x":15.75, "y":2, "w":1.75},
+                {"matrix": [11, 2], "x": 9.37, "y": 3},
+                {"matrix": [11, 1], "x": 10.5, "y": 3},
+                {"matrix": [9, 5], "x": 11.5, "y": 3},
+                {"matrix": [9, 4], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 2], "x": 14.5, "y": 3},
+                {"matrix": [9, 1], "x": 15.5, "y": 3},
+                {"matrix": [9, 0], "x": 16.5, "y": 3, "w": 1.25},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"Mute", "x":7.37, "y":3},
-                {"label":"Mute", "x":9.37, "y":3},
-                {"label":"B", "x":10.5, "y":3},
-                {"label":"N", "x":11.5, "y":3},
-                {"label":"M", "x":12.5, "y":3},
-                {"label":",<", "x":13.5, "y":3},
-                {"label":".>", "x":14.5, "y":3},
-                {"label":"\u2191", "x":15.5, "y":3},
-                {"label":"Shift", "x":16.5, "y":3, "w":1.25},
+                {"matrix": [4, 0], "x": 0.25, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5},
+                {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5},
+                {"matrix": [5, 0], "x": 7.13, "y": 4},
 
-                {"label":"Ctrl", "x":0.25, "y":4},
-                {"label":"GUI", "x":1.25, "y":4},
-                {"label":"Alt", "x":2.25, "y":4},
-                {"label":"Fn2", "x":3.5, "y":4, "w":1.25},
-                {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5},
-                {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5},
-                {"label":"RGB Mode -", "x":7.13, "y":4},
-                {"label":"RGB Mode +", "x":9.62, "y":4},
-                {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5},
-                {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5},
-                {"label":"Fn2", "x":13, "y":4, "w":1.25},
-                {"label":"\u2190", "x":14.5, "y":4},
-                {"label":"\u2193", "x":15.5, "y":4},
-                {"label":"\u2192", "x":16.5, "y":4}
+                {"matrix": [11, 0], "x": 9.62, "y": 4},
+                {"matrix": [10, 5], "x": 10.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 4], "x": 11.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 3], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [10, 2], "x": 14.5, "y": 4},
+                {"matrix": [10, 1], "x": 15.5, "y": 4},
+                {"matrix": [10, 0], "x": 16.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.c b/keyboards/mechwild/mokulua/mirrored/mirrored.c
index 6b5410642a..434b71560c 100644
--- a/keyboards/mechwild/mokulua/mirrored/mirrored.c
+++ b/keyboards/mechwild/mokulua/mirrored/mirrored.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Kyle McCreery (@Kyle McCreery)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "mirrored.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.h b/keyboards/mechwild/mokulua/mirrored/mirrored.h
deleted file mode 100644
index 66df5cdd6b..0000000000
--- a/keyboards/mechwild/mokulua/mirrored/mirrored.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_mirrored( \
-    L00, L01, L02, L03, L04, L05, L06,             R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,             R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26,             R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36, L37,   R30, R31, R32, R33, R34, R35, R36, R37, \
-    L40, L41, L42, L43,    L44, L45,   L46,   R40,   R41, R42,    R43, R44, R45, R46  \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { L46, L36, L37, L26, L16, L06 }, \
-    { R06, R05, R04, R03, R02, R01 }, \
-    { R16, R15, R14, R13, R12, R11 }, \
-    { R26, R25, R24, R23, R22, R21 }, \
-    { R37, R36, R35, R34, R33, R32 }, \
-    { R46, R45, R44, R43, R42, R41 }, \
-    { R40, R31, R30, R20, R10, R00 }  \
-}
-
-#define LAYOUT       LAYOUT_mirrored
\ No newline at end of file
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index 18594c39ed..4ab38d9d37 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -26,84 +26,92 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_standard": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_standard": {
+        "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0.62, "y":0},
-                {"label":"1!", "x":1.62, "y":0},
-                {"label":"2@", "x":2.62, "y":0},
-                {"label":"3#", "x":3.62, "y":0},
-                {"label":"4$", "x":4.62, "y":0},
-                {"label":"5%", "x":5.62, "y":0},
-                {"label":"6^", "x":6.62, "y":0},
-                {"label":"7&", "x":9.62, "y":0},
-                {"label":"8*", "x":10.62, "y":0},
-                {"label":"9(", "x":11.62, "y":0},
-                {"label":"0)", "x":12.62, "y":0},
-                {"label":"-_", "x":13.62, "y":0},
-                {"label":"Backspace", "x":14.62, "y":0},
-                {"label":"Backspace", "x":15.62, "y":0},
+                {"matrix": [0, 0], "x": 0.62, "y": 0},
+                {"matrix": [0, 1], "x": 1.62, "y": 0},
+                {"matrix": [0, 2], "x": 2.62, "y": 0},
+                {"matrix": [0, 3], "x": 3.62, "y": 0},
+                {"matrix": [0, 4], "x": 4.62, "y": 0},
+                {"matrix": [0, 5], "x": 5.62, "y": 0},
+                {"matrix": [5, 5], "x": 6.62, "y": 0},
+
+                {"matrix": [11, 0], "x": 9.62, "y": 0},
+                {"matrix": [6, 0], "x": 10.62, "y": 0},
+                {"matrix": [6, 1], "x": 11.62, "y": 0},
+                {"matrix": [6, 2], "x": 12.62, "y": 0},
+                {"matrix": [6, 3], "x": 13.62, "y": 0},
+                {"matrix": [6, 4], "x": 14.62, "y": 0},
+                {"matrix": [6, 5], "x": 15.62, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.87, "y": 1},
+                {"matrix": [1, 2], "x": 2.87, "y": 1},
+                {"matrix": [1, 3], "x": 3.87, "y": 1},
+                {"matrix": [1, 4], "x": 4.87, "y": 1},
+                {"matrix": [1, 5], "x": 5.87, "y": 1},
+                {"matrix": [5, 4], "x": 6.87, "y": 1},
+
+                {"matrix": [7, 0], "x": 10.37, "y": 1},
+                {"matrix": [7, 1], "x": 11.37, "y": 1},
+                {"matrix": [7, 2], "x": 12.37, "y": 1},
+                {"matrix": [7, 3], "x": 13.37, "y": 1},
+                {"matrix": [7, 4], "x": 14.37, "y": 1},
+                {"matrix": [7, 5], "x": 15.37, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+
+                {"matrix": [11, 1], "x": 9.75, "y": 2},
+                {"matrix": [8, 0], "x": 10.75, "y": 2},
+                {"matrix": [8, 1], "x": 11.75, "y": 2},
+                {"matrix": [8, 2], "x": 12.75, "y": 2},
+                {"matrix": [8, 3], "x": 13.75, "y": 2},
+                {"matrix": [8, 4], "x": 14.75, "y": 2},
+                {"matrix": [8, 5], "x": 15.75, "y": 2, "w": 1.75},
 
-                {"label":"Tab", "x":0.37, "y":1, "w":1.5},
-                {"label":"Q", "x":1.87, "y":1},
-                {"label":"W", "x":2.87, "y":1},
-                {"label":"E", "x":3.87, "y":1},
-                {"label":"R", "x":4.87, "y":1},
-                {"label":"T", "x":5.87, "y":1},
-                {"label":"Y", "x":6.87, "y":1},
-                {"label":"U", "x":10.37, "y":1},
-                {"label":"I", "x":11.37, "y":1},
-                {"label":"O", "x":12.37, "y":1},
-                {"label":"P", "x":13.37, "y":1},
-                {"label":"]}", "x":14.37, "y":1},
-                {"label":"\\|", "x":15.37, "y":1, "w":1.5},
+                {"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": [5, 1], "x": 6.25, "y": 3},
+                {"matrix": [5, 2], "x": 7.37, "y": 3},
 
-                {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75},
-                {"label":"A", "x":2, "y":2},
-                {"label":"S", "x":3, "y":2},
-                {"label":"D", "x":4, "y":2},
-                {"label":"F", "x":5, "y":2},
-                {"label":"G", "x":6, "y":2},
-                {"label":"H", "x":7, "y":2},
-                {"label":";:", "x":9.75, "y":2},
-                {"label":"H", "x":10.75, "y":2},
-                {"label":"J", "x":11.75, "y":2},
-                {"label":"K", "x":12.75, "y":2},
-                {"label":"L", "x":13.75, "y":2},
-                {"label":"'\"", "x":14.75, "y":2},
-                {"label":"Enter", "x":15.75, "y":2, "w":1.75},
+                {"matrix": [11, 3], "x": 9.37, "y": 3},
+                {"matrix": [11, 2], "x": 10.5, "y": 3},
+                {"matrix": [9, 0], "x": 11.5, "y": 3},
+                {"matrix": [9, 1], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 3], "x": 14.5, "y": 3},
+                {"matrix": [9, 4], "x": 15.5, "y": 3},
+                {"matrix": [9, 5], "x": 16.5, "y": 3, "w": 1.25},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"Mute", "x":7.37, "y":3},
-                {"label":"Mute", "x":9.37, "y":3},
-                {"label":"B", "x":10.5, "y":3},
-                {"label":"N", "x":11.5, "y":3},
-                {"label":"M", "x":12.5, "y":3},
-                {"label":",<", "x":13.5, "y":3},
-                {"label":".>", "x":14.5, "y":3},
-                {"label":"\u2191", "x":15.5, "y":3},
-                {"label":"Shift", "x":16.5, "y":3, "w":1.25},
+                {"matrix": [4, 0], "x": 0.25, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5},
+                {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5},
+                {"matrix": [5, 0], "x": 7.13, "y": 4},
 
-                {"label":"Ctrl", "x":0.25, "y":4},
-                {"label":"GUI", "x":1.25, "y":4},
-                {"label":"Alt", "x":2.25, "y":4},
-                {"label":"Fn2", "x":3.5, "y":4, "w":1.25},
-                {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5},
-                {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5},
-                {"label":"RGB Mode -", "x":7.13, "y":4},
-                {"label":"RGB Mode +", "x":9.62, "y":4},
-                {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5},
-                {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5},
-                {"label":"Fn2", "x":13, "y":4, "w":1.25},
-                {"label":"\u2190", "x":14.5, "y":4},
-                {"label":"\u2193", "x":15.5, "y":4},
-                {"label":"\u2192", "x":16.5, "y":4}
+                {"matrix": [11, 4], "x": 9.62, "y": 4},
+                {"matrix": [10, 0], "x": 10.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 1], "x": 11.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.5, "y": 4},
+                {"matrix": [10, 4], "x": 15.5, "y": 4},
+                {"matrix": [10, 5], "x": 16.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechwild/mokulua/standard/standard.c b/keyboards/mechwild/mokulua/standard/standard.c
index 4bccb70e3f..434b71560c 100644
--- a/keyboards/mechwild/mokulua/standard/standard.c
+++ b/keyboards/mechwild/mokulua/standard/standard.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Kyle McCreery (@Kyle McCreery)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "standard.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/mechwild/mokulua/standard/standard.h b/keyboards/mechwild/mokulua/standard/standard.h
deleted file mode 100644
index 0484340e8d..0000000000
--- a/keyboards/mechwild/mokulua/standard/standard.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_standard( \
-    L00, L01, L02, L03, L04, L05, L06,             R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,               R11, R12, R13, R14,   R15,  R16, \
-    L20, L21, L22, L23, L24, L25, L26,             R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36, L37,   R30, R31, R32, R33, R34, R35, R36, R37, \
-    L40, L41, L42, L43,    L44, L45,   L46,   R40,   R41, R42,    R43, R44, R45, R46  \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { L46, L36, L37, L26, L16, L06 }, \
-    { R01, R02, R03, R04, R05, R06 }, \
-    { R11, R12, R13, R14, R15, R16 }, \
-    { R21, R22, R23, R24, R25, R26 }, \
-    { R32, R33, R34, R35, R36, R37 }, \
-    { R41, R42, R43, R44, R45, R46 }, \
-    { R00, R20, R31, R30, R40, ___ }  \
-}
-
-#define LAYOUT       LAYOUT_standard
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index 853d7ebcc3..f529efd1e6 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -31,80 +31,88 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0.2, "y": 0},
-                {"x": 1.62, "y": 0},
-                {"x": 2.62, "y": 0},
-                {"x": 3.9, "y": 0},
-                {"x": 4.9, "y": 0},
-                {"x": 5.9, "y": 0},
-                {"x": 6.9, "y": 0},
-                {"x": 7.9, "y": 0},
-                {"x": 10.65, "y": 0},
-                {"x": 11.65, "y": 0},
-                {"x": 12.65, "y": 0},
-                {"x": 13.65, "y": 0},
-                {"x": 14.9, "y": 0},
-                {"x": 15.9, "y": 0},
-                {"x": 16.9, "y": 0},
-                {"x": 17.9, "y": 0},
+                {"matrix": [5, 5], "x": 0.2, "y": 0},
 
-                {"x": 0.1, "y": 1},
-                {"x": 1.37, "y": 1, "w": 1.5},
-                {"x": 2.87, "y": 1},
-                {"x": 4.4, "y": 1},
-                {"x": 5.4, "y": 1},
-                {"x": 6.4, "y": 1},
-                {"x": 7.4, "y": 1},
-                {"x": 10.15, "y": 1},
-                {"x": 11.15, "y": 1},
-                {"x": 12.15, "y": 1},
-                {"x": 13.15, "y": 1},
-                {"x": 14.65, "y": 1},
-                {"x": 15.65, "y": 1},
-                {"x": 16.65, "y": 1},
-                {"x": 17.65, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 1.62, "y": 0},
+                {"matrix": [5, 3], "x": 2.62, "y": 0},
+                {"matrix": [5, 2], "x": 3.9, "y": 0},
+                {"matrix": [5, 1], "x": 4.9, "y": 0},
+                {"matrix": [5, 0], "x": 5.9, "y": 0},
+                {"matrix": [0, 0], "x": 6.9, "y": 0},
+                {"matrix": [0, 1], "x": 7.9, "y": 0},
 
-                {"x": 0, "y": 2},
-                {"x": 1.3, "y": 2, "w": 1.75},
-                {"x": 3.02, "y": 2},
-                {"x": 4.65, "y": 2},
-                {"x": 5.65, "y": 2},
-                {"x": 6.65, "y": 2},
-                {"x": 7.65, "y": 2},
-                {"x": 10.4, "y": 2},
-                {"x": 11.4, "y": 2},
-                {"x": 12.4, "y": 2},
-                {"x": 13.4, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2, "w": 2.25},
+                {"matrix": [0, 2], "x": 10.65, "y": 0},
+                {"matrix": [0, 3], "x": 11.65, "y": 0},
+                {"matrix": [0, 4], "x": 12.65, "y": 0},
+                {"matrix": [0, 5], "x": 13.65, "y": 0},
+                {"matrix": [0, 6], "x": 14.9, "y": 0},
+                {"matrix": [0, 7], "x": 15.9, "y": 0},
+                {"matrix": [0, 8], "x": 16.9, "y": 0},
+                {"matrix": [0, 9], "x": 17.9, "y": 0},
 
-                {"x": 1.12, "y": 3, "w": 2.25},
-                {"x": 3.37, "y": 3},
-                {"x": 5.15, "y": 3},
-                {"x": 6.15, "y": 3},
-                {"x": 7.15, "y": 3},
-                {"x": 8.15, "y": 3},
-                {"x": 9.9, "y": 3},
-                {"x": 10.9, "y": 3},
-                {"x": 11.9, "y": 3},
-                {"x": 12.9, "y": 3},
-                {"x": 14.65, "y": 3},
-                {"x": 15.65, "y": 3},
-                {"x": 16.65, "y": 3},
-                {"x": 17.65, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 0.1, "y": 1},
 
-                {"x": 1.15, "y": 4, "w": 1.25},
-                {"x": 2.62, "y": 4, "w": 1.25},
-                {"x": 5.15, "y": 4, "w": 1.25},
-                {"x": 6.4, "y": 4, "w": 2.25},
-                {"x": 8.65, "y": 4},
-                {"x": 9.9, "y": 4, "w": 2.75},
-                {"x": 12.65, "y": 4},
-                {"x": 14.65, "y": 4},
-                {"x": 15.65, "y": 4},
-                {"x": 16.65, "y": 4},
-                {"x": 17.65, "y": 4}
+                {"matrix": [5, 9], "x": 1.37, "y": 1, "w": 1.5},
+                {"matrix": [5, 8], "x": 2.87, "y": 1},
+                {"matrix": [5, 7], "x": 4.4, "y": 1},
+                {"matrix": [5, 6], "x": 5.4, "y": 1},
+                {"matrix": [1, 0], "x": 6.4, "y": 1},
+                {"matrix": [1, 1], "x": 7.4, "y": 1},
+
+                {"matrix": [1, 2], "x": 10.15, "y": 1},
+                {"matrix": [1, 3], "x": 11.15, "y": 1},
+                {"matrix": [1, 4], "x": 12.15, "y": 1},
+                {"matrix": [1, 5], "x": 13.15, "y": 1},
+                {"matrix": [1, 6], "x": 14.65, "y": 1},
+                {"matrix": [1, 7], "x": 15.65, "y": 1},
+                {"matrix": [1, 8], "x": 16.65, "y": 1},
+                {"matrix": [1, 9], "x": 17.65, "y": 1, "w": 1.5},
+
+                {"matrix": [6, 4], "x": 0, "y": 2},
+
+                {"matrix": [6, 9], "x": 1.3, "y": 2, "w": 1.75},
+                {"matrix": [6, 8], "x": 3.02, "y": 2},
+                {"matrix": [6, 3], "x": 4.65, "y": 2},
+                {"matrix": [2, 0], "x": 5.65, "y": 2},
+                {"matrix": [2, 1], "x": 6.65, "y": 2},
+                {"matrix": [2, 2], "x": 7.65, "y": 2},
+
+                {"matrix": [2, 3], "x": 10.4, "y": 2},
+                {"matrix": [2, 4], "x": 11.4, "y": 2},
+                {"matrix": [2, 5], "x": 12.4, "y": 2},
+                {"matrix": [2, 6], "x": 13.4, "y": 2},
+                {"matrix": [2, 7], "x": 15, "y": 2},
+                {"matrix": [2, 8], "x": 16, "y": 2},
+                {"matrix": [2, 9], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 2], "x": 1.12, "y": 3, "w": 2.25},
+                {"matrix": [6, 0], "x": 3.37, "y": 3},
+                {"matrix": [6, 7], "x": 5.15, "y": 3},
+                {"matrix": [6, 6], "x": 6.15, "y": 3},
+                {"matrix": [3, 0], "x": 7.15, "y": 3},
+                {"matrix": [3, 1], "x": 8.15, "y": 3},
+
+                {"matrix": [3, 2], "x": 9.9, "y": 3},
+                {"matrix": [3, 3], "x": 10.9, "y": 3},
+                {"matrix": [3, 4], "x": 11.9, "y": 3},
+                {"matrix": [3, 5], "x": 12.9, "y": 3},
+                {"matrix": [3, 6], "x": 14.65, "y": 3},
+                {"matrix": [3, 7], "x": 15.65, "y": 3},
+                {"matrix": [3, 8], "x": 16.65, "y": 3},
+                {"matrix": [3, 9], "x": 17.65, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 1], "x": 1.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 2.62, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 5.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 6.4, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 8.65, "y": 4},
+
+                {"matrix": [4, 4], "x": 9.9, "y": 4, "w": 2.75},
+                {"matrix": [4, 5], "x": 12.65, "y": 4},
+                {"matrix": [4, 6], "x": 14.65, "y": 4},
+                {"matrix": [4, 7], "x": 15.65, "y": 4},
+                {"matrix": [4, 8], "x": 16.65, "y": 4},
+                {"matrix": [4, 9], "x": 17.65, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c
deleted file mode 100644
index 548f955825..0000000000
--- a/keyboards/mechwild/obe/obe.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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 "obe.h"
diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h
deleted file mode 100644
index 8c57aa283b..0000000000
--- a/keyboards/mechwild/obe/obe.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k55, k54, k53, k52, k51, k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k65, k59, k58, k57, k56, k10, k11, k12, k13, k14, k15, k16, k17, k18,      k19, \
-    k64, k69, k68, k63, k20, k21, k22, k23, k24, k25, k26, k27, k28,           k29, \
-         k62, k60, k67, k66, k30, k31, k32, k33, k34, k35, k36, k37, k38,      k39, \
-         k61, k40, k41,      k42, k43,      k44,      k45, k46, k47, k48,      k49  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-	{ k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-	{ k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }  \
-}
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 1f41cf4617..1014411ba0 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -24,68 +24,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0,  "y": 0}, 
-                {"label": "k01", "x": 1,  "y": 0}, 
-                {"label": "k02", "x": 2,  "y": 0}, 
-                {"label": "k03", "x": 3,  "y": 0}, 
-                {"label": "k04", "x": 4,  "y": 0}, 
-                {"label": "k05", "x": 5,  "y": 0}, 
-                {"label": "k50", "x": 7,  "y": 0}, 
-                {"label": "k51", "x": 8,  "y": 0}, 
-                {"label": "k52", "x": 9,  "y": 0}, 
-                {"label": "k53", "x": 10, "y": 0}, 
-                {"label": "k54", "x": 11, "y": 0}, 
-                {"label": "k55", "x": 12, "y": 0}, 
-				{"label": "k10", "x": 0,  "y": 1}, 
-                {"label": "k11", "x": 1,  "y": 1}, 
-                {"label": "k12", "x": 2,  "y": 1}, 
-                {"label": "k13", "x": 3,  "y": 1}, 
-                {"label": "k14", "x": 4,  "y": 1}, 
-                {"label": "k15", "x": 5,  "y": 1}, 
-                {"label": "k60", "x": 7,  "y": 1}, 
-                {"label": "k61", "x": 8,  "y": 1}, 
-                {"label": "k62", "x": 9,  "y": 1}, 
-                {"label": "k63", "x": 10, "y": 1}, 
-                {"label": "k64", "x": 11, "y": 1}, 
-                {"label": "k65", "x": 12, "y": 1}, 
-				{"label": "k20", "x": 0,  "y": 2}, 
-                {"label": "k21", "x": 1,  "y": 2}, 
-                {"label": "k22", "x": 2,  "y": 2}, 
-                {"label": "k23", "x": 3,  "y": 2}, 
-                {"label": "k24", "x": 4,  "y": 2}, 
-                {"label": "k25", "x": 5,  "y": 2}, 
-                {"label": "k70", "x": 7,  "y": 2}, 
-                {"label": "k71", "x": 8,  "y": 2}, 
-                {"label": "k72", "x": 9,  "y": 2}, 
-                {"label": "k73", "x": 10, "y": 2}, 
-                {"label": "k74", "x": 11, "y": 2}, 
-                {"label": "k75", "x": 12, "y": 2}, 
-				{"label": "k30", "x": 0,  "y": 3}, 
-                {"label": "k31", "x": 1,  "y": 3}, 
-                {"label": "k32", "x": 2,  "y": 3}, 
-                {"label": "k33", "x": 3,  "y": 3}, 
-                {"label": "k34", "x": 4,  "y": 3}, 
-                {"label": "k35", "x": 5,  "y": 3}, 
-				{"label": "k36", "x": 6,  "y": 3},
-                {"label": "k80", "x": 7,  "y": 3}, 
-                {"label": "k81", "x": 8,  "y": 3}, 
-                {"label": "k82", "x": 9,  "y": 3}, 
-                {"label": "k83", "x": 10, "y": 3}, 
-                {"label": "k84", "x": 11, "y": 3}, 
-                {"label": "k85", "x": 12, "y": 3}, 
-				{"label": "k40", "x": 0,  "y": 4}, 
-                {"label": "k41", "x": 1,  "y": 4}, 
-                {"label": "k42", "x": 2,  "y": 4}, 
-                {"label": "k43", "x": 3,  "y": 4}, 
-                {"label": "k44", "x": 4,  "y": 4}, 
-                {"label": "k45", "x": 5,  "y": 4}, 
-				{"label": "k46", "x": 6,  "y": 4},
-                {"label": "k90", "x": 7,  "y": 4}, 
-                {"label": "k91", "x": 8,  "y": 4}, 
-                {"label": "k92", "x": 9,  "y": 4}, 
-                {"label": "k93", "x": 10, "y": 4}, 
-                {"label": "k94", "x": 11, "y": 4}, 
-                {"label": "k95", "x": 12, "y": 4}
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechwild/waka60/waka60.c b/keyboards/mechwild/waka60/waka60.c
deleted file mode 100644
index f0c5f143e4..0000000000
--- a/keyboards/mechwild/waka60/waka60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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 "waka60.h"
diff --git a/keyboards/mechwild/waka60/waka60.h b/keyboards/mechwild/waka60/waka60.h
deleted file mode 100644
index 4e7d82e929..0000000000
--- a/keyboards/mechwild/waka60/waka60.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT( \
-	k00, k01, k02, k03, k04, k05,      k50, k51, k52, k53, k54, k55, \
-	k10, k11, k12, k13, k14, k15,      k60, k61, k62, k63, k64, k65, \
-	k20, k21, k22, k23, k24, k25,      k70, k71, k72, k73, k74, k75, \
-	k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \
-	k40, k41, k42, k43, k44, k45, k46, k90, k91, k92, k93, k94, k95  \
-) { \
-    { k00, k01, k02, k03, k04, k05, ___}, \
-    { k10, k11, k12, k13, k14, k15, ___}, \
-    { k20, k21, k22, k23, k24, k25, ___}, \
-    { k30, k31, k32, k33, k34, k35, k36}, \
-    { k40, k41, k42, k43, k44, k45, k46}, \
-	{ k50, k51, k52, k53, k54, k55, ___}, \
-	{ k60, k61, k62, k63, k64, k65, ___}, \
-	{ k70, k71, k72, k73, k74, k75, ___}, \
-	{ k80, k81, k82, k83, k84, k85, ___}, \
-	{ k90, k91, k92, k93, k94, k95, ___}  \
-}