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

6 files changed, 263 insertions, 265 deletions

diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.h b/keyboards/handwired/swiftrax/beegboy/beegboy.h
deleted file mode 100644
index 0b95ddc2ce..0000000000
--- a/keyboards/handwired/swiftrax/beegboy/beegboy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * 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 XXX KC_NO
-
-#define LAYOUT( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,   k07, k17, k08, k18, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k27, k37, k28, k38, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,   k47, k57, k48, k58, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76,        k67, k77, k68,      \
-    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k86,      k96,   k87, k97, k88, k98, \
-    ka0, kb0, ka1,           ka2,                ka4, ka5,      ka6, kb6, ka7,   kb7, ka8       \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
-    { k90, k91, k92, k93, k94, XXX, k96, k97, k98 }, \
-    { ka0, ka1, ka2, XXX, ka4, ka5, ka6, ka7, ka8 }, \
-    { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7, XXX }  \
-}
diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json
index 29fc7dddda..a8aecb81b4 100644
--- a/keyboards/handwired/swiftrax/beegboy/info.json
+++ b/keyboards/handwired/swiftrax/beegboy/info.json
@@ -18,109 +18,121 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"1,0", "x":1.25, "y":0},
-                {"label":"0,1", "x":2.25, "y":0},
-                {"label":"1,1", "x":3.25, "y":0},
-                {"label":"0,2", "x":4.25, "y":0},
-                {"label":"1,2", "x":5.5, "y":0},
-                {"label":"0,3", "x":6.5, "y":0},
-                {"label":"1,3", "x":7.5, "y":0},
-                {"label":"0,4", "x":8.5, "y":0},
-                {"label":"1,4", "x":9.75, "y":0},
-                {"label":"0,5", "x":10.75, "y":0},
-                {"label":"1,5", "x":11.75, "y":0},
-                {"label":"0,6", "x":12.75, "y":0},
-                {"label":"1,6", "x":14, "y":0},
-                {"label":"0,7", "x":15.5, "y":0},
-                {"label":"1,7", "x":16.5, "y":0},
-                {"label":"0,8", "x":17.5, "y":0},
-                {"label":"1,8", "x":18.5, "y":0},
-
-                {"label":"2,0", "x":0, "y":1.25},
-                {"label":"3,0", "x":1, "y":1.25},
-                {"label":"2,1", "x":2, "y":1.25},
-                {"label":"3,1", "x":3, "y":1.25},
-                {"label":"2,2", "x":4, "y":1.25},
-                {"label":"3,2", "x":5, "y":1.25},
-                {"label":"2,3", "x":6, "y":1.25},
-                {"label":"3,3", "x":7, "y":1.25},
-                {"label":"2,4", "x":8, "y":1.25},
-                {"label":"3,4", "x":9, "y":1.25},
-                {"label":"2,5", "x":10, "y":1.25},
-                {"label":"3,5", "x":11, "y":1.25},
-                {"label":"2,6", "x":12, "y":1.25},
-                {"label":"3,6", "x":13, "y":1.25, "w":2},
-                {"label":"2,7", "x":15.5, "y":1.25},
-                {"label":"3,7", "x":16.5, "y":1.25},
-                {"label":"2,8", "x":17.5, "y":1.25},
-                {"label":"3,8", "x":18.5, "y":1.25},
-
-                {"label":"4,0", "x":0, "y":2.25, "w":1.5},
-                {"label":"5,0", "x":1.5, "y":2.25},
-                {"label":"4,1", "x":2.5, "y":2.25},
-                {"label":"5,1", "x":3.5, "y":2.25},
-                {"label":"4,2", "x":4.5, "y":2.25},
-                {"label":"5,2", "x":5.5, "y":2.25},
-                {"label":"4,3", "x":6.5, "y":2.25},
-                {"label":"5,3", "x":7.5, "y":2.25},
-                {"label":"4,4", "x":8.5, "y":2.25},
-                {"label":"5,4", "x":9.5, "y":2.25},
-                {"label":"4,5", "x":10.5, "y":2.25},
-                {"label":"5,5", "x":11.5, "y":2.25},
-                {"label":"4,6", "x":12.5, "y":2.25},
-                {"label":"5,6", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"4,7", "x":15.5, "y":2.25},
-                {"label":"5,7", "x":16.5, "y":2.25},
-                {"label":"4,8", "x":17.5, "y":2.25},
-                {"label":"5,8", "x":18.5, "y":2.25, "h":2},
-
-                {"label":"6,0", "x":0, "y":3.25, "w":1.75},
-                {"label":"7,0", "x":1.75, "y":3.25},
-                {"label":"6,1", "x":2.75, "y":3.25},
-                {"label":"7,1", "x":3.75, "y":3.25},
-                {"label":"6,2", "x":4.75, "y":3.25},
-                {"label":"7,2", "x":5.75, "y":3.25},
-                {"label":"6,3", "x":6.75, "y":3.25},
-                {"label":"7,3", "x":7.75, "y":3.25},
-                {"label":"6,4", "x":8.75, "y":3.25},
-                {"label":"7,4", "x":9.75, "y":3.25},
-                {"label":"6,5", "x":10.75, "y":3.25},
-                {"label":"7,5", "x":11.75, "y":3.25},
-                {"label":"7,6", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"6,7", "x":15.5, "y":3.25},
-                {"label":"7,7", "x":16.5, "y":3.25},
-                {"label":"6,8", "x":17.5, "y":3.25},
-
-                {"label":"8,0", "x":0, "y":4.25, "w":2.25},
-                {"label":"9,0", "x":2.25, "y":4.25},
-                {"label":"8,1", "x":3.25, "y":4.25},
-                {"label":"9,1", "x":4.25, "y":4.25},
-                {"label":"8,2", "x":5.25, "y":4.25},
-                {"label":"9,2", "x":6.25, "y":4.25},
-                {"label":"8,3", "x":7.25, "y":4.25},
-                {"label":"9,3", "x":8.25, "y":4.25},
-                {"label":"8,4", "x":9.25, "y":4.25},
-                {"label":"9,4", "x":10.25, "y":4.25},
-                {"label":"8,5", "x":11.25, "y":4.25},
-                {"label":"8,6", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"9,6", "x":14.25, "y":4.5},
-                {"label":"8,7", "x":15.5, "y":4.25},
-                {"label":"9,7", "x":16.5, "y":4.25},
-                {"label":"8,8", "x":17.5, "y":4.25},
-                {"label":"9,8", "x":18.5, "y":4.25, "h":2},
-
-                {"label":"10,0", "x":0, "y":5.25, "w":1.25},
-                {"label":"11,0", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"10,1", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"10,2", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"10,4", "x":10, "y":5.25, "w":1.5},
-                {"label":"10,5", "x":11.5, "y":5.25, "w":1.5},
-                {"label":"10,6", "x":13.25, "y":5.5},
-                {"label":"11,6", "x":14.25, "y":5.5},
-                {"label":"10,7", "x":15.25, "y":5.5},
-                {"label":"11,7", "x":16.5, "y":5.25},
-                {"label":"10,8", "x":17.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+                {"matrix": [1, 7], "x": 16.5, "y": 0},
+                {"matrix": [0, 8], "x": 17.5, "y": 0},
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.5, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.5, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.5, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 18.5, "y": 2.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [6, 7], "x": 15.5, "y": 3.25},
+                {"matrix": [7, 7], "x": 16.5, "y": 3.25},
+                {"matrix": [6, 8], "x": 17.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 6], "x": 14.25, "y": 4.5},
+
+                {"matrix": [8, 7], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 7], "x": 16.5, "y": 4.25},
+                {"matrix": [8, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 5], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 6], "x": 13.25, "y": 5.5},
+                {"matrix": [11, 6], "x": 14.25, "y": 5.5},
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+
+                {"matrix": [11, 7], "x": 16.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json
index 253e20b715..97ea8928cc 100644
--- a/keyboards/handwired/swiftrax/pandamic/info.json
+++ b/keyboards/handwired/swiftrax/pandamic/info.json
@@ -22,7 +22,110 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":18.25, "y":0}, {"x":19.75, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1, "h":2}, {"x":4.25, "y":1, "w":1.5}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":19.75, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":4.25, "y":2, "w":1.75}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2, "w":2.25}, {"x":19.75, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "h":2}, {"x":4.25, "y":3, "w":1.25}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3, "w":1.75}, {"x":18.5, "y":3.25}, {"x":19.75, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":1.25}, {"x":6.75, "y":4, "w":1.25}, {"x":8, "y":4, "w":6.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.5, "y":4.25}, {"x":18.5, "y":4.25}, {"x":19.5, "y":4.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+                {"matrix": [0, 9], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 8], "x": 16.75, "y": 1},
+                {"matrix": [3, 8], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [5, 8], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+                {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+
+                {"matrix": [8, 7], "x": 14.25, "y": 4},
+                {"matrix": [9, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.h b/keyboards/handwired/swiftrax/pandamic/pandamic.h
deleted file mode 100644
index 9fbb78427e..0000000000
--- a/keyboards/handwired/swiftrax/pandamic/pandamic.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * 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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K000, K100, K001, K101,   K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009,     K109,\
-    K200, K300, K201, K301,   K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308,           K309,\
-    K400, K500, K401,         K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K508,                 K509,\
-    K600, K700, K601, K701,   K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K707, K608,         K609,   K709,\
-    K800,  K801,              K802, K902, K803,                   K805,                   K807, K907, K808,   K908, K809, K909   \
-) { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009},\
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109},\
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208,  XXX},\
-    {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309},\
-    {K400, K401, K402, K403, K404, K405, K406, K407,  XXX,  XXX},\
-    {K500,  XXX, K502, K503, K504, K505, K506, K507, K508, K509},\
-    {K600, K601, K602, K603, K604, K605, K606, K607, K608, K609},\
-    {K700, K701, K702, K703, K704, K705, K706, K707,  XXX, K709},\
-    {K800, K801, K802, K803,  XXX, K805,  XXX, K807, K808, K809},\
-    { XXX,  XXX, K902,  XXX,  XXX,  XXX,  XXX, K907, K908, K909} \
-}
diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json
index ea28d0d9c5..b651d29835 100644
--- a/keyboards/handwired/swiftrax/unsplit/info.json
+++ b/keyboards/handwired/swiftrax/unsplit/info.json
@@ -18,57 +18,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.75},
-                {"x":1, "y":0.75},
-                {"x":2, "y":0.25},
-                {"x":3, "y":0},
-                {"x":4, "y":0.25},
-                {"x":5, "y":0.375},
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.375},
 
-                {"x":11, "y":0.375},
-                {"x":12, "y":0.25},
-                {"x":13, "y":0},
-                {"x":14, "y":0.25},
-                {"x":15, "y":0.75},
-                {"x":16, "y":0.75},
+                {"matrix": [0, 6], "x": 11, "y": 0.375},
+                {"matrix": [0, 7], "x": 12, "y": 0.25},
+                {"matrix": [0, 8], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0.25},
+                {"matrix": [0, 10], "x": 15, "y": 0.75},
+                {"matrix": [0, 11], "x": 16, "y": 0.75},
 
-                {"x":0, "y":1.75},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.375},
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.375},
 
-                {"x":11, "y":1.375},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1},
-                {"x":14, "y":1.25},
-                {"x":15, "y":1.75},
-                {"x":16, "y":1.75},
+                {"matrix": [1, 6], "x": 11, "y": 1.375},
+                {"matrix": [1, 7], "x": 12, "y": 1.25},
+                {"matrix": [1, 8], "x": 13, "y": 1},
+                {"matrix": [1, 9], "x": 14, "y": 1.25},
+                {"matrix": [1, 10], "x": 15, "y": 1.75},
+                {"matrix": [1, 11], "x": 16, "y": 1.75},
 
-                {"x":0, "y":2.75},
-                {"x":1, "y":2.75},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.375},
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.375},
 
-                {"x":11, "y":2.375},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2},
-                {"x":14, "y":2.25},
-                {"x":15, "y":2.75},
-                {"x":16, "y":2.75},
+                {"matrix": [2, 6], "x": 11, "y": 2.375},
+                {"matrix": [2, 7], "x": 12, "y": 2.25},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2.25},
+                {"matrix": [2, 10], "x": 15, "y": 2.75},
+                {"matrix": [2, 11], "x": 16, "y": 2.75},
 
-                {"x":2.5, "y":3.25},
-                {"x":3.5, "y":3.25},
-                {"x":4.5, "y":3.5},
-                {"x":5.5, "y":3.75},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.75},
 
-                {"x":10.5, "y":3.75},
-                {"x":11.5, "y":3.5},
-                {"x":12.5, "y":3.25},
-                {"x":13.5, "y":3.25}
+                {"matrix": [3, 6], "x": 10.5, "y": 3.75},
+                {"matrix": [3, 7], "x": 11.5, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 13.5, "y": 3.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.h b/keyboards/handwired/swiftrax/unsplit/unsplit.h
deleted file mode 100644
index 79109edb7b..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/unsplit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@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/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K000, K001, K002, K003, K004, K005,                               K011, K012, K013, K014, K015, K016, \
-    K100, K101, K102, K103, K104, K105,                               K111, K112, K113, K114, K115, K116, \
-    K200, K201, K202, K203, K204, K205,                               K211, K212, K213, K214, K215, K216, \
-                K402, K403, K404, K405,                               K411, K412, K413, K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K011,  K012,  K013,  K014,  K015,  K016 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K111,  K112,  K113,  K114,  K115,  K116 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K211,  K212,  K213,  K214,  K215,  K216 }, \
-    { XXX,    XXX,  K402,  K403,  K404,  K405,  K411,  K412,  K413,  K414,   XXX,   XXX }  \
-}