Migrate some more layouts to data driven (#19889)

9 files changed, 208 insertions, 367 deletions

diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index faec437f36..048500da8c 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "battleship_gamepad.h"
+#include "quantum.h"
 
 /* joystick config */
 joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.h b/keyboards/handwired/battleship_gamepad/battleship_gamepad.h
deleted file mode 100644
index 67cf112201..0000000000
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 Andrew Braini
- *
- * 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 "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, K05, K06, K07, \
-	K10, K11, K12, K13, K14, K15, K16, K17, \
-	K20, K21, K22, K23, K24, K25, K26, K27, \
-	K30, K31, K32, K33, K34, K35, K36, K37, \
-	K40, K41, K42, K43, K44, K45, K46, K47  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47 }  \
-}
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json
index ec5fc02da4..d4705a5c5f 100644
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ b/keyboards/handwired/battleship_gamepad/info.json
@@ -13,210 +13,50 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "F1",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "F2",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "Esc",
-                    "x": 2.25,
-                    "y": 0,
-                    "w": 1.25
-                },
-                {
-                    "label": "!",
-                    "x": 3.5,
-                    "y": 0
-                },
-                {
-                    "label": "@",
-                    "x": 4.5,
-                    "y": 0
-                },
-                {
-                    "label": "#",
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "label": "$",
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "label": "%",
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "label": "F3",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "F4",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 2.25,
-                    "y": 1,
-                    "w": 1.25
-                },
-                {
-                    "label": "Q",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "F5",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "F6",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "Caps<br>Lock",
-                    "x": 2.25,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 3.5,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 4.5,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 5.5,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 6.5,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 7.5,
-                    "y": 2
-                },
-                {
-                    "label": "F7",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "F8",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 2.25,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Z",
-                    "x": 3.5,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 4.5,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 5.5,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 6.5,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 7.5,
-                    "y": 3
-                },
-                {
-                    "label": "F9",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "F10",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": "",
-                    "x": 2.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 3.5,
-                    "y": 4
-                },
-                {
-                    "label": "Alt",
-                    "x": 4.5,
-                    "y": 4
-                },
-                {
-                    "label": "\u21e9",
-                    "x": 5.5,
-                    "y": 4
-                },
-                {
-                    "label": "\u21e7",
-                    "x": 6.5,
-                    "y": 4
-                },
-                {
-                    "x": 7.5,
-                    "y": 4
-                }
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2.25, "y": 0, "w": 1.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0, "matrix": [0, 5]},
+                {"x": 6.5, "y": 0, "matrix": [0, 6]},
+                {"x": 7.5, "y": 0, "matrix": [0, 7]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2.25, "y": 1, "w": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2.25, "y": 2, "w": 1.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2, "matrix": [2, 7]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3, "matrix": [3, 6]},
+                {"x": 7.5, "y": 3, "matrix": [3, 7]},
+
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2.25, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
+                {"x": 4.5, "y": 4, "matrix": [4, 4]},
+                {"x": 5.5, "y": 4, "matrix": [4, 5]},
+                {"x": 6.5, "y": 4, "matrix": [4, 6]},
+                {"x": 7.5, "y": 4, "matrix": [4, 7]}
             ]
         }
     }
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index cabbbf73b8..750645d6f4 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -17,85 +17,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":0.75},
-                {"x":2.5, "y":0.25},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0.25},
-                {"x":5.5, "y":0.75},
-                {"x":6.5, "y":1},
+                {"x":0, "y":1, "w":1.5, "matrix": [0, 0]},
+                {"x":1.5, "y":0.75, "matrix": [0, 1]},
+                {"x":2.5, "y":0.25, "matrix": [0, 2]},
+                {"x":3.5, "y":0, "matrix": [0, 3]},
+                {"x":4.5, "y":0.25, "matrix": [0, 4]},
+                {"x":5.5, "y":0.75, "matrix": [0, 5]},
+                {"x":6.5, "y":1, "matrix": [0, 6]},
 
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":0.75},
-                {"x":11.5, "y":0.25},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0.25},
-                {"x":14.5, "y":0.75},
-                {"x":15.5, "y":1, "w":1.5},
+                {"x":9.5, "y":1, "matrix": [5, 0]},
+                {"x":10.5, "y":0.75, "matrix": [5, 1]},
+                {"x":11.5, "y":0.25, "matrix": [5, 2]},
+                {"x":12.5, "y":0, "matrix": [5, 3]},
+                {"x":13.5, "y":0.25, "matrix": [5, 4]},
+                {"x":14.5, "y":0.75, "matrix": [5, 5]},
+                {"x":15.5, "y":1, "w":1.5, "matrix": [5, 6]},
 
-                {"x":0, "y":2, "w":1.5},
-                {"x":1.5, "y":1.75},
-                {"x":2.5, "y":1.25},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1.25},
-                {"x":5.5, "y":1.75},
-                {"x":6.5, "y":2, "h":1.5},
+                {"x":0, "y":2, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1.75, "matrix": [1, 1]},
+                {"x":2.5, "y":1.25, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1.25, "matrix": [1, 4]},
+                {"x":5.5, "y":1.75, "matrix": [1, 5]},
+                {"x":6.5, "y":2, "h":1.5, "matrix": [1, 6]},
 
-                {"x":9.5, "y":2, "h":1.5},
-                {"x":10.5, "y":1.75},
-                {"x":11.5, "y":1.25},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1.25},
-                {"x":14.5, "y":1.75},
-                {"x":15.5, "y":2, "w":1.5},
+                {"x":9.5, "y":2, "h":1.5, "matrix": [6, 0]},
+                {"x":10.5, "y":1.75, "matrix": [6, 1]},
+                {"x":11.5, "y":1.25, "matrix": [6, 2]},
+                {"x":12.5, "y":1, "matrix": [6, 3]},
+                {"x":13.5, "y":1.25, "matrix": [6, 4]},
+                {"x":14.5, "y":1.75, "matrix": [6, 5]},
+                {"x":15.5, "y":2, "w":1.5, "matrix": [6, 6]},
 
-                {"x":0, "y":3, "w":1.5},
-                {"x":1.5, "y":2.75},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.75},
+                {"x":0, "y":3, "w":1.5, "matrix": [2, 0]},
+                {"x":1.5, "y":2.75, "matrix": [2, 1]},
+                {"x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"x":3.5, "y":2, "matrix": [2, 3]},
+                {"x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"x":5.5, "y":2.75, "matrix": [2, 5]},
 
-                {"x":10.5, "y":2.75},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2},
-                {"x":13.5, "y":2.25},
-                {"x":14.5, "y":2.75},
-                {"x":15.5, "y":3, "w":1.5},
+                {"x":10.5, "y":2.75, "matrix": [7, 1]},
+                {"x":11.5, "y":2.25, "matrix": [7, 2]},
+                {"x":12.5, "y":2, "matrix": [7, 3]},
+                {"x":13.5, "y":2.25, "matrix": [7, 4]},
+                {"x":14.5, "y":2.75, "matrix": [7, 5]},
+                {"x":15.5, "y":3, "w":1.5, "matrix": [7, 6]},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":3.75},
-                {"x":2.5, "y":3.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3.25},
-                {"x":5.5, "y":3.75},
-                {"x":6.5, "y":3.5, "h":1.5},
+                {"x":0, "y":4, "w":1.5, "matrix": [3, 0]},
+                {"x":1.5, "y":3.75, "matrix": [3, 1]},
+                {"x":2.5, "y":3.25, "matrix": [3, 2]},
+                {"x":3.5, "y":3, "matrix": [3, 3]},
+                {"x":4.5, "y":3.25, "matrix": [3, 4]},
+                {"x":5.5, "y":3.75, "matrix": [3, 5]},
+                {"x":6.5, "y":3.5, "h":1.5, "matrix": [3, 6]},
 
-                {"x":9.5, "y":3.5, "h":1.5},
-                {"x":10.5, "y":3.75},
-                {"x":11.5, "y":3.25},
-                {"x":12.5, "y":3},
-                {"x":13.5, "y":3.25},
-                {"x":14.5, "y":3.75},
-                {"x":15.5, "y":4, "w":1.5},
+                {"x":9.5, "y":3.5, "h":1.5, "matrix": [8, 0]},
+                {"x":10.5, "y":3.75, "matrix": [8, 1]},
+                {"x":11.5, "y":3.25, "matrix": [8, 2]},
+                {"x":12.5, "y":3, "matrix": [8, 3]},
+                {"x":13.5, "y":3.25, "matrix": [8, 4]},
+                {"x":14.5, "y":3.75, "matrix": [8, 5]},
+                {"x":15.5, "y":4, "w":1.5, "matrix": [8, 6]},
 
-                {"x":0.25, "y":5},
-                {"x":1.5, "y":4.75},
-                {"x":2.5, "y":4.25},
-                {"x":3.5, "y":4},
+                {"x":0.25, "y":5, "matrix": [4, 0]},
+                {"x":1.5, "y":4.75, "matrix": [4, 1]},
+                {"x":2.5, "y":4.25, "matrix": [4, 2]},
+                {"x":3.5, "y":4, "matrix": [4, 3]},
 
-                {"x":5, "y":6},
-                {"x":6, "y":5.5, "h":2},
-                {"x":7, "y":5.5, "h":2},
+                {"x":5, "y":6, "matrix": [4, 4]},
+                {"x":6, "y":5.5, "h":2, "matrix": [4, 5]},
+                {"x":7, "y":5.5, "h":2, "matrix": [4, 6]},
 
-                {"x":9, "y":5.5, "h":2},
-                {"x":10, "y":5.5, "h":2},
-                {"x":11, "y":6},
+                {"x":9, "y":5.5, "h":2, "matrix": [9, 0]},
+                {"x":10, "y":5.5, "h":2, "matrix": [9, 1]},
+                {"x":11, "y":6, "matrix": [9, 2]},
 
-                {"x":12.5, "y":4},
-                {"x":13.5, "y":4.25},
-                {"x":14.5, "y":4.75},
-                {"x":15.75, "y":5}
+                {"x":12.5, "y":4, "matrix": [9, 3]},
+                {"x":13.5, "y":4.25, "matrix": [9, 4]},
+                {"x":14.5, "y":4.75, "matrix": [9, 5]},
+                {"x":15.75, "y":5, "matrix": [9, 6]}
             ]
         }
     }
diff --git a/keyboards/handwired/myskeeb/myskeeb.c b/keyboards/handwired/myskeeb/myskeeb.c
deleted file mode 100644
index 00f6e329e1..0000000000
--- a/keyboards/handwired/myskeeb/myskeeb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "myskeeb.h"
diff --git a/keyboards/handwired/myskeeb/myskeeb.h b/keyboards/handwired/myskeeb/myskeeb.h
deleted file mode 100644
index 208258b77b..0000000000
--- a/keyboards/handwired/myskeeb/myskeeb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    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,             R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,   R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41, L42, L43, L44, L45, L46,   R40, R41, R42, R43, R44, R45, R46  \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05, L06 }, \
-        { L10, L11, L12, L13, L14, L15, L16 }, \
-        { L20, L21, L22, L23, L24, L25, XXX }, \
-        { L30, L31, L32, L33, L34, L35, L36 }, \
-        { L40, L41, L42, L43, L44, L45, L46 }, \
-        { R00, R01, R02, R03, R04, R05, R06 }, \
-        { R10, R11, R12, R13, R14, R15, R16 }, \
-        { XXX, R21, R22, R23, R24, R25, R26 }, \
-        { R30, R31, R32, R33, R34, R35, R36 }, \
-        { R40, R41, R42, R43, R44, R45, R46 }  \
-    }
-
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index d15982860f..0114de4c26 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -12,7 +12,100 @@
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"label":"K040", "x":0, "y":0}, {"label":"K050", "x":1, "y":0}, {"label":"K041", "x":2, "y":0}, {"label":"K051", "x":3, "y":0}, {"label":"K042", "x":4, "y":0}, {"label":"K052", "x":5, "y":0}, {"label":"K043", "x":6.5, "y":0}, {"label":"K053", "x":7.5, "y":0}, {"label":"K044", "x":8.5, "y":0}, {"label":"K054", "x":9.5, "y":0}, {"label":"K045", "x":10.5, "y":0}, {"label":"K055", "x":11.5, "y":0}, {"label":"K046", "x":14, "y":0}, {"label":"K056", "x":15, "y":0}, {"label":"K047", "x":16, "y":0}, {"label":"K057", "x":17, "y":0}, {"label":"K048", "x":18, "y":0}, {"label":"K058", "x":19, "y":0, "w":2}, {"label":"K030", "x":0, "y":1}, {"label":"K060", "x":1, "y":1}, {"label":"K031", "x":2, "y":1}, {"label":"K061", "x":3, "y":1}, {"label":"K032", "x":4, "y":1}, {"label":"K062", "x":5, "y":1}, {"label":"K033", "x":6.5, "y":1}, {"label":"K063", "x":7.5, "y":1}, {"label":"K034", "x":8.5, "y":1}, {"label":"K064", "x":9.5, "y":1}, {"label":"K035", "x":10.5, "y":1}, {"label":"K065", "x":11.5, "y":1}, {"label":"K036", "x":14, "y":1}, {"label":"K066", "x":15, "y":1}, {"label":"K037", "x":16, "y":1}, {"label":"K067", "x":17, "y":1}, {"label":"K038", "x":18, "y":1}, {"label":"K068", "x":19, "y":1}, {"label":"K039", "x":20, "y":1}, {"label":"K020", "x":0, "y":2}, {"label":"K070", "x":1, "y":2}, {"label":"K021", "x":2, "y":2}, {"label":"K071", "x":3, "y":2}, {"label":"K022", "x":4, "y":2}, {"label":"K072", "x":5, "y":2}, {"label":"K023", "x":6.5, "y":2, "w":1.25}, {"label":"K073", "x":7.75, "y":2}, {"label":"K024", "x":8.75, "y":2}, {"label":"K074", "x":9.75, "y":2}, {"label":"K025", "x":10.75, "y":2}, {"label":"K075", "x":11.75, "y":2}, {"label":"K026", "x":14.25, "y":2}, {"label":"K076", "x":15.25, "y":2}, {"label":"K027", "x":16.25, "y":2}, {"label":"K077", "x":17.25, "y":2}, {"label":"K028", "x":18.25, "y":2}, {"label":"K029", "x":19.25, "y":2, "w":1.75}, {"label":"K010", "x":0, "y":3}, {"label":"K080", "x":1, "y":3}, {"label":"K011", "x":2, "y":3}, {"label":"K081", "x":3, "y":3}, {"label":"K012", "x":4, "y":3}, {"label":"K082", "x":5, "y":3}, {"label":"K013", "x":6.5, "y":3, "w":1.75}, {"label":"K083", "x":8.25, "y":3}, {"label":"K014", "x":9.25, "y":3}, {"label":"K084", "x":10.25, "y":3}, {"label":"K015", "x":11.25, "y":3}, {"label":"K085", "x":12.25, "y":3}, {"label":"K016", "x":13.75, "y":3}, {"label":"K086", "x":14.75, "y":3}, {"label":"K017", "x":15.75, "y":3}, {"label":"K087", "x":16.75, "y":3}, {"label":"K018", "x":17.75, "y":3}, {"label":"K088", "x":18.75, "y":3}, {"label":"K019", "x":19.75, "y":3, "w":1.25}, {"label":"K000", "x":0, "y":4}, {"label":"K090", "x":1, "y":4}, {"label":"K001", "x":2, "y":4}, {"label":"K091", "x":3, "y":4}, {"label":"K002", "x":4, "y":4}, {"label":"K092", "x":5, "y":4}, {"label":"K003", "x":6.5, "y":4, "w":1.25}, {"label":"K093", "x":7.75, "y":4, "w":1.25}, {"label":"K004", "x":10.25, "y":4, "w":1.25}, {"label":"K095", "x":11.5, "y":4, "w":1.75}, {"label":"K006", "x":13.75, "y":4, "w":1.75}, {"label":"K097", "x":15.5, "y":4, "w":1.25}, {"label":"K098", "x":18.5, "y":4, "w":1.25}, {"label":"K009", "x":19.75, "y":4, "w":1.25}]
+          "layout": [
+            {"x":0, "y":0, "matrix": [4, 0]},
+            {"x":1, "y":0, "matrix": [5, 0]},
+            {"x":2, "y":0, "matrix": [4, 1]},
+            {"x":3, "y":0, "matrix": [5, 1]},
+            {"x":4, "y":0, "matrix": [4, 2]},
+            {"x":5, "y":0, "matrix": [5, 2]},
+            {"x":6.5, "y":0, "matrix": [4, 3]},
+            {"x":7.5, "y":0, "matrix": [5, 3]},
+            {"x":8.5, "y":0, "matrix": [4, 4]},
+            {"x":9.5, "y":0, "matrix": [5, 4]},
+            {"x":10.5, "y":0, "matrix": [4, 5]},
+            {"x":11.5, "y":0, "matrix": [5, 5]},
+            {"x":14, "y":0, "matrix": [4, 6]},
+            {"x":15, "y":0, "matrix": [5, 6]},
+            {"x":16, "y":0, "matrix": [4, 7]},
+            {"x":17, "y":0, "matrix": [5, 7]},
+            {"x":18, "y":0, "matrix": [4, 8]},
+            {"x":19, "y":0, "w":2, "matrix": [5, 8]},
+
+            {"x":0, "y":1, "matrix": [3, 0]},
+            {"x":1, "y":1, "matrix": [6, 0]},
+            {"x":2, "y":1, "matrix": [3, 1]},
+            {"x":3, "y":1, "matrix": [6, 1]},
+            {"x":4, "y":1, "matrix": [3, 2]},
+            {"x":5, "y":1, "matrix": [6, 2]},
+            {"x":6.5, "y":1, "matrix": [3, 3]},
+            {"x":7.5, "y":1, "matrix": [6, 3]},
+            {"x":8.5, "y":1, "matrix": [3, 4]},
+            {"x":9.5, "y":1, "matrix": [6, 4]},
+            {"x":10.5, "y":1, "matrix": [3, 5]},
+            {"x":11.5, "y":1, "matrix": [6, 5]},
+            {"x":14, "y":1, "matrix": [3, 6]},
+            {"x":15, "y":1, "matrix": [6, 6]},
+            {"x":16, "y":1, "matrix": [3, 7]},
+            {"x":17, "y":1, "matrix": [6, 7]},
+            {"x":18, "y":1, "matrix": [3, 8]},
+            {"x":19, "y":1, "matrix": [6, 8]},
+            {"x":20, "y":1, "matrix": [3, 9]},
+
+            {"x":0, "y":2, "matrix": [2, 0]},
+            {"x":1, "y":2, "matrix": [7, 0]},
+            {"x":2, "y":2, "matrix": [2, 1]},
+            {"x":3, "y":2, "matrix": [7, 1]},
+            {"x":4, "y":2, "matrix": [2, 2]},
+            {"x":5, "y":2, "matrix": [7, 2]},
+            {"x":6.5, "y":2, "w":1.25, "matrix": [2, 3]},
+            {"x":7.75, "y":2, "matrix": [7, 3]},
+            {"x":8.75, "y":2, "matrix": [2, 4]},
+            {"x":9.75, "y":2, "matrix": [7, 4]},
+            {"x":10.75, "y":2, "matrix": [2, 5]},
+            {"x":11.75, "y":2, "matrix": [7, 5]},
+            {"x":14.25, "y":2, "matrix": [2, 6]},
+            {"x":15.25, "y":2, "matrix": [7, 6]},
+            {"x":16.25, "y":2, "matrix": [2, 7]},
+            {"x":17.25, "y":2, "matrix": [7, 7]},
+            {"x":18.25, "y":2, "matrix": [2, 8]},
+            {"x":19.25, "y":2, "w":1.75, "matrix": [2, 9]},
+
+            {"x":0, "y":3, "matrix": [1, 0]},
+            {"x":1, "y":3, "matrix": [8, 0]},
+            {"x":2, "y":3, "matrix": [1, 1]},
+            {"x":3, "y":3, "matrix": [8, 1]},
+            {"x":4, "y":3, "matrix": [1, 2]},
+            {"x":5, "y":3, "matrix": [8, 2]},
+            {"x":6.5, "y":3, "w":1.75, "matrix": [1, 3]},
+            {"x":8.25, "y":3, "matrix": [8, 3]},
+            {"x":9.25, "y":3, "matrix": [1, 4]},
+            {"x":10.25, "y":3, "matrix": [8, 4]},
+            {"x":11.25, "y":3, "matrix": [1, 5]},
+            {"x":12.25, "y":3, "matrix": [8, 5]},
+            {"x":13.75, "y":3, "matrix": [1, 6]},
+            {"x":14.75, "y":3, "matrix": [8, 6]},
+            {"x":15.75, "y":3, "matrix": [1, 7]},
+            {"x":16.75, "y":3, "matrix": [8, 7]},
+            {"x":17.75, "y":3, "matrix": [1, 8]},
+            {"x":18.75, "y":3, "matrix": [8, 8]},
+            {"x":19.75, "y":3, "w":1.25, "matrix": [1, 9]},
+
+            {"x":0, "y":4, "matrix": [0, 0]},
+            {"x":1, "y":4, "matrix": [9, 0]},
+            {"x":2, "y":4, "matrix": [0, 1]},
+            {"x":3, "y":4, "matrix": [9, 1]},
+            {"x":4, "y":4, "matrix": [0, 2]},
+            {"x":5, "y":4, "matrix": [9, 2]},
+            {"x":6.5, "y":4, "w":1.25, "matrix": [0, 3]},
+            {"x":7.75, "y":4, "w":1.25, "matrix": [9, 3]},
+            {"x":10.25, "y":4, "w":1.25, "matrix": [0, 4]},
+            {"x":11.5, "y":4, "w":1.75, "matrix": [9, 5]},
+            {"x":13.75, "y":4, "w":1.75, "matrix": [0, 6]},
+            {"x":15.5, "y":4, "w":1.25, "matrix": [9, 7]},
+            {"x":18.5, "y":4, "w":1.25, "matrix": [9, 8]},
+            {"x":19.75, "y":4, "w":1.25, "matrix": [0, 9]}
+          ]
       }
   }
 }
diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
index 266a3b638b..cc7f5de31e 100644
--- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
+++ b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
@@ -13,7 +13,7 @@
  * 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 "prime_exl_plus.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // set CapsLock LED to output and low
diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.h b/keyboards/handwired/prime_exl_plus/prime_exl_plus.h
deleted file mode 100644
index bb1c8b1743..0000000000
--- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Holten Campbell
- *
- * 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 "quantum.h"
-
-#define LAYOUT( \
-    K040, K050, K041, K051, K042, K052,   K043, K053, K044, K054, K045, K055,     K046, K056, K047, K057, K048, K058, \
-    K030, K060, K031, K061, K032, K062,   K033, K063, K034, K064, K035, K065,     K036, K066, K037, K067, K038, K068, K039, \
-    K020, K070, K021, K071, K022, K072,   K023, K073, K024, K074, K025, K075,     K026, K076, K027, K077, K028,       K029, \
-    K010, K080, K011, K081, K012, K082,   K013, K083, K014, K084, K015, K085,     K016, K086, K017, K087, K018, K088, K019, \
-    K000, K090, K001, K091, K002, K092,   K003, K093,       K004,       K095,     K006,       K097,             K098, K009 \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  KC_NO, KC_NO, K009 }, \
-    { K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019 }, \
-    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  K029 }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039 }, \
-    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048,  KC_NO }, \
-    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  KC_NO }, \
-    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  KC_NO, KC_NO }, \
-    { K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { K090,  K091,  K092,  K093,  KC_NO, K095,  KC_NO, K097,  K098,  KC_NO }  \
-}