Move remaining `LAYOUT_all`s to data driven (#20463)

3 files changed, 304 insertions, 368 deletions

diff --git a/keyboards/mechlovin/olly/bb/bb.c b/keyboards/mechlovin/olly/bb/bb.c
index 6ec4a15ee5..dac77ff623 100644
--- a/keyboards/mechlovin/olly/bb/bb.c
+++ b/keyboards/mechlovin/olly/bb/bb.c
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bb.h"
-
+#include "quantum.h"
 
 void led_init_ports(void) {
   setPinOutput(C0);
diff --git a/keyboards/mechlovin/olly/bb/bb.h b/keyboards/mechlovin/olly/bb/bb.h
deleted file mode 100644
index 7980a1c4ef..0000000000
--- a/keyboards/mechlovin/olly/bb/bb.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2021 mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐      ┌───────┐
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D ││0E ││0F │0G │0H │0I │      │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤      └─┬─────┤                ┌───┐
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2E   ││1E ││1F │1G │1H │1I │        │     │                │   │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤     ┌──┴┐2D  │ ISO Enter      │2I │ 2u Plus
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │     │2F │2G │2H │2I │     │2C │    │                │   │
- * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ├───┼───┼───┼───┤   ┌─┴───┴────┤                ├───┤
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │┌───┐│3F │3G │3H │3I │   │3C        │ 2.75u RShift   │   │
- * └────────┘   ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│3E │└───┼───┼───┼───┤   └──────────┘                │4I │ 2u Enter
- *              │40   │41 │43   │46                      │4A  │4B  │4C  │┌───┼───┼───┐│4G │4H │4I │                               │   │
- *              └─────┴───┴─────┴────────────────────────┴────┴────┴────┘│4D │4E │4F │└───┴───┴───┘                               └───┘
- *                                                                       └───┴───┴───┘┌───────┐
- *              ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐             │4G     │ 2u 0
- *              │40  │41  │43  │46                      │4A   │4B   │4C │             └───────┘
- *              └────┴────┴────┴────────────────────────┴─────┴─────┴───┘
- *              ┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐
- *              │40  │41  │43  │46                      │4A   │4B │4C   │
- *              └────┴────┴────┴────────────────────────┴─────┴───┴─────┘
- *              ┌────┬────┬────┬────────────────────────┬─────┬────┬────┐
- *              │40  │41  │43  │46                      │4A   │4B  │4C  │
- *              └────┴────┴────┴────────────────────────┴─────┴────┴────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬─────┐
- *              │40   │41 │43   │46                         │4B   │4C   │
- *              └─────┴───┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,     K0F, K0G, K0H, K0I, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E,      K1E,     K1F, K1G, K1H, K1I, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               K2F, K2G, K2H, K2I, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,     K3F, K3G, K3H, K3I, \
-    K40, K41, K43,                K46,                K4A, K4B, K4C,      K4D, K4E, K4F,     K4G, K4H, K4I  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
-}
-
-#define LAYOUT_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,     K0F, K0G, K0H, K0I, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E,      K1E,     K1F, K1G, K1H, K1I, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,               K2F, K2G, K2H, K2I, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,     K3F, K3G, K3H, K3I, \
-    K40, K41, K43,                K46,                K4A, K4B, K4C,      K4D, K4E, K4F,     K4G, K4H, K4I  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E, K2F, K2G, K2H, K2I }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
-}
-
-#define LAYOUT_iso_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,     K0F, K0G, K0H, K0I, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,     K1F, K1G, K1H, K1I, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               K2F, K2G, K2H, K2I, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,     K3F, K3G, K3H, K3I, \
-    K40, K41, K43,                K46,                K4A, K4B, K4C,      K4D, K4E, K4F,     K4G, K4H, K4I  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F, K2G, K2H, K2I }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
-}
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index 4bb73904d0..c3b55f95d8 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -25,290 +25,317 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (B0,B5)", "x": 0, "y": 0 },
-                { "label": "K01 (B0,B6)", "x": 1, "y": 0 },
-                { "label": "K02 (B0,B7)", "x": 2, "y": 0 },
-                { "label": "K03 (B0,C0)", "x": 3, "y": 0 },
-                { "label": "K04 (B0,C1)", "x": 4, "y": 0 },
-                { "label": "K05 (B0,C2)", "x": 5, "y": 0 },
-                { "label": "K06 (B0,C3)", "x": 6, "y": 0 },
-                { "label": "K07 (B0,C4)", "x": 7, "y": 0 },
-                { "label": "K08 (B0,C5)", "x": 8, "y": 0 },
-                { "label": "K09 (B0,C6)", "x": 9, "y": 0 },
-                { "label": "K0A (B0,C7)", "x": 10, "y": 0 },
-                { "label": "K0B (B0,D0)", "x": 11, "y": 0 },
-                { "label": "K0C (B0,D1)", "x": 12, "y": 0 },
-                { "label": "K0D (B0,D2)", "x": 13, "y": 0 },
-                { "label": "K1D (B1,D2)", "x": 14, "y": 0 },
-                { "label": "K0E (B0,D3)", "x": 15.25, "y": 0 },
-                { "label": "K0F (B0,D4)", "x": 16.5, "y": 0 },
-                { "label": "K0G (B0,D5)", "x": 17.5, "y": 0 },
-                { "label": "K0H (B0,D6)", "x": 18.5, "y": 0 },
-                { "label": "K0I (B0,D7)", "x": 19.5, "y": 0 },
-
-                { "label": "K10 (B1,B5)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11 (B1,B6)", "x": 1.5, "y": 1 },
-                { "label": "K12 (B1,B7)", "x": 2.5, "y": 1 },
-                { "label": "K13 (B1,C0)", "x": 3.5, "y": 1 },
-                { "label": "K14 (B1,C1)", "x": 4.5, "y": 1 },
-                { "label": "K15 (B1,C2)", "x": 5.5, "y": 1 },
-                { "label": "K16 (B1,C3)", "x": 6.5, "y": 1 },
-                { "label": "K17 (B1,C4)", "x": 7.5, "y": 1 },
-                { "label": "K18 (B1,C5)", "x": 8.5, "y": 1 },
-                { "label": "K19 (B1,C6)", "x": 9.5, "y": 1 },
-                { "label": "K1A (B1,C7)", "x": 10.5, "y": 1 },
-                { "label": "K1B (B1,D0)", "x": 11.5, "y": 1 },
-                { "label": "K1C (B1,D1)", "x": 12.5, "y": 1 },
-                { "label": "K2E (B2,D3)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (B1,D3)", "x": 15.25, "y": 1 },
-                { "label": "K1F (B1,D4)", "x": 16.5, "y": 1 },
-                { "label": "K1G (B1,D5)", "x": 17.5, "y": 1 },
-                { "label": "K1H (B1,D6)", "x": 18.5, "y": 1 },
-                { "label": "K1I (B1,D7)", "x": 19.5, "y": 1 },
-
-                { "label": "K20 (B2,B5)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (B2,B6)", "x": 1.75, "y": 2 },
-                { "label": "K22 (B2,B7)", "x": 2.75, "y": 2 },
-                { "label": "K23 (B2,C0)", "x": 3.75, "y": 2 },
-                { "label": "K24 (B2,C1)", "x": 4.75, "y": 2 },
-                { "label": "K25 (B2,C2)", "x": 5.75, "y": 2 },
-                { "label": "K26 (B2,C3)", "x": 6.75, "y": 2 },
-                { "label": "K27 (B2,C4)", "x": 7.75, "y": 2 },
-                { "label": "K28 (B2,C5)", "x": 8.75, "y": 2 },
-                { "label": "K29 (B2,C6)", "x": 9.75, "y": 2 },
-                { "label": "K2A (B2,C7)", "x": 10.75, "y": 2 },
-                { "label": "K2B (B2,D0)", "x": 11.75, "y": 2 },
-                { "label": "K2C (B2,D1)", "x": 12.75, "y": 2 },
-                { "label": "K2D (B2,D2)", "x": 13.75, "y": 2, "w": 1.25 },
-                { "label": "K2F (B2,D4)", "x": 16.5, "y": 2 },
-                { "label": "K2G (B2,D5)", "x": 17.5, "y": 2 },
-                { "label": "K2H (B2,D6)", "x": 18.5, "y": 2 },
-                { "label": "K2I (B2,D7)", "x": 19.5, "y": 2 },
-
-                { "label": "K30 (B3,B5)", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "K31 (B3,B6)", "x": 1.25, "y": 3 },
-                { "label": "K32 (B3,B7)", "x": 2.25, "y": 3 },
-                { "label": "K33 (B3,C0)", "x": 3.25, "y": 3 },
-                { "label": "K34 (B3,C1)", "x": 4.25, "y": 3 },
-                { "label": "K35 (B3,C2)", "x": 5.25, "y": 3 },
-                { "label": "K36 (B3,C3)", "x": 6.25, "y": 3 },
-                { "label": "K37 (B3,C4)", "x": 7.25, "y": 3 },
-                { "label": "K38 (B3,C5)", "x": 8.25, "y": 3 },
-                { "label": "K39 (B3,C6)", "x": 9.25, "y": 3 },
-                { "label": "K3A (B3,C7)", "x": 10.25, "y": 3 },
-                { "label": "K3B (B3,D0)", "x": 11.25, "y": 3 },
-                { "label": "K3C (B3,D1)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (B3,D2)", "x": 14, "y": 3 },
-                { "label": "K3E (B3,D3)", "x": 15.25, "y": 3.25 },
-                { "label": "K3F (B3,D4)", "x": 16.5, "y": 3 },
-                { "label": "K3G (B3,D5)", "x": 17.5, "y": 3 },
-                { "label": "K3H (B3,D6)", "x": 18.5, "y": 3 },
-                { "label": "K3I (B3,D7)", "x": 19.5, "y": 3 },
-
-                { "label": "K40 (B4,B5)", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "K41 (B4,B6)", "x": 1.5, "y": 4 },
-                { "label": "K43 (B4,C0)", "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "K46 (B4,C3)", "x": 4, "y": 4, "w": 6.25 },
-                { "label": "K4A (B4,C7)", "x": 10.25, "y": 4, "w": 1.25 },
-                { "label": "K4B (B4,D0)", "x": 11.5, "y": 4, "w": 1.25 },
-                { "label": "K4C (B4,D1)", "x": 12.75, "y": 4, "w": 1.25 },
-                { "label": "K4D (B4,D2)", "x": 14.25, "y": 4.25 },
-                { "label": "K4E (B4,D3)", "x": 15.25, "y": 4.25 },
-                { "label": "K4F (B4,D4)", "x": 16.25, "y": 4.25 },
-                { "label": "K4G (B4,D5)", "x": 17.5, "y": 4 },
-                { "label": "K4H (B4,D6)", "x": 18.5, "y": 4 },
-                { "label": "K4I (B4,D7)", "x": 19.5, "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},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.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": [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, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 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},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
             ]
         },
         "LAYOUT_ansi_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1!", "x": 1, "y": 0 },
-                { "label": "2@", "x": 2, "y": 0 },
-                { "label": "3#", "x": 3, "y": 0 },
-                { "label": "4$", "x": 4, "y": 0 },
-                { "label": "5%", "x": 5, "y": 0 },
-                { "label": "6^", "x": 6, "y": 0 },
-                { "label": "7*", "x": 7, "y": 0 },
-                { "label": "8*", "x": 8, "y": 0 },
-                { "label": "9(", "x": 9, "y": 0 },
-                { "label": "0)", "x": 10, "y": 0 },
-                { "label": "-_", "x": 11, "y": 0 },
-                { "label": "=+", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0 },
-                { "label": "Backspace", "x": 14, "y": 0 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "Num Lock", "x": 16.5, "y": 0 },
-                { "label": "/", "x": 17.5, "y": 0 },
-                { "label": "*", "x": 18.5, "y": 0 },
-                { "label": "Pause", "x": 19.5, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[{", "x": 11.5, "y": 1 },
-                { "label": "]}", "x": 12.5, "y": 1 },
-                { "label": "\\|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "7", "x": 16.5, "y": 1 },
-                { "label": "8", "x": 17.5, "y": 1 },
-                { "label": "9", "x": 18.5, "y": 1 },
-                { "label": "-", "x": 19.5, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";:", "x": 10.75, "y": 2 },
-                { "label": "'\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "4", "x": 16.5, "y": 2 },
-                { "label": "5", "x": 17.5, "y": 2 },
-                { "label": "6", "x": 18.5, "y": 2 },
-                { "label": "+", "x": 19.5, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",<", "x": 9.25, "y": 3 },
-                { "label": ".>", "x": 10.25, "y": 3 },
-                { "label": "/?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Fn", "x": 14, "y": 3 },
-                { "label": "\u2191", "x": 15.25, "y": 3.25 },
-                { "label": "1", "x": 16.5, "y": 3 },
-                { "label": "2", "x": 17.5, "y": 3 },
-                { "label": "3", "x": 18.5, "y": 3 },
-                { "label": "Enter", "x": 19.5, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "GUI", "x": 1.5, "y": 4 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "x": 4, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10.25, "y": 4, "w": 1.25 },
-                { "label": "GUI", "x": 11.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 12.75, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4.25 },
-                { "label": "\u2193", "x": 15.25, "y": 4.25 },
-                { "label": "\u2192", "x": 16.25, "y": 4.25 },
-                { "label": "0", "x": 17.5, "y": 4 },
-                { "label": ".", "x": 18.5, "y": 4 },
-                { "label": "Enter", "x": 19.5, "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},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.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": [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, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
             ]
         },
         "LAYOUT_iso_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1!", "x": 1, "y": 0 },
-                { "label": "2\"", "x": 2, "y": 0 },
-                { "label": "3\u00a3", "x": 3, "y": 0 },
-                { "label": "4$", "x": 4, "y": 0 },
-                { "label": "5%", "x": 5, "y": 0 },
-                { "label": "6^", "x": 6, "y": 0 },
-                { "label": "7*", "x": 7, "y": 0 },
-                { "label": "8*", "x": 8, "y": 0 },
-                { "label": "9(", "x": 9, "y": 0 },
-                { "label": "0)", "x": 10, "y": 0 },
-                { "label": "-_", "x": 11, "y": 0 },
-                { "label": "=+", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0 },
-                { "label": "Backspace", "x": 14, "y": 0 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "Num Lock", "x": 16.5, "y": 0 },
-                { "label": "/", "x": 17.5, "y": 0 },
-                { "label": "*", "x": 18.5, "y": 0 },
-                { "label": "Pause", "x": 19.5, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[{", "x": 11.5, "y": 1 },
-                { "label": "]}", "x": 12.5, "y": 1 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "7", "x": 16.5, "y": 1 },
-                { "label": "8", "x": 17.5, "y": 1 },
-                { "label": "9", "x": 18.5, "y": 1 },
-                { "label": "-", "x": 19.5, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";:", "x": 10.75, "y": 2 },
-                { "label": "'@", "x": 11.75, "y": 2 },
-                { "label": "#~", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "4", "x": 16.5, "y": 2 },
-                { "label": "5", "x": 17.5, "y": 2 },
-                { "label": "6", "x": 18.5, "y": 2 },
-                { "label": "+", "x": 19.5, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "\\|", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",<", "x": 9.25, "y": 3 },
-                { "label": ".>", "x": 10.25, "y": 3 },
-                { "label": "/?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Fn", "x": 14, "y": 3 },
-                { "label": "\u2191", "x": 15.25, "y": 3.25 },
-                { "label": "1", "x": 16.5, "y": 3 },
-                { "label": "2", "x": 17.5, "y": 3 },
-                { "label": "3", "x": 18.5, "y": 3 },
-                { "label": "Enter", "x": 19.5, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "GUI", "x": 1.5, "y": 4 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "x": 4, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10.25, "y": 4, "w": 1.25 },
-                { "label": "GUI", "x": 11.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 12.75, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4.25 },
-                { "label": "\u2193", "x": 15.25, "y": 4.25 },
-                { "label": "\u2192", "x": 16.25, "y": 4.25 },
-                { "label": "0", "x": 17.5, "y": 4 },
-                { "label": ".", "x": 18.5, "y": 4 },
-                { "label": "Enter", "x": 19.5, "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},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.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": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 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},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
             ]
         }
     }