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

16 files changed, 415 insertions, 582 deletions

diff --git a/keyboards/kprepublic/bm43a/bm43a.h b/keyboards/kprepublic/bm43a/bm43a.h
deleted file mode 100644
index 87ca05c4d1..0000000000
--- a/keyboards/kprepublic/bm43a/bm43a.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B,       \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B,   \
-    K30, K31, K32, K33,         K35,        K37, K38, K39, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   KC_NO, K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   KC_NO, K2B   }, \
-    { K30,   K31,   K32,   K33,   KC_NO, K35,   KC_NO, K37,   K38,   K39,   KC_NO, K3B   }, \
-}
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
index 60d6373b30..bee05ba036 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/info.json
@@ -25,49 +25,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D1,B0)", "x":0, "y":0},
-                {"label":"K01 (D1,F5)", "x":1, "y":0},
-                {"label":"K02 (D1,F6)", "x":2, "y":0},
-                {"label":"K03 (D1,F7)", "x":3, "y":0},
-                {"label":"K04 (D1,C7)", "x":4, "y":0},
-                {"label":"K05 (D1,C6)", "x":5, "y":0},
-                {"label":"K06 (D1,B6)", "x":6, "y":0},
-                {"label":"K07 (D1,B5)", "x":7, "y":0},
-                {"label":"K08 (D1,B4)", "x":8, "y":0},
-                {"label":"K09 (D1,D7)", "x":9, "y":0},
-                {"label":"K0A (D1,D6)", "x":10, "y":0},
-                {"label":"K0B (D1,D4)", "x":11, "y":0},
-                {"label":"K10 (F4,B0)", "x":0, "y":1, "w":1.25},
-                {"label":"K11 (F4,F5)", "x":1.25, "y":1},
-                {"label":"K12 (F4,F6)", "x":2.25, "y":1},
-                {"label":"K13 (F4,F7)", "x":3.25, "y":1},
-                {"label":"K14 (F4,C7)", "x":4.25, "y":1},
-                {"label":"K15 (F4,C6)", "x":5.25, "y":1},
-                {"label":"K16 (F4,B6)", "x":6.25, "y":1},
-                {"label":"K17 (F4,B5)", "x":7.25, "y":1},
-                {"label":"K18 (F4,B4)", "x":8.25, "y":1},
-                {"label":"K19 (F4,D7)", "x":9.25, "y":1},
-                {"label":"K1B (F4,D4)", "x":10.25, "y":1, "w":1.75},
-                {"label":"K20 (F1,B0)", "x":0, "y":2, "w":2},
-                {"label":"K21 (F1,F5)", "x":2, "y":2},
-                {"label":"K22 (F1,F6)", "x":3, "y":2},
-                {"label":"K23 (F1,F7)", "x":4, "y":2},
-                {"label":"K24 (F1,C7)", "x":5, "y":2},
-                {"label":"K25 (F1,C6)", "x":6, "y":2},
-                {"label":"K26 (F1,B6)", "x":7, "y":2},
-                {"label":"K27 (F1,B5)", "x":8, "y":2},
-                {"label":"K28 (F1,B4)", "x":9, "y":2},
-                {"label":"K29 (F1,D7)", "x":10, "y":2},
-                {"label":"K2B (F1,D4)", "x":11, "y":2},
-                {"label":"K30 (F0,B0)", "x":0, "y":3},
-                {"label":"K31 (F0,F5)", "x":1, "y":3},
-                {"label":"K32 (F0,F6)", "x":2, "y":3},
-                {"label":"K33 (F0,F7)", "x":3, "y":3, "w":2.75},
-                {"label":"K35 (F0,C6)", "x":5.75, "y":3, "w":2.25},
-                {"label":"K37 (F0,B5)", "x":8, "y":3},
-                {"label":"K38 (F0,B4)", "x":9, "y":3},
-                {"label":"K39 (F0,D7)", "x":10, "y":3},
-                {"label":"K3B (F0,D4)", "x":11, "y":3}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "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, "w": 2.75},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h b/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h
deleted file mode 100755
index 09d99b02d5..0000000000
--- a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 bitstarr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B,       \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B,   \
-    K30, K31, K32, K33,         K35,        K37, K38, K39, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   KC_NO, K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   KC_NO, K2B   }, \
-    { K30,   K31,   K32,   K33,   KC_NO, K35,   KC_NO, K37,   K38,   K39,   KC_NO, K3B   }, \
-}
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json
index 5e2fb50983..70e418e894 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/info.json
@@ -21,49 +21,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (E6,C6)", "x":0, "y":0},
-                {"label":"K01 (E6,D2)", "x":1, "y":0},
-                {"label":"K02 (E6,D1)", "x":2, "y":0},
-                {"label":"K03 (E6,D0)", "x":3, "y":0},
-                {"label":"K04 (E6,D7)", "x":4, "y":0},
-                {"label":"K05 (E6,D6)", "x":5, "y":0},
-                {"label":"K06 (E6,D4)", "x":6, "y":0},
-                {"label":"K07 (E6,D5)", "x":7, "y":0},
-                {"label":"K08 (E6,D3)", "x":8, "y":0},
-                {"label":"K09 (E6,B7)", "x":9, "y":0},
-                {"label":"K0A (E6,B3)", "x":10, "y":0},
-                {"label":"K0B (E6,B2)", "x":11, "y":0},
-                {"label":"K10 (B6,C6)", "x":0, "y":1, "w":1.25},
-                {"label":"K11 (B6,D2)", "x":1.25, "y":1},
-                {"label":"K12 (B6,D1)", "x":2.25, "y":1},
-                {"label":"K13 (B6,D0)", "x":3.25, "y":1},
-                {"label":"K14 (B6,D7)", "x":4.25, "y":1},
-                {"label":"K15 (B6,D6)", "x":5.25, "y":1},
-                {"label":"K16 (B6,D4)", "x":6.25, "y":1},
-                {"label":"K17 (B6,D5)", "x":7.25, "y":1},
-                {"label":"K18 (B6,D3)", "x":8.25, "y":1},
-                {"label":"K19 (B6,B7)", "x":9.25, "y":1},
-                {"label":"K1B (B6,B2)", "x":10.25, "y":1, "w":1.75},
-                {"label":"K20 (B4,C6)", "x":0, "y":2, "w":2},
-                {"label":"K21 (B4,D2)", "x":2, "y":2},
-                {"label":"K22 (B4,D1)", "x":3, "y":2},
-                {"label":"K23 (B4,D0)", "x":4, "y":2},
-                {"label":"K24 (B4,D7)", "x":5, "y":2},
-                {"label":"K25 (B4,D6)", "x":6, "y":2},
-                {"label":"K26 (B4,D4)", "x":7, "y":2},
-                {"label":"K27 (B4,D5)", "x":8, "y":2},
-                {"label":"K28 (B4,D3)", "x":9, "y":2},
-                {"label":"K29 (B4,B7)", "x":10, "y":2},
-                {"label":"K2B (B4,B2)", "x":11, "y":2},
-                {"label":"K30 (B5,C6)", "x":0, "y":3},
-                {"label":"K31 (B5,D2)", "x":1, "y":3},
-                {"label":"K32 (B5,D1)", "x":2, "y":3},
-                {"label":"K33 (B5,D0)", "x":3, "y":3, "w":2.75},
-                {"label":"K35 (B5,D6)", "x":5.75, "y":3, "w":2.25},
-                {"label":"K37 (B5,D5)", "x":8, "y":3},
-                {"label":"K38 (B5,D3)", "x":9, "y":3},
-                {"label":"K39 (B5,B7)", "x":10, "y":3},
-                {"label":"K3B (B5,B2)", "x":11, "y":3}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "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, "w": 2.75},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index 5db6750d85..3849e5a338 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -29,76 +29,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (B0, D0)", "x":0, "y":0.5},
-                {"label":"K01 (B0, D1)", "x":1, "y":0.5},
-                {"label":"K02 (B0, D2)", "x":2, "y":0.5},
-                {"label":"K03 (B0, D3)", "x":3, "y":0.5},
-                {"label":"K04 (B0, D5)", "x":4, "y":0.5},
-                {"label":"K05 (B0, D4)", "x":5, "y":0.5},
-                {"label":"K06 (B0, D6)", "x":6, "y":0.5},
-                {"label":"K07 (B0, D7)", "x":7, "y":0.5},
-                {"label":"K08 (B0, B4)", "x":8, "y":0.5},
-                {"label":"K09 (B0, B5)", "x":9, "y":0.5},
-                {"label":"K0A (B0, B6)", "x":10, "y":0.5},
-                {"label":"K0B (B0, C6)", "x":11, "y":0.5},
-                {"label":"K0C (B0, C7)", "x":12, "y":0.5},
-                {"label":"K0D (B0, F7)", "x":13, "y":0.5},
-                {"label":"K21 (B2, D1)", "x":14, "y":0.5},
-                {"label":"K43 (E6, D3)", "x":13.9, "y":0, "w":0.6, "h":0.5},
-                {"label":"K44 (E6, D5)", "x":14.5, "y":0, "w":0.6, "h":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+                {"matrix": [0, 6], "x": 6, "y": 0.5},
+                {"matrix": [0, 7], "x": 7, "y": 0.5},
+                {"matrix": [0, 8], "x": 8, "y": 0.5},
+                {"matrix": [0, 9], "x": 9, "y": 0.5},
+                {"matrix": [0, 10], "x": 10, "y": 0.5},
+                {"matrix": [0, 11], "x": 11, "y": 0.5},
+                {"matrix": [0, 12], "x": 12, "y": 0.5},
+                {"matrix": [0, 13], "x": 13, "y": 0.5},
+                {"matrix": [2, 1], "x": 14, "y": 0.5},
 
-                {"label":"K10 (B1, D0)", "x":0, "y":1.5, "w":1.5},
-                {"label":"K11 (B1, D1)", "x":1.5, "y":1.5},
-                {"label":"K12 (B1, D2)", "x":2.5, "y":1.5},
-                {"label":"K13 (B1, D3)", "x":3.5, "y":1.5},
-                {"label":"K14 (B1, D5)", "x":4.5, "y":1.5},
-                {"label":"K15 (B1, D4)", "x":5.5, "y":1.5},
-                {"label":"K16 (B1, D6)", "x":6.5, "y":1.5},
-                {"label":"K17 (B1, D7)", "x":7.5, "y":1.5},
-                {"label":"K18 (B1, B4)", "x":8.5, "y":1.5},
-                {"label":"K19 (B1, B5)", "x":9.5, "y":1.5},
-                {"label":"K1A (B1, B6)", "x":10.5, "y":1.5},
-                {"label":"K1B (B1, C6)", "x":11.5, "y":1.5},
-                {"label":"K1C (B1, C7)", "x":12.5, "y":1.5},
-                {"label":"K1D (B1, F7)", "x":13.5, "y":1.5, "w":1.5},
+                {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5},
+                {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5},
 
-                {"label":"K20 (B2, D0)", "x":0, "y":2.5, "w":1.75},
-                {"label":"K22 (B2, D2)", "x":1.75, "y":2.5},
-                {"label":"K23 (B2, D3)", "x":2.75, "y":2.5},
-                {"label":"K24 (B2, D5)", "x":3.75, "y":2.5},
-                {"label":"K25 (B2, D4)", "x":4.75, "y":2.5},
-                {"label":"K26 (B2, D6)", "x":5.75, "y":2.5},
-                {"label":"K27 (B2, D7)", "x":6.75, "y":2.5},
-                {"label":"K28 (B2, B4)", "x":7.75, "y":2.5},
-                {"label":"K29 (B2, B5)", "x":8.75, "y":2.5},
-                {"label":"K2A (B2, B6)", "x":9.75, "y":2.5},
-                {"label":"K2B (B2, C6)", "x":10.75, "y":2.5},
-                {"label":"K2C (B2, C7)", "x":11.75, "y":2.5},
-                {"label":"K2D (B2, F7)", "x":12.75, "y":2.5, "w":2.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
 
-                {"label":"K31 (B3, D1)", "x":0, "y":3.5, "w":2.25},
-                {"label":"K32 (B3, D2)", "x":2.25, "y":3.5},
-                {"label":"K33 (B3, D3)", "x":3.25, "y":3.5},
-                {"label":"K34 (B3, D5)", "x":4.25, "y":3.5},
-                {"label":"K35 (B3, D4)", "x":5.25, "y":3.5},
-                {"label":"K36 (B3, D6)", "x":6.25, "y":3.5},
-                {"label":"K37 (B3, D7)", "x":7.25, "y":3.5},
-                {"label":"K38 (B3, B4)", "x":8.25, "y":3.5},
-                {"label":"K39 (B3, B5)", "x":9.25, "y":3.5},
-                {"label":"K3A (B3, B6)", "x":10.25, "y":3.5},
-                {"label":"K3B (B3, C6)", "x":11.25, "y":3.5, "w":1.75},
-                {"label":"K3C (B3, C7)", "x":13, "y":3.5},
-                {"label":"K3D (B3, F7)", "x":14, "y":3.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.75, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.75, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.75, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.75, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.75, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.75, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.75, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.75, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.75, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.75, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
 
-                {"label":"K40 (E6, D0)", "x":0, "y":4.5, "w":1.25},
-                {"label":"K41 (E6, D1)", "x":1.25, "y":4.5, "w":1.25},
-                {"label":"K42 (E6, D2)", "x":2.5, "y":4.5, "w":1.25},
-                {"label":"K46 (E6, D6)", "x":3.75, "y":4.5, "w":6.25},
-                {"label":"K49 (E6, B5)", "x":10, "y":4.5},
-                {"label":"K4A (E6, B6)", "x":11, "y":4.5},
-                {"label":"K4B (E6, C6)", "x":12, "y":4.5},
-                {"label":"K4C (E6, C7)", "x":13, "y":4.5},
-                {"label":"K4D (E6, F7)", "x":14, "y":4.5}
+                {"matrix": [3, 1], "x": 0, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3.5},
+                {"matrix": [3, 13], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.5, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.5},
+                {"matrix": [4, 10], "x": 11, "y": 4.5},
+                {"matrix": [4, 11], "x": 12, "y": 4.5},
+                {"matrix": [4, 12], "x": 13, "y": 4.5},
+                {"matrix": [4, 13], "x": 14, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
index 499edf6e5f..26afae87ae 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 led_config_t g_led_config = { {
   { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 },
   { 14,     15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27 },
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h
deleted file mode 100644
index 8ace666aac..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 bdtc123
- * Copyright 2021 peepeetee
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K21, K43, K44,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,                \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                    \
-    K31,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,     K3C, K3D,             \
-    K40,  K41,  K42,              K46,                K49, K4A, K4B, K4C, K4D              \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { 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   }, \
-    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \
-}
-
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index dde62eea4c..2d2f4d6ef5 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -30,76 +30,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.5},
-                {"x":2, "y":0.5},
-                {"x":3, "y":0.5},
-                {"x":4, "y":0.5},
-                {"x":5, "y":0.5},
-                {"x":6, "y":0.5},
-                {"x":7, "y":0.5},
-                {"x":8, "y":0.5},
-                {"x":9, "y":0.5},
-                {"x":10, "y":0.5},
-                {"x":11, "y":0.5},
-                {"x":12, "y":0.5},
-                {"x":13, "y":0.5},
-                {"x":14, "y":0.5},
-                {"x":13.9, "y":0, "w":0.6, "h":0.5},
-                {"x":14.5, "y":0, "w":0.6, "h":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+                {"matrix": [0, 6], "x": 6, "y": 0.5},
+                {"matrix": [0, 7], "x": 7, "y": 0.5},
+                {"matrix": [0, 8], "x": 8, "y": 0.5},
+                {"matrix": [0, 9], "x": 9, "y": 0.5},
+                {"matrix": [0, 10], "x": 10, "y": 0.5},
+                {"matrix": [0, 11], "x": 11, "y": 0.5},
+                {"matrix": [0, 12], "x": 12, "y": 0.5},
+                {"matrix": [0, 13], "x": 13, "y": 0.5},
+                {"matrix": [2, 12], "x": 14, "y": 0.5},
 
-                {"x":0, "y":1.5, "w":1.5},
-                {"x":1.5, "y":1.5},
-                {"x":2.5, "y":1.5},
-                {"x":3.5, "y":1.5},
-                {"x":4.5, "y":1.5},
-                {"x":5.5, "y":1.5},
-                {"x":6.5, "y":1.5},
-                {"x":7.5, "y":1.5},
-                {"x":8.5, "y":1.5},
-                {"x":9.5, "y":1.5},
-                {"x":10.5, "y":1.5},
-                {"x":11.5, "y":1.5},
-                {"x":12.5, "y":1.5},
-                {"x":13.5, "y":1.5, "w":1.5},
+                {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5},
+                {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5},
 
-                {"x":0, "y":2.5, "w":1.75},
-                {"x":1.75, "y":2.5},
-                {"x":2.75, "y":2.5},
-                {"x":3.75, "y":2.5},
-                {"x":4.75, "y":2.5},
-                {"x":5.75, "y":2.5},
-                {"x":6.75, "y":2.5},
-                {"x":7.75, "y":2.5},
-                {"x":8.75, "y":2.5},
-                {"x":9.75, "y":2.5},
-                {"x":10.75, "y":2.5},
-                {"x":11.75, "y":2.5},
-                {"x":12.75, "y":2.5, "w":2.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
 
-                {"x":0, "y":3.5, "w":2.25},
-                {"x":2.25, "y":3.5},
-                {"x":3.25, "y":3.5},
-                {"x":4.25, "y":3.5},
-                {"x":5.25, "y":3.5},
-                {"x":6.25, "y":3.5},
-                {"x":7.25, "y":3.5},
-                {"x":8.25, "y":3.5},
-                {"x":9.25, "y":3.5},
-                {"x":10.25, "y":3.5},
-                {"x":11.25, "y":3.5, "w":1.75},
-                {"x":13, "y":3.5},
-                {"x":14, "y":3.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
 
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5, "w":1.25},
-                {"x":2.5, "y":4.5, "w":1.25},
-                {"x":3.75, "y":4.5, "w":6.25},
-                {"x":10, "y":4.5},
-                {"x":11, "y":4.5},
-                {"x":12, "y":4.5},
-                {"x":13, "y":4.5},
-                {"x":14, "y":4.5}
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3.5},
+                {"matrix": [3, 13], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4.5, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.5},
+                {"matrix": [4, 10], "x": 11, "y": 4.5},
+                {"matrix": [4, 11], "x": 12, "y": 4.5},
+                {"matrix": [4, 12], "x": 13, "y": 4.5},
+                {"matrix": [4, 13], "x": 14, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 001debe128..e738b47c40 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h
deleted file mode 100644
index 47da353b6c..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 bdtc123
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K43, K44,        \
-    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, K2D,          \
-    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B,     K3C, K3D,   \
-    K40,  K41,  K42,              K45,                K49, K4A, K4B, K4C, K4D    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { 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,   KC_NO, K3B,   K3C,   K3D   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \
-}
-
-
-
-
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 0148d1ef53..800ff0de31 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -21,73 +21,80 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_iso_arrow"
+    },
     "layouts": {
         "LAYOUT_60_iso_arrow": {
             "layout": [
-                {"label":"K00 (B0,D0)", "x":0, "y":0},
-                {"label":"K01 (B0,D1)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,B6)", "x":10, "y":0},
-                {"label":"K0B (B0,C6)", "x":11, "y":0},
-                {"label":"K0C (B0,C7)", "x":12, "y":0},
-                {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2},
-                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
-                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
-                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
-                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
-                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
-                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
-                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F7)", "x":12.75, "y":2},
-                {"label":"K1D (B1,F7)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K30 (B3,D0)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,D1)", "x":1.25, "y":3},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
-                {"label":"K3B (B3,C6)", "x":11.25, "y":3, "w":1.75},
-                {"label":"K3C (B3,C7)", "x":13, "y":3},
-                {"label":"K3D (B3,F7)", "x":14, "y":3},
-                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (E6,B5)", "x":10, "y":4},
-                {"label":"K4A (E6,B6)", "x":11, "y":4},
-                {"label":"K4B (E6,C6)", "x":12, "y":4},
-                {"label":"K4C (E6,C7)", "x":13, "y":4},
-                {"label":"K4D (E6,F7)", "x":14, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [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, "w": 2},
+
+                {"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": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"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, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"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, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c
index f708e74c27..80bc2e2283 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h
deleted file mode 100644
index fce8925a7a..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 markva
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_60_iso_arrow( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K1D,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,     K3C, K3D,   \
-    K40,  K41,  K42,              K46,                K49, K4A, K4B, K4C, K4D    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   KC_NO, 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,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \
-}
-
-#define LAYOUT LAYOUT_60_iso_arrow
diff --git a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
index 4aad7af0f1..12475ac36b 100644
--- a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
+++ b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm980hsrgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h
deleted file mode 100644
index 042f4ee4a5..0000000000
--- a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 bdtc123
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,   K0E, K6D, K6A, K66, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K6B, K69, K62, \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K63, K64, K65, \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,          K3E, K68, K67,      \
-    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D,  K4E, K58, K57, K55, \
-    K50,  K51, K52,              K56,               K59, K5A, K5B,    K5C, K5D, K5E,  K53, K54       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
-    { KC_NO, KC_NO, K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO, K6D,   KC_NO }, \
-}
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index 46ab7e42aa..badd7d6458 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -30,104 +30,120 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D4,B1)", "x":0, "y":0},
-                {"label":"K01 (D4,B2)", "x":2, "y":0},
-                {"label":"K02 (D4,B3)", "x":3, "y":0},
-                {"label":"K03 (D4,B7)", "x":4, "y":0},
-                {"label":"K04 (D4,D0)", "x":5, "y":0},
-                {"label":"K05 (D4,D1)", "x":6.5, "y":0},
-                {"label":"K06 (D4,D2)", "x":7.5, "y":0},
-                {"label":"K07 (D4,D3)", "x":8.5, "y":0},
-                {"label":"K08 (D4,D5)", "x":9.5, "y":0},
-                {"label":"K09 (D4,E6)", "x":11, "y":0},
-                {"label":"K0A (D4,F0)", "x":12, "y":0},
-                {"label":"K0B (D4,F1)", "x":13, "y":0},
-                {"label":"K0C (D4,F4)", "x":14, "y":0},
-                {"label":"K0E (D4,D6)", "x":15.5, "y":0},
-                {"label":"K6D (D7,F5)", "x":16.5, "y":0},
-                {"label":"K6A (D7,F0)", "x":17.5, "y":0},
-                {"label":"K66 (D7,D2)", "x":18.5, "y":0},
-                {"label":"K10 (B6,B1)", "x":0, "y":1.5},
-                {"label":"K11 (B6,B2)", "x":1, "y":1.5},
-                {"label":"K12 (B6,B3)", "x":2, "y":1.5},
-                {"label":"K13 (B6,B7)", "x":3, "y":1.5},
-                {"label":"K14 (B6,D0)", "x":4, "y":1.5},
-                {"label":"K15 (B6,D1)", "x":5, "y":1.5},
-                {"label":"K16 (B6,D2)", "x":6, "y":1.5},
-                {"label":"K17 (B6,D3)", "x":7, "y":1.5},
-                {"label":"K18 (B6,D5)", "x":8, "y":1.5},
-                {"label":"K19 (B6,E6)", "x":9, "y":1.5},
-                {"label":"K1A (B6,F0)", "x":10, "y":1.5},
-                {"label":"K1B (B6,F1)", "x":11, "y":1.5},
-                {"label":"K1C (B6,F4)", "x":12, "y":1.5},
-                {"label":"K1D (B6,F5)", "x":13, "y":1.5, "w":2},
-                {"label":"K1E (B6,D6)", "x":15.5, "y":1.5},
-                {"label":"K6B (D7,F1)", "x":16.5, "y":1.5},
-                {"label":"K69 (D7,E6)", "x":17.5, "y":1.5},
-                {"label":"K62 (D7,B3)", "x":18.5, "y":1.5},
-                {"label":"K20 (B5,B1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B5,B2)", "x":1.5, "y":2.5},
-                {"label":"K22 (B5,B3)", "x":2.5, "y":2.5},
-                {"label":"K23 (B5,B7)", "x":3.5, "y":2.5},
-                {"label":"K24 (B5,D0)", "x":4.5, "y":2.5},
-                {"label":"K25 (B5,D1)", "x":5.5, "y":2.5},
-                {"label":"K26 (B5,D2)", "x":6.5, "y":2.5},
-                {"label":"K27 (B5,D3)", "x":7.5, "y":2.5},
-                {"label":"K28 (B5,D5)", "x":8.5, "y":2.5},
-                {"label":"K29 (B5,E6)", "x":9.5, "y":2.5},
-                {"label":"K2A (B5,F0)", "x":10.5, "y":2.5},
-                {"label":"K2B (B5,F1)", "x":11.5, "y":2.5},
-                {"label":"K2C (B5,F4)", "x":12.5, "y":2.5},
-                {"label":"K2D (B5,F5)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2E (B5,D6)", "x":15.5, "y":2.5},
-                {"label":"K63 (D7,B7)", "x":16.5, "y":2.5},
-                {"label":"K64 (D7,D0)", "x":17.5, "y":2.5},
-                {"label":"K65 (D7,D1)", "x":18.5, "y":2.5, "h":2},
-                {"label":"K30 (B4,B1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B4,B2)", "x":1.75, "y":3.5},
-                {"label":"K32 (B4,B3)", "x":2.75, "y":3.5},
-                {"label":"K33 (B4,B7)", "x":3.75, "y":3.5},
-                {"label":"K34 (B4,D0)", "x":4.75, "y":3.5},
-                {"label":"K35 (B4,D1)", "x":5.75, "y":3.5},
-                {"label":"K36 (B4,D2)", "x":6.75, "y":3.5},
-                {"label":"K37 (B4,D3)", "x":7.75, "y":3.5},
-                {"label":"K38 (B4,D5)", "x":8.75, "y":3.5},
-                {"label":"K39 (B4,E6)", "x":9.75, "y":3.5},
-                {"label":"K3A (B4,F0)", "x":10.75, "y":3.5},
-                {"label":"K3B (B4,F1)", "x":11.75, "y":3.5},
-                {"label":"K3D (B4,F5)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K3E (B4,D6)", "x":15.5, "y":3.5},
-                {"label":"K68 (D7,D5)", "x":16.5, "y":3.5},
-                {"label":"K67 (D7,D3)", "x":17.5, "y":3.5},
-                {"label":"K40 (F7,B1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (F7,B3)", "x":2.25, "y":4.5},
-                {"label":"K43 (F7,B7)", "x":3.25, "y":4.5},
-                {"label":"K44 (F7,D0)", "x":4.25, "y":4.5},
-                {"label":"K45 (F7,D1)", "x":5.25, "y":4.5},
-                {"label":"K46 (F7,D2)", "x":6.25, "y":4.5},
-                {"label":"K47 (F7,D3)", "x":7.25, "y":4.5},
-                {"label":"K48 (F7,D5)", "x":8.25, "y":4.5},
-                {"label":"K49 (F7,E6)", "x":9.25, "y":4.5},
-                {"label":"K4A (F7,F0)", "x":10.25, "y":4.5},
-                {"label":"K4B (F7,F1)", "x":11.25, "y":4.5},
-                {"label":"K4C (F7,F4)", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"K4D (F7,F5)", "x":14.25, "y":4.75},
-                {"label":"K4E (F7,D6)", "x":15.5, "y":4.5},
-                {"label":"K58 (F6,D5)", "x":16.5, "y":4.5},
-                {"label":"K57 (F6,D3)", "x":17.5, "y":4.5},
-                {"label":"K55 (F6,D1)", "x":18.5, "y":4.5, "h":2},
-                {"label":"K50 (F6,B1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (F6,B2)", "x":1.25, "y":5.5,"w":1.25},
-                {"label":"K52 (F6,B3)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (F6,D2)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K59 (F6,E6)", "x":10, "y":5.5},
-                {"label":"K5A (F6,F0)", "x":11, "y":5.5},
-                {"label":"K5B (F6,F1)", "x":12, "y":5.5},
-                {"label":"K5C (F6,F4)", "x":13.25, "y":5.75},
-                {"label":"K5D (F6,F5)", "x":14.25, "y":5.75},
-                {"label":"K5E (F6,D6)", "x":15.25, "y":5.75},
-                {"label":"K53 (F6,B7)", "x":16.5, "y":5.5},
-                {"label":"K54 (F6,D0)", "x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [6, 13], "x": 16.5, "y": 0},
+                {"matrix": [6, 10], "x": 17.5, "y": 0},
+                {"matrix": [6, 6], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [6, 11], "x": 16.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 17.5, "y": 1.5},
+                {"matrix": [6, 2], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [6, 3], "x": 16.5, "y": 2.5},
+                {"matrix": [6, 4], "x": 17.5, "y": 2.5},
+                {"matrix": [6, 5], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.5},
+                {"matrix": [6, 8], "x": 16.5, "y": 3.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 16.5, "y": 4.5},
+                {"matrix": [5, 7], "x": 17.5, "y": 4.5},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5},
+                {"matrix": [5, 10], "x": 11, "y": 5.5},
+                {"matrix": [5, 11], "x": 12, "y": 5.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 3], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 4], "x": 17.5, "y": 5.5}
             ]
         }
     }