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

12 files changed, 518 insertions, 831 deletions

diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index b447c4b58d..a2f6872090 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -34,94 +34,107 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"L06", "x":6, "y":0},
-                {"label":"R00", "x":7.5, "y":0},
-                {"label":"R01", "x":8.5, "y":0},
-                {"label":"R02", "x":9.5, "y":0},
-                {"label":"R03", "x":10.5, "y":0},
-                {"label":"R04", "x":11.5, "y":0},
-                {"label":"R05", "x":12.5, "y":0},
-                {"label":"R06", "x":13.5, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"L16", "x":6, "y":1},
-                {"label":"R10", "x":7.5, "y":1},
-                {"label":"R11", "x":8.5, "y":1},
-                {"label":"R12", "x":9.5, "y":1},
-                {"label":"R13", "x":10.5, "y":1},
-                {"label":"R14", "x":11.5, "y":1},
-                {"label":"R15", "x":12.5, "y":1},
-                {"label":"R16", "x":13.5, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"L26", "x":6, "y":2},
-                {"label":"R20", "x":7.5, "y":2},
-                {"label":"R21", "x":8.5, "y":2},
-                {"label":"R22", "x":9.5, "y":2},
-                {"label":"R23", "x":10.5, "y":2},
-                {"label":"R24", "x":11.5, "y":2},
-                {"label":"R25", "x":12.5, "y":2},
-                {"label":"R26", "x":13.5, "y":2},
-                {"label":"L30", "x":0, "y":3},
-                {"label":"L31", "x":1, "y":3},
-                {"label":"L32", "x":2, "y":3},
-                {"label":"L33", "x":3, "y":3},
-                {"label":"L34", "x":4, "y":3},
-                {"label":"L35", "x":5, "y":3},
-                {"label":"L36", "x":6, "y":3},
-                {"label":"R30", "x":7.5, "y":3},
-                {"label":"R21", "x":8.5, "y":3},
-                {"label":"R32", "x":9.5, "y":3},
-                {"label":"R33", "x":10.5, "y":3},
-                {"label":"R34", "x":11.5, "y":3},
-                {"label":"R35", "x":12.5, "y":3},
-                {"label":"R36", "x":13.5, "y":3},
-                {"label":"L40", "x":0, "y":4},
-                {"label":"L41", "x":1, "y":4},
-                {"label":"L42", "x":2, "y":4},
-                {"label":"L43", "x":3, "y":4},
-                {"label":"L44", "x":4, "y":4},
-                {"label":"L45", "x":5, "y":4},
-                {"label":"L46", "x":6, "y":4},
-                {"label":"R40", "x":7.5, "y":4},
-                {"label":"R41", "x":8.5, "y":4},
-                {"label":"R42", "x":9.5, "y":4},
-                {"label":"R43", "x":10.5, "y":4},
-                {"label":"R44", "x":11.5, "y":4},
-                {"label":"R45", "x":12.5, "y":4},
-                {"label":"R46", "x":13.5, "y":4},
-                {"label":"E00", "x":0, "y":5.5},
-                {"label":"E01", "x":1, "y":5.5},
-                {"label":"E10", "x":2, "y":5.5},
-                {"label":"E11", "x":3, "y":5.5},
-                {"label":"E20", "x":10.5, "y":5.5},
-                {"label":"E21", "x":11.5, "y":5.5},
-                {"label":"E30", "x":12.5, "y":5.5},
-                {"label":"E31", "x":13.5, "y":5.5},
-                {"label":"T00", "x":0, "y":6.5},
-                {"label":"T01", "x":1, "y":6.5},
-                {"label":"T02", "x":2, "y":6.5},
-                {"label":"T03", "x":3, "y":6.5},
-                {"label":"T04", "x":4, "y":6.5},
-                {"label":"T10", "x":9.5, "y":6.5},
-                {"label":"T11", "x":10.5, "y":6.5},
-                {"label":"T12", "x":11.5, "y":6.5},
-                {"label":"T13", "x":12.5, "y":6.5},
-                {"label":"T14", "x":13.5, "y":6.5}
+                {"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": [7, 6], "x": 7.5, "y": 0},
+                {"matrix": [7, 5], "x": 8.5, "y": 0},
+                {"matrix": [7, 4], "x": 9.5, "y": 0},
+                {"matrix": [7, 3], "x": 10.5, "y": 0},
+                {"matrix": [7, 2], "x": 11.5, "y": 0},
+                {"matrix": [7, 1], "x": 12.5, "y": 0},
+                {"matrix": [7, 0], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+
+                {"matrix": [8, 6], "x": 7.5, "y": 1},
+                {"matrix": [8, 5], "x": 8.5, "y": 1},
+                {"matrix": [8, 4], "x": 9.5, "y": 1},
+                {"matrix": [8, 3], "x": 10.5, "y": 1},
+                {"matrix": [8, 2], "x": 11.5, "y": 1},
+                {"matrix": [8, 1], "x": 12.5, "y": 1},
+                {"matrix": [8, 0], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+
+                {"matrix": [9, 6], "x": 7.5, "y": 2},
+                {"matrix": [9, 5], "x": 8.5, "y": 2},
+                {"matrix": [9, 4], "x": 9.5, "y": 2},
+                {"matrix": [9, 3], "x": 10.5, "y": 2},
+                {"matrix": [9, 2], "x": 11.5, "y": 2},
+                {"matrix": [9, 1], "x": 12.5, "y": 2},
+                {"matrix": [9, 0], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+
+                {"matrix": [10, 6], "x": 7.5, "y": 3},
+                {"matrix": [10, 5], "x": 8.5, "y": 3},
+                {"matrix": [10, 4], "x": 9.5, "y": 3},
+                {"matrix": [10, 3], "x": 10.5, "y": 3},
+                {"matrix": [10, 2], "x": 11.5, "y": 3},
+                {"matrix": [10, 1], "x": 12.5, "y": 3},
+                {"matrix": [10, 0], "x": 13.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+
+                {"matrix": [11, 6], "x": 7.5, "y": 4},
+                {"matrix": [11, 5], "x": 8.5, "y": 4},
+                {"matrix": [11, 4], "x": 9.5, "y": 4},
+                {"matrix": [11, 3], "x": 10.5, "y": 4},
+                {"matrix": [11, 2], "x": 11.5, "y": 4},
+                {"matrix": [11, 1], "x": 12.5, "y": 4},
+                {"matrix": [11, 0], "x": 13.5, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2, "y": 5.5},
+                {"matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"matrix": [12, 0], "x": 10.5, "y": 5.5},
+                {"matrix": [12, 1], "x": 11.5, "y": 5.5},
+                {"matrix": [12, 2], "x": 12.5, "y": 5.5},
+                {"matrix": [12, 3], "x": 13.5, "y": 5.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 6.5},
+                {"matrix": [6, 1], "x": 1, "y": 6.5},
+                {"matrix": [6, 2], "x": 2, "y": 6.5},
+                {"matrix": [6, 3], "x": 3, "y": 6.5},
+                {"matrix": [6, 4], "x": 4, "y": 6.5},
+
+                {"matrix": [13, 0], "x": 9.5, "y": 6.5},
+                {"matrix": [13, 1], "x": 10.5, "y": 6.5},
+                {"matrix": [13, 2], "x": 11.5, "y": 6.5},
+                {"matrix": [13, 3], "x": 12.5, "y": 6.5},
+                {"matrix": [13, 4], "x": 13.5, "y": 6.5}
             ]
         }
     }
diff --git a/keyboards/rgbkb/mun/rev1/rev1.h b/keyboards/rgbkb/mun/rev1/rev1.h
index 8e7b65f45c..291428c0fb 100644
--- a/keyboards/rgbkb/mun/rev1/rev1.h
+++ b/keyboards/rgbkb/mun/rev1/rev1.h
@@ -11,33 +11,3 @@
 
 #include "mun.h"
 #include "touch_encoder.h"
-
-// clang-format off
-#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, L26, R20, 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, \
-    E00, E01, E10, E11,                               E20, E21, E30, E31, \
-    T00, T01, T02, T03, T04,                     T10, T11, T12, T13, T14 \
-) \
-{ \
-    /* Left Half */ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { E00, E01, E10, E11, KC_NO, KC_NO, KC_NO }, \
-    { T00, T01, T02, T03, T04,   KC_NO, KC_NO }, \
-    /* Right Half */ \
-    { R06, R05, R04, R03, R02, R01, R00 }, \
-    { R16, R15, R14, R13, R12, R11, R10 }, \
-    { R26, R25, R24, R23, R22, R21, R20 }, \
-    { R36, R35, R34, R33, R32, R31, R30 }, \
-    { R46, R45, R44, R43, R42, R41, R40 },  \
-    { E20, E21, E30, E31, KC_NO, KC_NO, KC_NO }, \
-    { T10, T11, T12, T13, T14,   KC_NO, KC_NO } \
-}
-// clang-format on
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index b93857eb51..b0b8fc12d0 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -32,80 +32,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0, "w":1.5},
-                {"label":"L01", "x":1.5, "y":0},
-                {"label":"L02", "x":2.5, "y":0},
-                {"label":"L03", "x":3.5, "y":0},
-                {"label":"L04", "x":4.5, "y":0},
-                {"label":"L05", "x":5.5, "y":0},
-                {"label":"L06", "x":6.75, "y":0},
-                {"label":"R06", "x":9.25, "y":0},
-                {"label":"R00", "x":10.5, "y":0},
-                {"label":"R01", "x":11.5, "y":0},
-                {"label":"R02", "x":12.5, "y":0},
-                {"label":"R03", "x":13.5, "y":0},
-                {"label":"R04", "x":14.5, "y":0},
-                {"label":"R05", "x":15.5, "y":0, "w":1.5},
-                {"label":"L10", "x":0, "y":1, "w":1.5},
-                {"label":"L11", "x":1.5, "y":1},
-                {"label":"L12", "x":2.5, "y":1},
-                {"label":"L13", "x":3.5, "y":1},
-                {"label":"L14", "x":4.5, "y":1},
-                {"label":"L15", "x":5.5, "y":1},
-                {"label":"L16", "x":6.75, "y":1},
-                {"label":"R16", "x":9.25, "y":1},
-                {"label":"R10", "x":10.5, "y":1},
-                {"label":"R11", "x":11.5, "y":1},
-                {"label":"R12", "x":12.5, "y":1},
-                {"label":"R13", "x":13.5, "y":1},
-                {"label":"R14", "x":14.5, "y":1},
-                {"label":"R15", "x":15.5, "y":1, "w":1.5},
-                {"label":"L20", "x":0, "y":2, "w":1.5},
-                {"label":"L21", "x":1.5, "y":2},
-                {"label":"L22", "x":2.5, "y":2},
-                {"label":"L23", "x":3.5, "y":2},
-                {"label":"L24", "x":4.5, "y":2},
-                {"label":"L25", "x":5.5, "y":2},
-                {"label":"L26", "x":6.75, "y":2},
-                {"label":"R26", "x":9.25, "y":2},
-                {"label":"R20", "x":10.5, "y":2},
-                {"label":"R21", "x":11.5, "y":2},
-                {"label":"R22", "x":12.5, "y":2},
-                {"label":"R23", "x":13.5, "y":2},
-                {"label":"R24", "x":14.5, "y":2},
-                {"label":"R25", "x":15.5, "y":2, "w":1.5},
-                {"label":"L30", "x":0, "y":3, "w":1.5},
-                {"label":"L31", "x":1.5, "y":3},
-                {"label":"L32", "x":2.5, "y":3},
-                {"label":"L33", "x":3.5, "y":3},
-                {"label":"L34", "x":4.5, "y":3},
-                {"label":"L35", "x":5.5, "y":3},
-                {"label":"L36", "x":6.75, "y":3},
-                {"label":"R36", "x":9.25, "y":3},
-                {"label":"R30", "x":10.5, "y":3},
-                {"label":"R31", "x":11.5, "y":3},
-                {"label":"R32", "x":12.5, "y":3},
-                {"label":"R33", "x":13.5, "y":3},
-                {"label":"R34", "x":14.5, "y":3},
-                {"label":"R35", "x":15.5, "y":3, "w":1.5},
-                {"label":"L40", "x":0, "y":4, "w":1.5},
-                {"label":"L41", "x":1.5, "y":4},
-                {"label":"L42", "x":2.5, "y":4},
-                {"label":"L43", "x":3.5, "y":4},
-                {"label":"L44", "x":4.5, "y":4},
-                {"label":"L45", "x":6, "y":4.5},
-                {"label":"L46", "x":7, "y":4.5},
-                {"label":"R46", "x":9, "y":4.5},
-                {"label":"R40", "x":10, "y":4.5},
-                {"label":"R41", "x":11.5, "y":4},
-                {"label":"R42", "x":12.5, "y":4},
-                {"label":"R43", "x":13.5, "y":4},
-                {"label":"R44", "x":14.5, "y":4},
-                {"label":"R45", "x":15.5, "y":4, "w":1.5},
-                {"label":"L55", "x":6, "y":5.5},
-                {"label":"L56", "x":7, "y":5.5},
-                {"label":"R56", "x":9, "y":5.5},
-                {"label":"R50", "x":10, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+                {"matrix": [6, 6], "x": 9.25, "y": 0},
+                {"matrix": [6, 5], "x": 10.5, "y": 0},
+                {"matrix": [6, 4], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0},
+                {"matrix": [6, 1], "x": 14.5, "y": 0},
+                {"matrix": [6, 0], "x": 15.5, "y": 0, "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.75, "y": 1},
+
+                {"matrix": [7, 6], "x": 9.25, "y": 1},
+                {"matrix": [7, 5], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1},
+                {"matrix": [7, 1], "x": 14.5, "y": 1},
+                {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+
+                {"matrix": [8, 6], "x": 9.25, "y": 2},
+                {"matrix": [8, 5], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2},
+                {"matrix": [8, 1], "x": 14.5, "y": 2},
+                {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [9, 5], "x": 10.5, "y": 3},
+                {"matrix": [9, 4], "x": 11.5, "y": 3},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 1], "x": 14.5, "y": 3},
+                {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"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},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4.5},
+                {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+                {"matrix": [10, 6], "x": 9, "y": 4.5},
+                {"matrix": [10, 5], "x": 10, "y": 4.5},
+                {"matrix": [10, 4], "x": 11.5, "y": 4},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4},
+                {"matrix": [10, 1], "x": 14.5, "y": 4},
+                {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+                {"matrix": [5, 5], "x": 6, "y": 5.5},
+                {"matrix": [5, 6], "x": 7, "y": 5.5},
+
+                {"matrix": [11, 6], "x": 9, "y": 5.5},
+                {"matrix": [11, 5], "x": 10, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 2daee64be4..1eec8a3930 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -27,80 +27,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0, "w":1.5},
-                {"label":"L01", "x":1.5, "y":0},
-                {"label":"L02", "x":2.5, "y":0},
-                {"label":"L03", "x":3.5, "y":0},
-                {"label":"L04", "x":4.5, "y":0},
-                {"label":"L05", "x":5.5, "y":0},
-                {"label":"L06", "x":6.75, "y":0},
-                {"label":"R06", "x":9.25, "y":0},
-                {"label":"R00", "x":10.5, "y":0},
-                {"label":"R01", "x":11.5, "y":0},
-                {"label":"R02", "x":12.5, "y":0},
-                {"label":"R03", "x":13.5, "y":0},
-                {"label":"R04", "x":14.5, "y":0},
-                {"label":"R05", "x":15.5, "y":0, "w":1.5},
-                {"label":"L10", "x":0, "y":1, "w":1.5},
-                {"label":"L11", "x":1.5, "y":1},
-                {"label":"L12", "x":2.5, "y":1},
-                {"label":"L13", "x":3.5, "y":1},
-                {"label":"L14", "x":4.5, "y":1},
-                {"label":"L15", "x":5.5, "y":1},
-                {"label":"L16", "x":6.75, "y":1},
-                {"label":"R16", "x":9.25, "y":1},
-                {"label":"R10", "x":10.5, "y":1},
-                {"label":"R11", "x":11.5, "y":1},
-                {"label":"R12", "x":12.5, "y":1},
-                {"label":"R13", "x":13.5, "y":1},
-                {"label":"R14", "x":14.5, "y":1},
-                {"label":"R15", "x":15.5, "y":1, "w":1.5},
-                {"label":"L20", "x":0, "y":2, "w":1.5},
-                {"label":"L21", "x":1.5, "y":2},
-                {"label":"L22", "x":2.5, "y":2},
-                {"label":"L23", "x":3.5, "y":2},
-                {"label":"L24", "x":4.5, "y":2},
-                {"label":"L25", "x":5.5, "y":2},
-                {"label":"L26", "x":6.75, "y":2},
-                {"label":"R26", "x":9.25, "y":2},
-                {"label":"R20", "x":10.5, "y":2},
-                {"label":"R21", "x":11.5, "y":2},
-                {"label":"R22", "x":12.5, "y":2},
-                {"label":"R23", "x":13.5, "y":2},
-                {"label":"R24", "x":14.5, "y":2},
-                {"label":"R25", "x":15.5, "y":2, "w":1.5},
-                {"label":"L30", "x":0, "y":3, "w":1.5},
-                {"label":"L31", "x":1.5, "y":3},
-                {"label":"L32", "x":2.5, "y":3},
-                {"label":"L33", "x":3.5, "y":3},
-                {"label":"L34", "x":4.5, "y":3},
-                {"label":"L35", "x":5.5, "y":3},
-                {"label":"L36", "x":6.75, "y":3},
-                {"label":"R36", "x":9.25, "y":3},
-                {"label":"R30", "x":10.5, "y":3},
-                {"label":"R31", "x":11.5, "y":3},
-                {"label":"R32", "x":12.5, "y":3},
-                {"label":"R33", "x":13.5, "y":3},
-                {"label":"R34", "x":14.5, "y":3},
-                {"label":"R35", "x":15.5, "y":3, "w":1.5},
-                {"label":"L40", "x":0, "y":4, "w":1.5},
-                {"label":"L41", "x":1.5, "y":4},
-                {"label":"L42", "x":2.5, "y":4},
-                {"label":"L43", "x":3.5, "y":4},
-                {"label":"L44", "x":4.5, "y":4},
-                {"label":"L45", "x":6, "y":4.5},
-                {"label":"L46", "x":7, "y":4.5},
-                {"label":"R46", "x":9, "y":4.5},
-                {"label":"R40", "x":10, "y":4.5},
-                {"label":"R41", "x":11.5, "y":4},
-                {"label":"R42", "x":12.5, "y":4},
-                {"label":"R43", "x":13.5, "y":4},
-                {"label":"R44", "x":14.5, "y":4},
-                {"label":"R45", "x":15.5, "y":4, "w":1.5},
-                {"label":"L55", "x":6, "y":5.5},
-                {"label":"L56", "x":7, "y":5.5},
-                {"label":"R56", "x":9, "y":5.5},
-                {"label":"R50", "x":10, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+                {"matrix": [6, 6], "x": 9.25, "y": 0},
+                {"matrix": [6, 5], "x": 10.5, "y": 0},
+                {"matrix": [6, 4], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0},
+                {"matrix": [6, 1], "x": 14.5, "y": 0},
+                {"matrix": [6, 0], "x": 15.5, "y": 0, "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.75, "y": 1},
+
+                {"matrix": [7, 6], "x": 9.25, "y": 1},
+                {"matrix": [7, 5], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1},
+                {"matrix": [7, 1], "x": 14.5, "y": 1},
+                {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+
+                {"matrix": [8, 6], "x": 9.25, "y": 2},
+                {"matrix": [8, 5], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2},
+                {"matrix": [8, 1], "x": 14.5, "y": 2},
+                {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [9, 5], "x": 10.5, "y": 3},
+                {"matrix": [9, 4], "x": 11.5, "y": 3},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 1], "x": 14.5, "y": 3},
+                {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"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},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4.5},
+                {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+                {"matrix": [10, 6], "x": 9, "y": 4.5},
+                {"matrix": [10, 5], "x": 10, "y": 4.5},
+                {"matrix": [10, 4], "x": 11.5, "y": 4},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4},
+                {"matrix": [10, 1], "x": 14.5, "y": 4},
+                {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+                {"matrix": [5, 5], "x": 6, "y": 5.5},
+                {"matrix": [5, 6], "x": 7, "y": 5.5},
+
+                {"matrix": [11, 6], "x": 9, "y": 5.5},
+                {"matrix": [11, 5], "x": 10, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index 695dc6db61..2cab481044 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -2,29 +2,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15, L16, R16, R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
-  L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45, \
-                           L55, L56, R56, R50 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55, L56 }, \
-    { R05, R04, R03, R02, R01, R00, R06 }, \
-    { R15, R14, R13, R12, R11, R10, R16 }, \
-    { R25, R24, R23, R22, R21, R20, R26 }, \
-    { R35, R34, R33, R32, R31, R30, R36 }, \
-    { R45, R44, R43, R42, R41, R40, R46 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R50, R56 } \
-  }
-
 #define ENCODER_LAYOUT( \
   E10, E11, \
   E20, E21 \
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 3dd7404c44..74af9d21fa 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -50,113 +50,113 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "w":1.5},
-                {"x":1.5, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.75, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
 
-                {"x":9.25, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0, "w":1.5},
+                {"matrix": [6, 6], "x": 9.25, "y": 0},
+                {"matrix": [6, 5], "x": 10.5, "y": 0},
+                {"matrix": [6, 4], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0},
+                {"matrix": [6, 1], "x": 14.5, "y": 0},
+                {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.75, "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.75, "y": 1},
 
-                {"x":9.25, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1},
-                {"x":14.5, "y":1},
-                {"x":15.5, "y":1, "w":1.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 1},
+                {"matrix": [7, 5], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1},
+                {"matrix": [7, 1], "x": 14.5, "y": 1},
+                {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
 
-                {"x":0, "y":2, "w":1.5},
-                {"x":1.5, "y":2},
-                {"x":2.5, "y":2},
-                {"x":3.5, "y":2},
-                {"x":4.5, "y":2},
-                {"x":5.5, "y":2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
 
-                {"x":9.25, "y":2},
-                {"x":10.5, "y":2},
-                {"x":11.5, "y":2},
-                {"x":12.5, "y":2},
-                {"x":13.5, "y":2},
-                {"x":14.5, "y":2},
-                {"x":15.5, "y":2, "w":1.5},
+                {"matrix": [8, 6], "x": 9.25, "y": 2},
+                {"matrix": [8, 5], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2},
+                {"matrix": [8, 1], "x": 14.5, "y": 2},
+                {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
 
-                {"x":0, "y":3, "w":1.5},
-                {"x":1.5, "y":3},
-                {"x":2.5, "y":3},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3},
-                {"x":5.5, "y":3},
-                {"x":6.75, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
 
-                {"x":9.25, "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, "w":1.5},
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [9, 5], "x": 10.5, "y": 3},
+                {"matrix": [9, 4], "x": 11.5, "y": 3},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 1], "x": 14.5, "y": 3},
+                {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4},
-                {"x":3.5, "y":4},
-                {"x":4.5, "y":4},
-                {"x":6, "y":4.5, "h":2},
-                {"x":7, "y":4.5},
-                {"x":7, "y":5.5},
+                {"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},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2},
+                {"matrix": [4, 6], "x": 7, "y": 4.5},
+                {"matrix": [4, 7], "x": 7, "y": 5.5},
 
-                {"x":9, "y":5.5},
-                {"x":9, "y":4.5},
-                {"x":10, "y":4.5, "h":2},
-                {"x":11.5, "y":4},
-                {"x":12.5, "y":4},
-                {"x":13.5, "y":4},
-                {"x":14.5, "y":4},
-                {"x":15.5, "y":4, "w":1.5},
+                {"matrix": [10, 7], "x": 9, "y": 5.5},
+                {"matrix": [10, 6], "x": 9, "y": 4.5},
+                {"matrix": [10, 5], "x": 10, "y": 4.5, "h": 2},
+                {"matrix": [10, 4], "x": 11.5, "y": 4},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4},
+                {"matrix": [10, 1], "x": 14.5, "y": 4},
+                {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
 
-                {"x":0, "y":7, "w":0.8, "h":0.8},
-                {"x":0.8, "y":7, "w":0.8, "h":0.8},
-                {"x":1.6, "y":7, "w":0.8, "h":0.8},
-                {"x":2.4, "y":7, "w":0.8, "h":0.8},
-                {"x":3.2, "y":7, "w":0.8, "h":0.8},
-                {"x":4, "y":7, "w":0.8, "h":0.8},
+                {"matrix": [5, 0], "x": 0, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 1], "x": 0.8, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 2], "x": 1.6, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 3], "x": 2.4, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 4], "x": 3.2, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 5], "x": 4, "y": 7, "w": 0.8, "h": 0.8},
 
-                {"x":12.2, "y":7, "w":0.8, "h":0.8},
-                {"x":13, "y":7, "w":0.8, "h":0.8},
-                {"x":13.8, "y":7, "w":0.8, "h":0.8},
-                {"x":14.6, "y":7, "w":0.8, "h":0.8},
-                {"x":15.4, "y":7, "w":0.8, "h":0.8},
-                {"x":16.2, "y":7, "w":0.8, "h":0.8},
+                {"matrix": [11, 0], "x": 12.2, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 1], "x": 13, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 2], "x": 13.8, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 3], "x": 14.6, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 4], "x": 15.4, "y": 7, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 5], "x": 16.2, "y": 7, "w": 0.8, "h": 0.8},
 
-                {"x":0, "y":7.8, "w":0.8, "h":0.8},
-                {"x":0.8, "y":7.8, "w":0.8, "h":0.8},
-                {"x":1.6, "y":7.8, "w":0.8, "h":0.8},
-                {"x":2.4, "y":7.8, "w":0.8, "h":0.8},
-                {"x":3.2, "y":7.8, "w":0.8, "h":0.8},
+                {"matrix": [0, 7], "x": 0, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [1, 7], "x": 0.8, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [2, 7], "x": 1.6, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 6], "x": 2.4, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [5, 7], "x": 3.2, "y": 7.8, "w": 0.8, "h": 0.8},
 
-                {"x":13, "y":7.8, "w":0.8, "h":0.8},
-                {"x":13.8, "y":7.8, "w":0.8, "h":0.8},
-                {"x":14.6, "y":7.8, "w":0.8, "h":0.8},
-                {"x":15.4, "y":7.8, "w":0.8, "h":0.8},
-                {"x":16.2, "y":7.8, "w":0.8, "h":0.8}
+                {"matrix": [6, 7], "x": 13, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [7, 7], "x": 13.8, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [8, 7], "x": 14.6, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 6], "x": 15.4, "y": 7.8, "w": 0.8, "h": 0.8},
+                {"matrix": [11, 7], "x": 16.2, "y": 7.8, "w": 0.8, "h": 0.8}
             ]
         }
     }
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.h b/keyboards/rgbkb/sol3/rev1/rev1.h
index e80f8c298d..2ed720fcc3 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.h
+++ b/keyboards/rgbkb/sol3/rev1/rev1.h
@@ -11,57 +11,6 @@
 
 #include "sol3.h"
 
-// clang-format off
-/* Blank ascii map to reuse, with labeled possible encoder positions, *rgb encoder only
-┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-│      │      │      │      │      │      │  E2  │  │  E5  │      │      │      │      │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │      │  │      │      │      │      │      │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │      │  │      │      │      │      │      │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │  E2  │  │  E5  │      │      │      │      │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │  E1  │  E1  │      │  E0* │  │  E3* │      │  E4  │  E4  │      │      │      │
-└──────┴──────┴──────┴──────┴──────┤      ├──────┤  ├──────┤      ├──────┴──────┴──────┴──────┴──────┘
-                                   │      │  E0  │  │  E3  │      │
-                                   └──────┴──────┘  └──────┴──────┘
-┌──────┬──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│  E0↑ │  E0↓ │  E1↑ │  E1↓ │  E2↑ │  E2↓ │                │  E3↑ │  E3↓ │  E4↑ │  E4↓ │  E5↑ │  E5↓ │
-└──────┴──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┴──────┘
-┌──────┬──────┬──────┬──────┬──────┐                              ┌──────┬──────┬──────┬──────┬──────┐
-│      │      │      │      │      │                              │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┘                              └──────┴──────┴──────┴──────┴──────┘
-*/
-
-#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, L26,           R20, 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, L47, R40, R41, R42, R43, R44, R45, R46, R47, \
-    \
-    E0L, E0R, E1L, E1R, E2L, E2R,                     E3L, E3R, E4L, E4R, E5L, E5R, \
-    LT0, LT1, LT2, LSL, LSR,                               RT0, RT1, RT2, RSL, RSR \
-) \
-{ \
-    /* Left Half */ \
-    { L00, L01, L02, L03, L04, L05, L06, LT0   }, \
-    { L10, L11, L12, L13, L14, L15, L16, LT1   }, \
-    { L20, L21, L22, L23, L24, L25, L26, LT2   }, \
-    { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47   }, \
-    { E0L, E0R, E1L, E1R, E2L, E2R, LSL, LSR   }, \
-    /* Right Half */ \
-    { R06, R05, R04, R03, R02, R01, R00, RT0   }, \
-    { R16, R15, R14, R13, R12, R11, R10, RT1   }, \
-    { R26, R25, R24, R23, R22, R21, R20, RT2   }, \
-    { R36, R35, R34, R33, R32, R31, R30, KC_NO }, \
-    { R47, R46, R45, R44, R43, R42, R41, R40   }, \
-    { E3L, E3R, E4L, E4R, E5L, E5R, RSL, RSR   } \
-}
-// clang-format on
-
 // weak functions overridable by the user
 void render_layer_status(void);
 void render_leds_status(void);
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 013b56764f..940df081c9 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -23,7 +23,79 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "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":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0.5, "y": 0},
+        {"matrix": [0, 1], "x": 1.5, "y": 0},
+        {"matrix": [0, 2], "x": 2.5, "y": 0},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0},
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+        {"matrix": [5, 5], "x": 10.5, "y": 0},
+        {"matrix": [5, 4], "x": 11.5, "y": 0},
+        {"matrix": [5, 3], "x": 12.5, "y": 0},
+        {"matrix": [5, 2], "x": 13.5, "y": 0},
+        {"matrix": [5, 1], "x": 14.5, "y": 0},
+        {"matrix": [5, 0], "x": 15.5, "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": [6, 5], "x": 10.5, "y": 1},
+        {"matrix": [6, 4], "x": 11.5, "y": 1},
+        {"matrix": [6, 3], "x": 12.5, "y": 1},
+        {"matrix": [6, 2], "x": 13.5, "y": 1},
+        {"matrix": [6, 1], "x": 14.5, "y": 1},
+        {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [7, 5], "x": 10.5, "y": 2},
+        {"matrix": [7, 4], "x": 11.5, "y": 2},
+        {"matrix": [7, 3], "x": 12.5, "y": 2},
+        {"matrix": [7, 2], "x": 13.5, "y": 2},
+        {"matrix": [7, 1], "x": 14.5, "y": 2},
+        {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3},
+        {"matrix": [3, 2], "x": 2.5, "y": 3},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+
+        {"matrix": [8, 5], "x": 10.5, "y": 3},
+        {"matrix": [8, 4], "x": 11.5, "y": 3},
+        {"matrix": [8, 3], "x": 12.5, "y": 3},
+        {"matrix": [8, 2], "x": 13.5, "y": 3},
+        {"matrix": [8, 1], "x": 14.5, "y": 3},
+        {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+        {"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},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4},
+        {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2},
+        {"matrix": [4, 6], "x": 7, "y": 4.5, "h": 2},
+
+        {"matrix": [9, 6], "x": 9, "y": 4.5, "h": 2},
+        {"matrix": [9, 5], "x": 10, "y": 4.5, "h": 2},
+        {"matrix": [9, 4], "x": 11.5, "y": 4},
+        {"matrix": [9, 3], "x": 12.5, "y": 4},
+        {"matrix": [9, 2], "x": 13.5, "y": 4},
+        {"matrix": [9, 1], "x": 14.5, "y": 4},
+        {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5}
+      ]
     }
   }
 }
diff --git a/keyboards/rgbkb/zen/rev1/rev1.h b/keyboards/rgbkb/zen/rev1/rev1.h
deleted file mode 100644
index 3b437c459c..0000000000
--- a/keyboards/rgbkb/zen/rev1/rev1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,               k55, k54, k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15,               k65, k64, k63, k62, k61, k60, \
-    k20, k21, k22, k23, k24, k25,               k75, k74, k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35,               k85, k84, k83, k82, k81, k80, \
-    k40, k41, k42, k43, k44, k45, k46,   k96,   k95, k94, k93, k92, k91, k90 \
-    ) \
-    { \
-        { k00, k01, k02, k03, k04, k05, KC_NO }, \
-        { k10, k11, k12, k13, k14, k15, KC_NO }, \
-        { k20, k21, k22, k23, k24, k25, KC_NO }, \
-        { k30, k31, k32, k33, k34, k35, KC_NO }, \
-        { k40, k41, k42, k43, k44, k45, k46 }, \
-        { k50, k51, k52, k53, k54, k55, KC_NO }, \
-        { k60, k61, k62, k63, k64, k65, KC_NO }, \
-        { k70, k71, k72, k73, k74, k75, KC_NO }, \
-        { k80, k81, k82, k83, k84, k85, KC_NO }, \
-        { k90, k91, k92, k93, k94, k95, k96 } \
-    }
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index ef91fd30d1..eed39e5628 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -29,354 +29,85 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {
-            "label": "k00",
-            "x": 0.5,
-            "y": 0
-          },
-          {
-            "label": "k01",
-            "x": 1.5,
-            "y": 0
-          },
-          {
-            "label": "k02",
-            "x": 2.5,
-            "y": 0
-          },
-          {
-            "label": "k03",
-            "x": 3.5,
-            "y": 0
-          },
-          {
-            "label": "k04",
-            "x": 4.5,
-            "y": 0
-          },
-          {
-            "label": "k05",
-            "x": 5.5,
-            "y": 0
-          },
-          {
-            "label": "k55",
-            "x": 10.5,
-            "y": 0
-          },
-          {
-            "label": "k54",
-            "x": 11.5,
-            "y": 0
-          },
-          {
-            "label": "k53",
-            "x": 12.5,
-            "y": 0
-          },
-          {
-            "label": "k52",
-            "x": 13.5,
-            "y": 0
-          },
-          {
-            "label": "k51",
-            "x": 14.5,
-            "y": 0
-          },
-          {
-            "label": "k50",
-            "x": 15.5,
-            "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": "k65",
-            "x": 10.5,
-            "y": 1
-          },
-          {
-            "label": "k64",
-            "x": 11.5,
-            "y": 1
-          },
-          {
-            "label": "k63",
-            "x": 12.5,
-            "y": 1
-          },
-          {
-            "label": "k62",
-            "x": 13.5,
-            "y": 1
-          },
-          {
-            "label": "k61",
-            "x": 14.5,
-            "y": 1
-          },
-          {
-            "label": "k60",
-            "x": 15.5,
-            "y": 1,
-            "w": 1.5
-          },
-          {
-            "label": "k20",
-            "x": 0,
-            "y": 2,
-            "w": 1.5
-          },
-          {
-            "label": "k21",
-            "x": 1.5,
-            "y": 2
-          },
-          {
-            "label": "k22",
-            "x": 2.5,
-            "y": 2
-          },
-          {
-            "label": "k23",
-            "x": 3.5,
-            "y": 2
-          },
-          {
-            "label": "k24",
-            "x": 4.5,
-            "y": 2
-          },
-          {
-            "label": "k25",
-            "x": 5.5,
-            "y": 2
-          },
-          {
-            "label": "k75",
-            "x": 10.5,
-            "y": 2
-          },
-          {
-            "label": "k74",
-            "x": 11.5,
-            "y": 2
-          },
-          {
-            "label": "k73",
-            "x": 12.5,
-            "y": 2
-          },
-          {
-            "label": "k72",
-            "x": 13.5,
-            "y": 2
-          },
-          {
-            "label": "k71",
-            "x": 14.5,
-            "y": 2
-          },
-          {
-            "label": "k70",
-            "x": 15.5,
-            "y": 2,
-            "w": 1.5
-          },
-          {
-            "label": "k30",
-            "x": 0,
-            "y": 3,
-            "w": 1.5
-          },
-          {
-            "label": "k31",
-            "x": 1.5,
-            "y": 3
-          },
-          {
-            "label": "k32",
-            "x": 2.5,
-            "y": 3
-          },
-          {
-            "label": "k33",
-            "x": 3.5,
-            "y": 3
-          },
-          {
-            "label": "k34",
-            "x": 4.5,
-            "y": 3
-          },
-          {
-            "label": "k35",
-            "x": 5.5,
-            "y": 3
-          },
-          {
-            "label": "k16",
-            "x": 6.5,
-            "y": 3
-          },
-          {
-            "label": "k66",
-            "x": 9.5,
-            "y": 3
-          },
-          {
-            "label": "k85",
-            "x": 10.5,
-            "y": 3
-          },
-          {
-            "label": "k84",
-            "x": 11.5,
-            "y": 3
-          },
-          {
-            "label": "k83",
-            "x": 12.5,
-            "y": 3
-          },
-          {
-            "label": "k82",
-            "x": 13.5,
-            "y": 3
-          },
-          {
-            "label": "k81",
-            "x": 14.5,
-            "y": 3
-          },
-          {
-            "label": "k80",
-            "x": 15.5,
-            "y": 3,
-            "w": 1.5
-          },
-          {
-            "label": "k40",
-            "x": 0,
-            "y": 4,
-            "w": 1.5
-          },
-          {
-            "label": "k41",
-            "x": 1.5,
-            "y": 4
-          },
-          {
-            "label": "k42",
-            "x": 2.5,
-            "y": 4
-          },
-          {
-            "label": "k43",
-            "x": 3.5,
-            "y": 4
-          },
-          {
-            "label": "k44",
-            "x": 4.5,
-            "y": 4
-          },
-          {
-            "label": "k36",
-            "x": 6,
-            "y": 4.5
-          },
-          {
-            "label": "k26",
-            "x": 7,
-            "y": 4.5
-          },
-          {
-            "label": "k76",
-            "x": 9,
-            "y": 4.5
-          },
-          {
-            "label": "k86",
-            "x": 10,
-            "y": 4.5
-          },
-          {
-            "label": "k94",
-            "x": 11.5,
-            "y": 4
-          },
-          {
-            "label": "k93",
-            "x": 12.5,
-            "y": 4
-          },
-          {
-            "label": "k92",
-            "x": 13.5,
-            "y": 4
-          },
-          {
-            "label": "k91",
-            "x": 14.5,
-            "y": 4
-          },
-          {
-            "label": "k90",
-            "x": 15.5,
-            "y": 4,
-            "w": 1.5
-          },
-          {
-            "label": "k45",
-            "x": 6,
-            "y": 5.5
-          },
-          {
-            "label": "k46",
-            "x": 7,
-            "y": 5.5
-          },
-          {
-            "label": "k96",
-            "x": 9,
-            "y": 5.5
-          },
-          {
-            "label": "k95",
-            "x": 10,
-            "y": 5.5
-          }
+          {"matrix": [0, 0], "x": 0.5, "y": 0},
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+          {"matrix": [0, 3], "x": 3.5, "y": 0},
+          {"matrix": [0, 4], "x": 4.5, "y": 0},
+          {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+          {"matrix": [5, 5], "x": 10.5, "y": 0},
+          {"matrix": [5, 4], "x": 11.5, "y": 0},
+          {"matrix": [5, 3], "x": 12.5, "y": 0},
+          {"matrix": [5, 2], "x": 13.5, "y": 0},
+          {"matrix": [5, 1], "x": 14.5, "y": 0},
+          {"matrix": [5, 0], "x": 15.5, "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": [6, 5], "x": 10.5, "y": 1},
+          {"matrix": [6, 4], "x": 11.5, "y": 1},
+          {"matrix": [6, 3], "x": 12.5, "y": 1},
+          {"matrix": [6, 2], "x": 13.5, "y": 1},
+          {"matrix": [6, 1], "x": 14.5, "y": 1},
+          {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2},
+          {"matrix": [2, 2], "x": 2.5, "y": 2},
+          {"matrix": [2, 3], "x": 3.5, "y": 2},
+          {"matrix": [2, 4], "x": 4.5, "y": 2},
+          {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+          {"matrix": [7, 5], "x": 10.5, "y": 2},
+          {"matrix": [7, 4], "x": 11.5, "y": 2},
+          {"matrix": [7, 3], "x": 12.5, "y": 2},
+          {"matrix": [7, 2], "x": 13.5, "y": 2},
+          {"matrix": [7, 1], "x": 14.5, "y": 2},
+          {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3},
+          {"matrix": [3, 2], "x": 2.5, "y": 3},
+          {"matrix": [3, 3], "x": 3.5, "y": 3},
+          {"matrix": [3, 4], "x": 4.5, "y": 3},
+          {"matrix": [3, 5], "x": 5.5, "y": 3},
+          {"matrix": [1, 6], "x": 6.5, "y": 3},
+
+          {"matrix": [6, 6], "x": 9.5, "y": 3},
+          {"matrix": [8, 5], "x": 10.5, "y": 3},
+          {"matrix": [8, 4], "x": 11.5, "y": 3},
+          {"matrix": [8, 3], "x": 12.5, "y": 3},
+          {"matrix": [8, 2], "x": 13.5, "y": 3},
+          {"matrix": [8, 1], "x": 14.5, "y": 3},
+          {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+          {"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},
+          {"matrix": [4, 3], "x": 3.5, "y": 4},
+          {"matrix": [4, 4], "x": 4.5, "y": 4},
+
+          {"matrix": [3, 6], "x": 6, "y": 4.5},
+          {"matrix": [2, 6], "x": 7, "y": 4.5},
+          {"matrix": [7, 6], "x": 9, "y": 4.5},
+          {"matrix": [8, 6], "x": 10, "y": 4.5},
+
+          {"matrix": [9, 4], "x": 11.5, "y": 4},
+          {"matrix": [9, 3], "x": 12.5, "y": 4},
+          {"matrix": [9, 2], "x": 13.5, "y": 4},
+          {"matrix": [9, 1], "x": 14.5, "y": 4},
+          {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 5], "x": 6, "y": 5.5},
+          {"matrix": [4, 6], "x": 7, "y": 5.5},
+          {"matrix": [9, 6], "x": 9, "y": 5.5},
+          {"matrix": [9, 5], "x": 10, "y": 5.5}
         ]
       }
     }
diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c
index 70e5531673..4c308264d6 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.c
+++ b/keyboards/rgbkb/zen/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 #include "split_util.h"
diff --git a/keyboards/rgbkb/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h
deleted file mode 100644
index c7a06d1767..0000000000
--- a/keyboards/rgbkb/zen/rev2/rev2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \
-    k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \
-    k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \
-                             k45, k46,   k96, k95 \
-    ) \
-    { \
-        { k00, k01, k02, k03, k04, k05, KC_NO }, \
-        { k10, k11, k12, k13, k14, k15, k16 }, \
-        { k20, k21, k22, k23, k24, k25, k26 }, \
-        { k30, k31, k32, k33, k34, k35, k36 }, \
-        { k40, k41, k42, k43, k44, k45, k46 }, \
-        { k50, k51, k52, k53, k54, k55, KC_NO }, \
-        { k60, k61, k62, k63, k64, k65, k66 }, \
-        { k70, k71, k72, k73, k74, k75, k76 }, \
-        { k80, k81, k82, k83, k84, k85, k86 }, \
-        { k90, k91, k92, k93, k94, k95, k96 } \
-    }