Move single `LAYOUT_all`s to data driven (#20430)

14 files changed, 307 insertions, 456 deletions

diff --git a/keyboards/pearlboards/atlas/atlas.c b/keyboards/pearlboards/atlas/atlas.c
deleted file mode 100644
index d8fcc8abb9..0000000000
--- a/keyboards/pearlboards/atlas/atlas.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koobaczech
- *
- * 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 "atlas.h"
diff --git a/keyboards/pearlboards/atlas/atlas.h b/keyboards/pearlboards/atlas/atlas.h
deleted file mode 100644
index 93ecc82f7c..0000000000
--- a/keyboards/pearlboards/atlas/atlas.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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/>.
- */
-
-/*
- * This layout covers all of the possible build layouts. Also, any
- * built layouts will work without having to change anything.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3f, \
-    k40, k41, k42,                     k47,                k4b, k4c, k4d,      k4f  \
-) { \
-    { k00,  k01,  k02,  k03,    k04,    k05,    k06,    k07,  k08,    k09,    k0a,    k0b,  k0c,  k0d,  k0e,    k0f},  \
-    { k10,  k11,  k12,  k13,    k14,    k15,    k16,    k17,  k18,    k19,    k1a,    k1b,  k1c,  k1d,  KC_NO,  k1f},  \
-    { k20,  k21,  k22,  k23,    k24,    k25,    k26,    k27,  k28,    k29,    k2a,    k2b,  k2c,  k2d,  KC_NO,  k2f},  \
-    { k30,  k31,  k32,  k33,    k34,    k35,    k36,    k37,  k38,    k39,    k3a,    k3b,  k3c,  k3d,  KC_NO,  k3f},  \
-    { k40,  k41,  k42,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k47,  KC_NO,  KC_NO,  KC_NO,  k4b,  k4c,  k4d,  KC_NO,  k4f }  \
-}
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index 11967be065..68f009a529 100644
--- a/keyboards/pearlboards/atlas/info.json
+++ b/keyboards/pearlboards/atlas/info.json
@@ -32,79 +32,80 @@
     "layouts": {
         "LAYOUT_all": {
             "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":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0},
-                {"label":"k0e", "x":14, "y":0},
-                {"label":"k0f", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1f", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":2, "w":1.25},
-                {"label":"k2f", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3f", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"k40", "x":0, "y":4, "w":1.5},
-                {"label":"k41", "x":1.5, "y":4},
-                {"label":"k42", "x":2.5, "y":4, "w":1.5},
-                {"label":"k47", "x":4, "y":4, "w":7},
-                {"label":"k4b", "x":11, "y":4, "w":1.5},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4f", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index b3d80109fe..c405b2b20f 100644
--- a/keyboards/pearlboards/pandora/info.json
+++ b/keyboards/pearlboards/pandora/info.json
@@ -29,7 +29,77 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":13.75, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/pearlboards/pandora/pandora.c b/keyboards/pearlboards/pandora/pandora.c
index 927f29f2f3..86044b92b6 100644
--- a/keyboards/pearlboards/pandora/pandora.c
+++ b/keyboards/pearlboards/pandora/pandora.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pandora.h"
+#include "quantum.h"
 
 // Encoder click function
 #ifdef DIP_SWITCH_ENABLE
diff --git a/keyboards/pearlboards/pandora/pandora.h b/keyboards/pearlboards/pandora/pandora.h
deleted file mode 100644
index 73df657bcf..0000000000
--- a/keyboards/pearlboards/pandora/pandora.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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/>.
- */
-
-/*
- * This layout covers all of the possible build layouts. Also, any
- * built layouts will work without having to change anything.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \
-    k40, k41, k42,                     k46,           k4a, k4b, k4c, k4d       \
-) { \
-    { k00,  k01,  k02,  k03,    k04,    k05,    k06,  k07,    k08,    k09,    k0a,  k0b,  k0c,  k0d,  k0e    }, \
-    { k10,  k11,  k12,  k13,    k14,    k15,    k16,  k17,    k18,    k19,    k1a,  k1b,  k1c,  k1d,  KC_NO  }, \
-    { k20,  k21,  k22,  k23,    k24,    k25,    k26,  k27,    k28,    k29,    k2a,  k2b,  k2c,  k2d,  KC_NO  }, \
-    { k30,  k31,  k32,  k33,    k34,    k35,    k36,    k37,  k38,    k39,    k3a,  k3b,  k3c,  k3d,  KC_NO  }, \
-    { k40,  k41,  k42,  KC_NO,  KC_NO,  KC_NO,  k46,  KC_NO,  KC_NO,  KC_NO,  k4a,  k4b,  k4c,  k4d,  KC_NO  }  \
-  }
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index 1a4b7f301c..af1eeae994 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -28,53 +28,53 @@
     "layouts": {
         "LAYOUT_all": {
             "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":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0A", "x":10, "y":0},
-                {"label":"k0B", "x":11, "y":0},
-                {"label":"k0C", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1A", "x":10.5, "y":1},
-                {"label":"k1B", "x":11.5, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
 
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2A", "x":10.75, "y":2},
-                {"label":"k2B", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"k30", "x":1.125, "y":3},
-                {"label":"k31", "x":2.125, "y":3, "w":1.25},
-                {"label":"k32", "x":3.38, "y":3, "w":1.25},
-                {"label":"k33", "x":4.625, "y":3, "w":2.25},
-                {"label":"k34", "x":6.875, "y":3, "w":2.75},
-                {"label":"k35", "x":9.625, "y":3, "w":1.25},
-                {"label":"k36", "x":10.875, "y":3}
+                {"matrix": [3, 0], "x": 1.125, "y": 3},
+                {"matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.38, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 4.625, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 6.875, "y": 3, "w": 2.75},
+                {"matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 10.875, "y": 3}
             ]
         }
     }
diff --git a/keyboards/pearlboards/pearl/pearl.h b/keyboards/pearlboards/pearl/pearl.h
deleted file mode 100644
index d0a2fcb93f..0000000000
--- a/keyboards/pearlboards/pearl/pearl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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/>.
- */
-
-/*
- * This layout covers all of the possible build layouts. Also, any
- * built layouts will work without having to change anything.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-  k30, k31, k32, k33, k34, k35, k36 \
-){ \
-  { k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07,    k08,    k09,    k0a,    k0b,    k0c},    \
-  { k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17,    k18,    k19,    k1a,    k1b,    KC_NO},  \
-  { k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27,    k28,    k29,    k2a,    k2b,    KC_NO},  \
-  { k30,  k31,  k32,  k33,  k34,  k35,  k36,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO}   \
-}
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index 6fbe41611e..15329a6339 100644
--- a/keyboards/pearlboards/zeus/info.json
+++ b/keyboards/pearlboards/zeus/info.json
@@ -32,101 +32,108 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k4F", "x":3, "y":0},
+                {"matrix": [4, 15], "x": 3, "y": 0},
 
-                {"label":"k00", "x":0, "y":1.5},
-                {"label":"k01", "x":2, "y":1.5},
-                {"label":"k02", "x":3, "y":1.5},
-                {"label":"k03", "x":4, "y":1.5},
-                {"label":"k04", "x":5, "y":1.5},
-                {"label":"k05", "x":6.5, "y":1.5},
-                {"label":"k06", "x":7.5, "y":1.5},
-                {"label":"k07", "x":8.5, "y":1.5},
-                {"label":"k08", "x":9.5, "y":1.5},
-                {"label":"k09", "x":11, "y":1.5},
-                {"label":"k0B", "x":12, "y":1.5},
-                {"label":"k0B", "x":13, "y":1.5},
-                {"label":"k0C", "x":14, "y":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
 
-                {"label":"k10", "x":0, "y":2.75},
-                {"label":"k11", "x":1, "y":2.75},
-                {"label":"k12", "x":2, "y":2.75},
-                {"label":"k13", "x":3, "y":2.75},
-                {"label":"k14", "x":4, "y":2.75},
-                {"label":"k15", "x":5, "y":2.75},
-                {"label":"k16", "x":6, "y":2.75},
-                {"label":"k17", "x":7, "y":2.75},
-                {"label":"k18", "x":8, "y":2.75},
-                {"label":"k19", "x":9, "y":2.75},
-                {"label":"k1B", "x":10, "y":2.75},
-                {"label":"k1B", "x":11, "y":2.75},
-                {"label":"k1C", "x":12, "y":2.75},
-                {"label":"k1D", "x":13, "y":2.75},
-                {"label":"k1E", "x":14, "y":2.75},
-                {"label":"k1F", "x":15.25, "y":2.75},
-                {"label":"k1G", "x":16.25, "y":2.75},
-                {"label":"k1H", "x":17.25, "y":2.75},
+                {"matrix": [0, 1], "x": 2, "y": 1.5},
+                {"matrix": [0, 2], "x": 3, "y": 1.5},
+                {"matrix": [0, 3], "x": 4, "y": 1.5},
+                {"matrix": [0, 4], "x": 5, "y": 1.5},
 
-                {"label":"k20", "x":0, "y":3.75, "w":1.5},
-                {"label":"k21", "x":1.5, "y":3.75},
-                {"label":"k22", "x":2.5, "y":3.75},
-                {"label":"k23", "x":3.5, "y":3.75},
-                {"label":"k24", "x":4.5, "y":3.75},
-                {"label":"k25", "x":5.5, "y":3.75},
-                {"label":"k26", "x":6.5, "y":3.75},
-                {"label":"k27", "x":7.5, "y":3.75},
-                {"label":"k28", "x":8.5, "y":3.75},
-                {"label":"k29", "x":9.5, "y":3.75},
-                {"label":"k2A", "x":10.5, "y":3.75},
-                {"label":"k2B", "x":11.5, "y":3.75},
-                {"label":"k2C", "x":12.5, "y":3.75},
-                {"label":"k2D", "x":13.5, "y":3.75, "w":1.5},
-                {"label":"k2F", "x":15.25, "y":3.75},
-                {"label":"k2G", "x":16.25, "y":3.75},
-                {"label":"k2H", "x":17.25, "y":3.75},
+                {"matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"matrix": [0, 8], "x": 9.5, "y": 1.5},
 
-                {"label":"k30", "x":0, "y":4.75, "w":1.75},
-                {"label":"k31", "x":1.75, "y":4.75},
-                {"label":"k32", "x":2.75, "y":4.75},
-                {"label":"k33", "x":3.75, "y":4.75},
-                {"label":"k34", "x":4.75, "y":4.75},
-                {"label":"k35", "x":5.75, "y":4.75},
-                {"label":"k36", "x":6.75, "y":4.75},
-                {"label":"k37", "x":7.75, "y":4.75},
-                {"label":"k38", "x":8.75, "y":4.75},
-                {"label":"k39", "x":9.75, "y":4.75},
-                {"label":"k3A", "x":10.75, "y":4.75},
-                {"label":"k3B", "x":11.75, "y":4.75},
-                {"label":"k3C", "x":12.75, "y":4.75},
-                {"label":"k3D", "x":13.75, "y":4.75, "w":1.25},
+                {"matrix": [0, 9], "x": 11, "y": 1.5},
+                {"matrix": [0, 10], "x": 12, "y": 1.5},
+                {"matrix": [0, 11], "x": 13, "y": 1.5},
+                {"matrix": [0, 12], "x": 14, "y": 1.5},
 
-                {"label":"k40", "x":0, "y":5.75, "w":1.25},
-                {"label":"k41", "x":1.25, "y":5.75},
-                {"label":"k42", "x":2.25, "y":5.75},
-                {"label":"k43", "x":3.25, "y":5.75},
-                {"label":"k44", "x":4.25, "y":5.75},
-                {"label":"k45", "x":5.25, "y":5.75},
-                {"label":"k46", "x":6.25, "y":5.75},
-                {"label":"k47", "x":7.25, "y":5.75},
-                {"label":"k48", "x":8.25, "y":5.75},
-                {"label":"k49", "x":9.25, "y":5.75},
-                {"label":"k4A", "x":10.25, "y":5.75},
-                {"label":"k4B", "x":11.25, "y":5.75},
-                {"label":"k4C", "x":12.25, "y":5.75, "w":1.75},
-                {"label":"k4D", "x":14, "y":5.75},
-                {"label":"k4G", "x":16.25, "y":5.75},
+                {"matrix": [1, 0], "x": 0, "y": 2.75},
+                {"matrix": [1, 1], "x": 1, "y": 2.75},
+                {"matrix": [1, 2], "x": 2, "y": 2.75},
+                {"matrix": [1, 3], "x": 3, "y": 2.75},
+                {"matrix": [1, 4], "x": 4, "y": 2.75},
+                {"matrix": [1, 5], "x": 5, "y": 2.75},
+                {"matrix": [1, 6], "x": 6, "y": 2.75},
+                {"matrix": [1, 7], "x": 7, "y": 2.75},
+                {"matrix": [1, 8], "x": 8, "y": 2.75},
+                {"matrix": [1, 9], "x": 9, "y": 2.75},
+                {"matrix": [1, 10], "x": 10, "y": 2.75},
+                {"matrix": [1, 11], "x": 11, "y": 2.75},
+                {"matrix": [1, 12], "x": 12, "y": 2.75},
+                {"matrix": [1, 13], "x": 13, "y": 2.75},
+                {"matrix": [1, 14], "x": 14, "y": 2.75},
 
-                {"label":"k50", "x":0, "y":6.75, "w":1.25},
-                {"label":"k51", "x":1.25, "y":6.75, "w":1.25},
-                {"label":"k52", "x":2.5, "y":6.75, "w":1.25},
-                {"label":"k56", "x":3.75, "y":6.75, "w":6.25},
-                {"label":"k59", "x":10, "y":6.75, "w":1.25},
-                {"label":"k5A", "x":11.25, "y":6.75, "w":1.25},
-                {"label":"k5B", "x":12.5, "y":6.75, "w":1.25},
-                {"label":"k5C", "x":13.75, "y":6.75, "w":1.25},
-                {"label":"k5F", "x":15.25, "y":6.75},
-                {"label":"k5G", "x":16.25, "y":6.75},
-                {"label":"k5H", "x":17.25, "y":6.75}
+                {"matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"matrix": [3, 13], "x": 13.75, "y": 4.75, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"matrix": [5, 17], "x": 17.25, "y": 6.75}
             ]
         }
     }
diff --git a/keyboards/pearlboards/zeus/zeus.c b/keyboards/pearlboards/zeus/zeus.c
deleted file mode 100644
index b6a7fe1f8e..0000000000
--- a/keyboards/pearlboards/zeus/zeus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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 "zeus.h"
diff --git a/keyboards/pearlboards/zeus/zeus.h b/keyboards/pearlboards/zeus/zeus.h
deleted file mode 100644
index 7bffbf2a90..0000000000
--- a/keyboards/pearlboards/zeus/zeus.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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/>.
- */
-
-/*
- * This layout covers all of the possible build layouts. Also, any
- * built layouts will work without having to change anything.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-                   k4f,                                                                       \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,                          \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, k2g, k2h, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4g,      \
-    k50, k51, k52,                k56,           k59, k5a, k5b, k5c,           k5f, k5g, k5h  \
-) { \
-    { k00,  k01,  k02,  k03,    k04,    k05,    k06,  k07,    k08,    k09,  k0a,  k0b,  k0c,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO},  \
-    { k10,  k11,  k12,  k13,    k14,    k15,    k16,  k17,    k18,    k19,  k1a,  k1b,  k1c,  k1d,    k1e,    k1f,    k1g,    k1h  },  \
-    { k20,  k21,  k22,  k23,    k24,    k25,    k26,  k27,    k28,    k29,  k2a,  k2b,  k2c,  k2d,    KC_NO,  k2f,    k2g,    k2h  },  \
-    { k30,  k31,  k32,  k33,    k34,    k35,    k36,  k37,    k38,    k39,  k3a,  k3b,  k3c,  k3d,    KC_NO,  KC_NO,  KC_NO,  KC_NO},  \
-    { k40,  k41,  k42,  k43,    k44,    k45,    k46,  k47,    k48,    k49,  k4a,  k4b,  k4c,  k4d,    KC_NO,  k4f,    k4g,    KC_NO},  \
-    { k50,  k51,  k52,  KC_NO,  KC_NO,  KC_NO,  k56,  KC_NO,  KC_NO,  k59,  k5a,  k5b,  k5c,  KC_NO,  KC_NO,  k5f,    k5g,    k5h  }   \
-}
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
index c062ce5442..9bd5a1a99a 100644
--- a/keyboards/pearlboards/zeuspad/info.json
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -27,35 +27,35 @@
     "layouts": {
         "LAYOUT_all": {
             "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},
+                {"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},
 
-                {"label":"k10", "x":0, "y":1.25},
-                {"label":"k11", "x":1, "y":1.25},
-                {"label":"k12", "x":2, "y":1.25},
-                {"label":"k13", "x":3, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
 
-                {"label":"k20", "x":0, "y":2.25},
-                {"label":"k21", "x":1, "y":2.25},
-                {"label":"k22", "x":2, "y":2.25},
-                {"label":"k23", "x":3, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
 
-                {"label":"k30", "x":0, "y":3.25},
-                {"label":"k31", "x":1, "y":3.25},
-                {"label":"k32", "x":2, "y":3.25},
-                {"label":"k33", "x":3, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
 
-                {"label":"k40", "x":0, "y":4.25},
-                {"label":"k41", "x":1, "y":4.25},
-                {"label":"k42", "x":2, "y":4.25},
-                {"label":"k43", "x":3, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
 
-                {"label":"k50", "x":0, "y":5.25},
-                {"label":"k51", "x":1, "y":5.25},
-                {"label":"k52", "x":2, "y":5.25},
-                {"label":"k53", "x":3, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.c b/keyboards/pearlboards/zeuspad/zeuspad.c
index ffa504fa63..c618289912 100644
--- a/keyboards/pearlboards/zeuspad/zeuspad.c
+++ b/keyboards/pearlboards/zeuspad/zeuspad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "zeuspad.h"
+#include "quantum.h"
 
 // 21 characters max
 #ifdef OLED_ENABLE
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.h b/keyboards/pearlboards/zeuspad/zeuspad.h
deleted file mode 100644
index ea52fd81cd..0000000000
--- a/keyboards/pearlboards/zeuspad/zeuspad.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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/>.
- */
-
-/*
- * This layout covers all of the possible build layouts. Also, any
- * built layouts will work without having to change anything.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53  \
-) { \
-    { k00,  k01,  k02,  k03}, \
-    { k10,  k11,  k12,  k13}, \
-    { k20,  k21,  k22,  k23}, \
-    { k30,  k31,  k32,  k33}, \
-    { k40,  k41,  k42,  k43}, \
-    { k50,  k51,  k52,  k53}  \
-}