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

3 files changed, 187 insertions, 259 deletions

diff --git a/keyboards/ducky/one2mini/1861st/1861st.c b/keyboards/ducky/one2mini/1861st/1861st.c
index 1c164ea70d..c4b638b24c 100644
--- a/keyboards/ducky/one2mini/1861st/1861st.c
+++ b/keyboards/ducky/one2mini/1861st/1861st.c
@@ -1,6 +1,6 @@
 // Copyright 2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "1861st.h"
+#include "quantum.h"
 
 void bootloader_jump(void) {
     // TODO: Work out how to jump to LDROM, for now just reset the board.
diff --git a/keyboards/ducky/one2mini/1861st/1861st.h b/keyboards/ducky/one2mini/1861st/1861st.h
deleted file mode 100644
index 23ca182062..0000000000
--- a/keyboards/ducky/one2mini/1861st/1861st.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    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, k3a, k3b,      k3d, \
-    k40, k41, k42,                k45,                k4a, k4b, k4c, k4d  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \
-}
-
-#define LAYOUT_60_ansi( \
-    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,      k2d, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, \
-    k40, k41, k42,                k45,                k4a, k4b, k4c, k4d  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \
-}
-
-#define LAYOUT_60_iso( \
-    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, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, \
-    k40, k41, k42,                k45,                k4a, k4b, k4c, k4d  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \
-}
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
index 151eee80c1..b8cfe9d892 100644
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ b/keyboards/ducky/one2mini/1861st/info.json
@@ -17,214 +17,212 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0, "label": "ESC" },
-                { "x": 1, "y": 0, "label": "1" },
-                { "x": 2, "y": 0, "label": "2" },
-                { "x": 3, "y": 0, "label": "3" },
-                { "x": 4, "y": 0, "label": "4" },
-                { "x": 5, "y": 0, "label": "5" },
-                { "x": 6, "y": 0, "label": "6" },
-                { "x": 7, "y": 0, "label": "7" },
-                { "x": 8, "y": 0, "label": "8" },
-                { "x": 9, "y": 0, "label": "9" },
-                { "x": 10, "y": 0, "label": "0" },
-                { "x": 11, "y": 0, "label": "DASH" },
-                { "x": 12, "y": 0, "label": "EQUALSIGN" },
-                { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
+                {"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},
 
-                { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "label": "RBRACKET" },
-                { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "label": "A" },
-                { "x": 2.75, "y": 2, "label": "S" },
-                { "x": 3.75, "y": 2, "label": "D" },
-                { "x": 4.75, "y": 2, "label": "F" },
-                { "x": 5.75, "y": 2, "label": "G" },
-                { "x": 6.75, "y": 2, "label": "H" },
-                { "x": 7.75, "y": 2, "label": "J" },
-                { "x": 8.75, "y": 2, "label": "K" },
-                { "x": 9.75, "y": 2, "label": "L" },
-                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "label": "QUOTE" },
-                { "x": 12.75, "y": 2, "label": "ISOHASH" },
-                { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" },
+                {"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},
 
-                { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
-                { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
-                { "x": 2.25, "y": 3, "label": "Z" },
-                { "x": 3.25, "y": 3, "label": "X" },
-                { "x": 4.25, "y": 3, "label": "C" },
-                { "x": 5.25, "y": 3, "label": "V" },
-                { "x": 6.25, "y": 3, "label": "B" },
-                { "x": 7.25, "y": 3, "label": "N" },
-                { "x": 8.25, "y": 3, "label": "M" },
-                { "x": 9.25, "y": 3, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "label": "SLASH" },
-                { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
-                { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
-                { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
-                { "x": 3.75, "y": 4, "w": 6.25, "label": "SPACE" },
-                { "x": 10, "y": 4, "w": 1.25, "label": "RALT" },
-                { "x": 11.25, "y": 4, "w": 1.25, "label": "RCMD" },
-                { "x": 12.5, "y": 4, "w": 1.25, "label": "FN" },
-                { "x": 13.75, "y": 4, "w": 1.25, "label": "RCTRL" }
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-
         "LAYOUT_60_ansi": {
             "layout": [
-                { "x": 0, "y": 0, "label": "ESC" },
-                { "x": 1, "y": 0, "label": "1" },
-                { "x": 2, "y": 0, "label": "2" },
-                { "x": 3, "y": 0, "label": "3" },
-                { "x": 4, "y": 0, "label": "4" },
-                { "x": 5, "y": 0, "label": "5" },
-                { "x": 6, "y": 0, "label": "6" },
-                { "x": 7, "y": 0, "label": "7" },
-                { "x": 8, "y": 0, "label": "8" },
-                { "x": 9, "y": 0, "label": "9" },
-                { "x": 10, "y": 0, "label": "0" },
-                { "x": 11, "y": 0, "label": "DASH" },
-                { "x": 12, "y": 0, "label": "EQUALSIGN" },
-                { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
+                {"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},
 
-                { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "label": "RBRACKET" },
-                { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "label": "A" },
-                { "x": 2.75, "y": 2, "label": "S" },
-                { "x": 3.75, "y": 2, "label": "D" },
-                { "x": 4.75, "y": 2, "label": "F" },
-                { "x": 5.75, "y": 2, "label": "G" },
-                { "x": 6.75, "y": 2, "label": "H" },
-                { "x": 7.75, "y": 2, "label": "J" },
-                { "x": 8.75, "y": 2, "label": "K" },
-                { "x": 9.75, "y": 2, "label": "L" },
-                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "label": "QUOTE" },
-                { "x": 12.75, "y": 2, "w": 2.25, "label": "ENTER" },
+                {"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},
 
-                { "x": 0, "y": 3, "w": 2.25, "label": "LSHIFT" },
-                { "x": 2.25, "y": 3, "label": "Z" },
-                { "x": 3.25, "y": 3, "label": "X" },
-                { "x": 4.25, "y": 3, "label": "C" },
-                { "x": 5.25, "y": 3, "label": "V" },
-                { "x": 6.25, "y": 3, "label": "B" },
-                { "x": 7.25, "y": 3, "label": "N" },
-                { "x": 8.25, "y": 3, "label": "M" },
-                { "x": 9.25, "y": 3, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "label": "SLASH" },
-                { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
-                { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
-                { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
-                { "x": 3.75, "y": 4, "w": 6.25, "label": "SPACE" },
-                { "x": 10, "y": 4, "w": 1.25, "label": "RALT" },
-                { "x": 11.25, "y": 4, "w": 1.25, "label": "RCMD" },
-                { "x": 12.5, "y": 4, "w": 1.25, "label": "FN" },
-                { "x": 13.75, "y": 4, "w": 1.25, "label": "RCTRL" }
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-
         "LAYOUT_60_iso": {
             "layout": [
-                { "x": 0, "y": 0, "label": "ESC" },
-                { "x": 1, "y": 0, "label": "1" },
-                { "x": 2, "y": 0, "label": "2" },
-                { "x": 3, "y": 0, "label": "3" },
-                { "x": 4, "y": 0, "label": "4" },
-                { "x": 5, "y": 0, "label": "5" },
-                { "x": 6, "y": 0, "label": "6" },
-                { "x": 7, "y": 0, "label": "7" },
-                { "x": 8, "y": 0, "label": "8" },
-                { "x": 9, "y": 0, "label": "9" },
-                { "x": 10, "y": 0, "label": "0" },
-                { "x": 11, "y": 0, "label": "DASH" },
-                { "x": 12, "y": 0, "label": "EQUALSIGN" },
-                { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
+                {"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},
 
-                { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "label": "RBRACKET" },
+                {"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},
 
-                { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "label": "A" },
-                { "x": 2.75, "y": 2, "label": "S" },
-                { "x": 3.75, "y": 2, "label": "D" },
-                { "x": 4.75, "y": 2, "label": "F" },
-                { "x": 5.75, "y": 2, "label": "G" },
-                { "x": 6.75, "y": 2, "label": "H" },
-                { "x": 7.75, "y": 2, "label": "J" },
-                { "x": 8.75, "y": 2, "label": "K" },
-                { "x": 9.75, "y": 2, "label": "L" },
-                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "label": "QUOTE" },
-                { "x": 12.75, "y": 2, "label": "ISOHASH" },
-                { "x": 13.75, "y": 1, "w": 1.25, "h": 2, "label": "ENTER" },
+                {"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},
 
-                { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
-                { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
-                { "x": 2.25, "y": 3, "label": "Z" },
-                { "x": 3.25, "y": 3, "label": "X" },
-                { "x": 4.25, "y": 3, "label": "C" },
-                { "x": 5.25, "y": 3, "label": "V" },
-                { "x": 6.25, "y": 3, "label": "B" },
-                { "x": 7.25, "y": 3, "label": "N" },
-                { "x": 8.25, "y": 3, "label": "M" },
-                { "x": 9.25, "y": 3, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "label": "SLASH" },
-                { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
-                { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
-                { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
-                { "x": 3.75, "y": 4, "w": 6.25, "label": "SPACE" },
-                { "x": 10, "y": 4, "w": 1.25, "label": "RALT" },
-                { "x": 11.25, "y": 4, "w": 1.25, "label": "RCMD" },
-                { "x": 12.5, "y": 4, "w": 1.25, "label": "FN" },
-                { "x": 13.75, "y": 4, "w": 1.25, "label": "RCTRL" }
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }